[Dive4elements-commits] [PATCH 2 of 2] merged
Wald Commits
scm-commit at wald.intevation.org
Fri Mar 22 11:57:46 CET 2013
# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1363949797 -3600
# Node ID d6782d0c7472223a0cdd3dee0f7853f31a839026
# Parent 75371c9ef47270b35bbd19599eaa77d62b5a6de7
# Parent fe5fc583390de4e9b71a75672e58dc1edd7f99ba
merged.
diff -r 75371c9ef472 -r d6782d0c7472 .hgtags
--- a/.hgtags Fri Mar 22 11:55:14 2013 +0100
+++ b/.hgtags Fri Mar 22 11:56:37 2013 +0100
@@ -36,3 +36,4 @@
0000000000000000000000000000000000000000 2.9.12
88e3473a38467e8b5bb7d99e92c3f1a795515bf5 2.9.12
7fa94b793cbe0133503741e142832c8f2ff1aa4b 2.9.13
+a5f5599f6fd5e37975d71b8a323aadfeb8d017e6 2.9.14
diff -r 75371c9ef472 -r d6782d0c7472 flys-aft/src/main/java/de/intevation/aft/DischargeTable.java
--- a/flys-aft/src/main/java/de/intevation/aft/DischargeTable.java Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-aft/src/main/java/de/intevation/aft/DischargeTable.java Fri Mar 22 11:56:37 2013 +0100
@@ -15,6 +15,7 @@
import org.apache.log4j.Logger;
+/** A Discharge Table. */
public class DischargeTable
{
private static Logger log = Logger.getLogger(DischargeTable.class);
diff -r 75371c9ef472 -r d6782d0c7472 flys-artifacts/doc/conf/artifacts/winfo.xml
--- a/flys-artifacts/doc/conf/artifacts/winfo.xml Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-artifacts/doc/conf/artifacts/winfo.xml Fri Mar 22 11:56:37 2013 +0100
@@ -618,11 +618,13 @@
</facets>
</outputmode>
<outputmode name="historical_discharge_wq" description="output.historical_discharge_wq.description" mime-type="image/png" type="chart">
- <facets>
- <facet name="historical_discharge.wq.q"/>
- <facet name="historical_discharge.wq.w"/>
- <facet name="historical_discharge.wq.curve"/>
- </facets>
+ <facets>
+ <facet name="historical_discharge.wq.q"/>
+ <facet name="historical_discharge.wq.w"/>
+ <facet name="historical_discharge.wq.curve"/>
+ <facet name="historical_discharge.mainvalues.q"/>
+ <facet name="historical_discharge.mainvalues.w"/>
+ </facets>
</outputmode>
<outputmode name="historical_discharge_export" description="output.historical_discharge.export" mime-type="text/plain" type="export">
<facets>
diff -r 75371c9ef472 -r d6782d0c7472 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-artifacts/doc/conf/meta-data.xml Fri Mar 22 11:56:37 2013 +0100
@@ -720,6 +720,9 @@
<dc:if test="dc:contains($artifact-outs, 'w_differences') or (dc:contains($artifact-outs, 'discharge_longitudinal_section'))">
<dc:call-macro name="annotations"/>
</dc:if>
+ <dc:if test="dc:contains($artifact-outs, 'historical_discharge_wq')">
+ <dc:call-macro name="mainvalues"/>
+ </dc:if>
<dc:if test="dc:contains($artifact-outs, 'cross_section')">
<dc:call-macro name="cross_sections"/>
<dc:call-macro name="hyks"/>
@@ -1260,40 +1263,264 @@
</dc:elements>
</dc:context>
</dc:macro>
+
+ <dc:macro name="hwslines_by_kind">
+ <dc:comment>
+ Call from a context where fed_name hws_kind hws_name and river_id is
+ availble
+ </dc:comment>
+ <Durchlass>
+ <dc:elements filter="$hws_kind=1">
+ <hws>
+ <dc:attribute name="factory" value="wmshwslinesfactory"/>
+ <dc:attribute name="ids" value="${river_id};${hws_name}"/>
+ <dc:attribute name="name" value="${hws_name}"/>
+ </hws>
+ </dc:elements>
+ </Durchlass>
+ <Damm>
+ <dc:elements filter="$hws_kind=2">
+ <hws>
+ <dc:attribute name="factory" value="wmshwslinesfactory"/>
+ <dc:attribute name="ids" value="${river_id};${hws_name}"/>
+ <dc:attribute name="name" value="${hws_name}"/>
+ </hws>
+ </dc:elements>
+ </Damm>
+ <Graben>
+ <dc:elements filter="$hws_kind=3">
+ <hws>
+ <dc:attribute name="factory" value="wmshwslinesfactory"/>
+ <dc:attribute name="ids" value="${river_id};${hws_name}"/>
+ <dc:attribute name="name" value="${hws_name}"/>
+ </hws>
+ </dc:elements>
+ </Graben>
+ </dc:macro>
+
<dc:macro name="hwslines">
- <dc:context>
- <dc:statement>
- SELECT count(*) as km_exists, name as name
- FROM hws_lines WHERE river_id = ${river_id} GROUP BY name
- </dc:statement>
- <dc:elements>
- <dc:if test="$km_exists>0">
- <line>
- <dc:attribute name="factory" value="wmshwslinesfactory"/>
- <dc:attribute name="ids" value="${river_id};${name}"/>
- <dc:attribute name="name" value="${name}"/>
- </line>
- </dc:if>
+ <hws_lines>
+ <official>
+ <dc:context>
+ <dc:statement>
+ SELECT DISTINCT
+ fs.name AS fed_name,
+ fs.id AS fed_id
+ FROM hws_lines hws
+ JOIN fed_states fs ON hws.fed_state_id = fs.id
+ WHERE river_id = ${river_id}
+ AND hws.official=1
+ </dc:statement>
+ <dc:elements>
+ <dc:context>
+ <dc:statement>
+ SELECT DISTINCT
+ name AS hws_name,
+ kind_id AS hws_kind
+ FROM hws_lines
+ WHERE river_id = ${river_id}
+ AND official=1
+ AND fed_state_id = ${fed_id} ORDER BY name
+ </dc:statement>
+ <fedstate>
+ <dc:attribute name="description" value="${fed_name}"/>
+ <dc:call-macro name="hwslines_by_kind"/>
+ </fedstate>
+ </dc:context>
+ </dc:elements>
+ </dc:context>
+ <dc:context>
+ <dc:statement>
+ SELECT distinct
+ name AS hws_name,
+ kind_id AS hws_kind
+ FROM hws_lines
+ WHERE river_id = ${river_id}
+ AND official=1
+ AND fed_state_id IS NULL
+ ORDER BY name
+ </dc:statement>
+ <hws_fed_unknown>
+ <dc:call-macro name="hwslines_by_kind"/>
+ </hws_fed_unknown>
+ </dc:context>
+ </official>
+ <inofficial>
+ <dc:context>
+ <dc:statement>
+ SELECT DISTINCT
+ fs.name AS fed_name,
+ fs.id AS fed_id
+ FROM hws_lines hws
+ JOIN fed_states fs ON hws.fed_state_id = fs.id
+ WHERE river_id = ${river_id}
+ AND hws.official=0
+ </dc:statement>
+ <dc:elements>
+ <dc:context>
+ <dc:statement>
+ SELECT DISTINCT
+ name AS hws_name,
+ kind_id AS hws_kind
+ FROM hws_lines
+ WHERE river_id = ${river_id}
+ AND official=0
+ AND fed_state_id = ${fed_id} ORDER BY name
+ </dc:statement>
+ <fedstate>
+ <dc:attribute name="description" value="${fed_name}"/>
+ <dc:call-macro name="hwslines_by_kind"/>
+ </fedstate>
+ </dc:context>
+ </dc:elements>
+ </dc:context>
+ <dc:context>
+ <dc:statement>
+ SELECT distinct
+ name AS hws_name,
+ kind_id AS hws_kind
+ FROM hws_lines
+ WHERE river_id = ${river_id}
+ AND official=0
+ AND fed_state_id IS NULL ORDER BY name
+ </dc:statement>
+ <hws_fed_unknown>
+ <dc:call-macro name="hwslines_by_kind"/>
+ </hws_fed_unknown>
+ </dc:context>
+ </inofficial>
+ </hws_lines>
+ </dc:macro>
+
+ <dc:macro name="hwspoints_by_kind">
+ <dc:comment>
+ Call from a context where fed_name hws_kind hws_name and river_id is
+ availble
+ </dc:comment>
+ <Durchlass>
+ <dc:elements filter="$hws_kind=1">
+ <hws>
+ <dc:attribute name="factory" value="wmshwspointsfactory"/>
+ <dc:attribute name="ids" value="${river_id};${hws_name}"/>
+ <dc:attribute name="name" value="${hws_name}"/>
+ </hws>
</dc:elements>
- </dc:context>
+ </Durchlass>
+ <Damm>
+ <dc:elements filter="$hws_kind=2">
+ <hws>
+ <dc:attribute name="factory" value="wmshwspointsfactory"/>
+ <dc:attribute name="ids" value="${river_id};${hws_name}"/>
+ <dc:attribute name="name" value="${hws_name}"/>
+ </hws>
+ </dc:elements>
+ </Damm>
+ <Graben>
+ <dc:elements filter="$hws_kind=3">
+ <hws>
+ <dc:attribute name="factory" value="wmshwspointsfactory"/>
+ <dc:attribute name="ids" value="${river_id};${hws_name}"/>
+ <dc:attribute name="name" value="${hws_name}"/>
+ </hws>
+ </dc:elements>
+ </Graben>
</dc:macro>
+
<dc:macro name="hwspoints">
- <dc:context>
- <dc:statement>
- SELECT count(*) as km_exists, name as name
- FROM hws_points WHERE river_id = ${river_id} GROUP BY name
- </dc:statement>
- <dc:elements>
- <dc:if test="$km_exists>0">
- <line>
- <dc:attribute name="factory" value="wmshwspointsfactory"/>
- <dc:attribute name="ids" value="${river_id};${name}"/>
- <dc:attribute name="name" value="${name}"/>
- </line>
- </dc:if>
- </dc:elements>
- </dc:context>
- </dc:macro>
+ <hws_points>
+ <official>
+ <dc:context>
+ <dc:statement>
+ SELECT DISTINCT
+ fs.name AS fed_name,
+ fs.id AS fed_id
+ FROM hws_points hws
+ JOIN fed_states fs ON hws.fed_state_id = fs.id
+ WHERE river_id = ${river_id}
+ AND hws.official=1
+ </dc:statement>
+ <dc:elements>
+ <dc:context>
+ <dc:statement>
+ SELECT DISTINCT
+ name AS hws_name,
+ kind_id AS hws_kind
+ FROM hws_points
+ WHERE river_id = ${river_id}
+ AND official=1
+ AND fed_state_id = ${fed_id} ORDER BY name
+ </dc:statement>
+ <fedstate>
+ <dc:attribute name="description" value="${fed_name}"/>
+ <dc:call-macro name="hwspoints_by_kind"/>
+ </fedstate>
+ </dc:context>
+ </dc:elements>
+ </dc:context>
+ <dc:context>
+ <dc:statement>
+ SELECT distinct
+ name AS hws_name,
+ kind_id AS hws_kind
+ FROM hws_points
+ WHERE river_id = ${river_id}
+ AND official=1
+ AND fed_state_id IS NULL
+ ORDER BY name
+ </dc:statement>
+ <hws_fed_unknown>
+ <dc:call-macro name="hwspoints_by_kind"/>
+ </hws_fed_unknown>
+ </dc:context>
+ </official>
+ <inofficial>
+ <dc:context>
+ <dc:statement>
+ SELECT DISTINCT
+ fs.name AS fed_name,
+ fs.id AS fed_id
+ FROM hws_points hws
+ JOIN fed_states fs ON hws.fed_state_id = fs.id
+ WHERE river_id = ${river_id}
+ AND hws.official=0
+ </dc:statement>
+ <dc:elements>
+ <dc:context>
+ <dc:statement>
+ SELECT DISTINCT
+ name AS hws_name,
+ kind_id AS hws_kind
+ FROM hws_points
+ WHERE river_id = ${river_id}
+ AND official=0
+ AND fed_state_id = ${fed_id} ORDER BY name
+ </dc:statement>
+ <fedstate>
+ <dc:attribute name="description" value="${fed_name}"/>
+ <dc:call-macro name="hwspoints_by_kind"/>
+ </fedstate>
+ </dc:context>
+ </dc:elements>
+ </dc:context>
+ <dc:context>
+ <dc:statement>
+ SELECT distinct
+ name AS hws_name,
+ kind_id AS hws_kind
+ FROM hws_points
+ WHERE river_id = ${river_id}
+ AND official=0
+ AND fed_state_id IS NULL ORDER BY name
+ </dc:statement>
+ <hws_fed_unknown>
+ <dc:call-macro name="hwspoints_by_kind"/>
+ </hws_fed_unknown>
+ </dc:context>
+ </inofficial>
+ </hws_points>
+ </dc:macro>
+
+
<dc:macro name="flood-map-buildings">
<dc:context>
<dc:statement>
@@ -1454,12 +1681,8 @@
<dc:call-macro name="flood-map-qps"/>
</kilometrage>
<hws>
- <hws_lines>
- <dc:call-macro name="hwslines"/>
- </hws_lines>
- <hws_points>
- <dc:call-macro name="hwspoints"/>
- </hws_points>
+ <dc:call-macro name="hwslines"/>
+ <dc:call-macro name="hwspoints"/>
</hws>
<dc:call-macro name="flood-map-uesk"/>
<gaugelocations>
diff -r 75371c9ef472 -r d6782d0c7472 flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java Fri Mar 22 11:56:37 2013 +0100
@@ -75,6 +75,7 @@
});
}
+
/**
* Trivial Constructor.
*/
@@ -126,28 +127,44 @@
"facet.discharge_curves.mainvalues.q",
"facet.discharge_curves.mainvalues.q"),
true);
+ Facet qfacet3 = new MainValuesQFacet(
+ HISTORICAL_DISCHARGE_MAINVALUES_Q,
+ Resources.getMsg(
+ callMeta,
+ "historical_discharge.mainvalues.q",
+ "historical_discharge.mainvalues.q"),
+ false);
fs.add(qfacet0);
fs.add(qfacet1);
fs.add(qfacet2);
+ fs.add(qfacet3);
}
if (!restricted || restriction.endsWith("w")) {
- Facet wfacet1 = new MainValuesWFacet(
- COMPUTED_DISCHARGE_MAINVALUES_W,
- Resources.getMsg(
- callMeta,
- "facet.discharge_curves.mainvalues.w",
- "facet.discharge_curves.mainvalues.w"),
- false);
- Facet wfacet2 = new MainValuesWFacet(
- MAINVALUES_W,
- Resources.getMsg(
- callMeta,
- "facet.discharge_curves.mainvalues.w",
- "facet.discharge_curves.mainvalues.w"),
- true);
+ Facet wfacet1 = new MainValuesWFacet(
+ COMPUTED_DISCHARGE_MAINVALUES_W,
+ Resources.getMsg(
+ callMeta,
+ "facet.discharge_curves.mainvalues.w",
+ "facet.discharge_curves.mainvalues.w"),
+ false);
+ Facet wfacet2 = new MainValuesWFacet(
+ MAINVALUES_W,
+ Resources.getMsg(
+ callMeta,
+ "facet.discharge_curves.mainvalues.w",
+ "facet.discharge_curves.mainvalues.w"),
+ true);
+ Facet wfacet3 = new MainValuesWFacet(
+ HISTORICAL_DISCHARGE_MAINVALUES_W,
+ Resources.getMsg(
+ callMeta,
+ "historical_discharge.mainvalues.w",
+ "historical_discharge.mainvalues.w"),
+ true);
fs.add(wfacet1);
fs.add(wfacet2);
+ fs.add(wfacet3);
}
}
@@ -170,6 +187,7 @@
}
+ /** Get important data from the 'calling' artifact. */
@Override
protected void initialize(Artifact artifact, Object context, CallMeta meta) {
logger.debug("MainValuesArtifact.initialize");
@@ -186,6 +204,20 @@
logger.error("No location for mainvalues given.");
}
importData(winfo, "river");
+ // In the case of DischargeWQCurves, there are no locations, but a gauge.
+ if (getDataAsString("ld_locations") == null) {
+ // TODO its a tad difficult to remodel Range/Gauge-Access to
+ // do this.
+ String refGaugeID = winfo.getDataAsString("reference_gauge");
+ if (refGaugeID != null) {
+ Gauge g = Gauge.getGaugeByOfficialNumber(Integer.parseInt(refGaugeID));
+ addData("ld_locations", new DefaultStateData("ld_locations", null, null,
+ String.valueOf(g.getStation())));
+ }
+ else {
+ logger.error("MainValuesArtifact: No location/gauge.");
+ }
+ }
}
diff -r 75371c9ef472 -r d6782d0c7472 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java Fri Mar 22 11:56:37 2013 +0100
@@ -237,6 +237,8 @@
String HISTORICAL_DISCHARGE_WQ_Q = "historical_discharge.wq.q";
String HISTORICAL_DISCHARGE_WQ_W = "historical_discharge.wq.w";
String HISTORICAL_DISCHARGE_WQ_CURVE = "historical_discharge.wq.curve";
+ String HISTORICAL_DISCHARGE_MAINVALUES_Q = "historical_discharge.mainvalues.q";
+ String HISTORICAL_DISCHARGE_MAINVALUES_W = "historical_discharge.mainvalues.w";
String REFERENCE_CURVE = "reference_curve";
String REFERENCE_CURVE_NORMALIZED = "reference_curve_normalized";
diff -r 75371c9ef472 -r d6782d0c7472 flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java Fri Mar 22 11:56:37 2013 +0100
@@ -395,7 +395,10 @@
}
}
- protected static Marker createQSectorMarker(double value, String label) {
+ /** Create Marker at value with label. */
+ protected static Marker createQSectorMarker(
+ double value, String label
+ ) {
if (Double.isNaN(value)) {
return null;
}
diff -r 75371c9ef472 -r d6782d0c7472 flys-artifacts/src/main/resources/messages.properties
--- a/flys-artifacts/src/main/resources/messages.properties Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-artifacts/src/main/resources/messages.properties Fri Mar 22 11:56:37 2013 +0100
@@ -71,6 +71,8 @@
epoch=Epoch
off_epoch = off. Epochs
soundings = Soundings / Epochs
+t_per_a = t/a
+m3_per_a = m\u00b3/a
historical.mode.w = Waterlevel Analyse
historical.mode.q = Discharge Analyse
@@ -297,8 +299,6 @@
chart.beddifference.yaxis.label.diff = Difference [m]
chart.beddifference.yaxis.label.height = Absolute Height [m]
chart.beddifference.year.title = Bedheight Difference
-chart.beddifference.xaxis.label = River-Km [km]
-chart.beddifference.yaxis.label.diff = Difference [m]
chart.beddifference.yaxis.label.morph = Morphologic Width [m]
chart.beddifference.yaxis.label.heights = Absolute Height [m]
@@ -482,6 +482,9 @@
help.state.winfo.uesk.floodplain=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.floodplain
help.state.winfo.uesk.differences=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.differences
help.state.winfo.uesk.scenario=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
+help.state.winfo.uesk.dc-hws=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
+help.state.winfo.uesk.user-rgd=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
+help.state.winfo.uesk.barriers=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
help.state.winfo.historicalq.reference_gauge=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.historicalq.reference_gauge
help.state.winfo.historicalq.timerange=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.historicalq.timerange
help.state.winfo.historicalq.mode=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.historicalq.mode
diff -r 75371c9ef472 -r d6782d0c7472 flys-artifacts/src/main/resources/messages_de.properties
--- a/flys-artifacts/src/main/resources/messages_de.properties Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-artifacts/src/main/resources/messages_de.properties Fri Mar 22 11:56:37 2013 +0100
@@ -72,6 +72,8 @@
epoch=Epoche
off_epoch = Amtl. Epochen
soundings = Peilungen / Epochen
+t_per_a = t/a
+m3_per_a = m\u00b3/a
historical.mode.w = Wasserstandsanalyse
historical.mode.q = Abflussanalyse
@@ -241,6 +243,16 @@
facet.sedimentload.susp_sediment = Schwebstoff
facet.sedimentload.total = Gesamt
facet.sedimentload.total_load = Gesamt Geschiebe
+missing.fraction.coarse = Fehlende Fraktion: grober Kies
+missing.fraction.fine_middle = Fehlende Fraktion: fein/mittlerer Kies
+missing.fraction.sand = Fehlende Fraktion: Sand
+missing.fraction.susp_sand = Fehlende Fraktion: susp. Sand
+missing.fraction.susp_sediment = Fehlende Fraktion: Schwebstoffe
+missing.data.coarse = Fehlende Daten bei grobem Kies
+missing.data.fine_middle = Fehlende Daten bei fein/mittlerem Kies
+missing.data.sand = Fehlende Daten bei Sand
+missing.data.susp_sand = Fehlende Daten bei susp. Sand
+missing.data.susp_sediment = Fehlende Daten bei Schwebstoffen
facet.longitudinal_section.annotations = Streckenfavoriten
facet.discharge_curves.mainvalues.q = Q (Haupt- und Extremwerte)
@@ -288,8 +300,6 @@
chart.beddifference.yaxis.label.diff = Differenz [m]
chart.beddifference.yaxis.label.height = Absolute H\u00f6he [m]
chart.beddifference.year.title = Sohlh\u00f6hendifferenz
-chart.beddifference.xaxis.label = Fluss-Km [km]
-chart.beddifference.yaxis.label.diff = Differenz [m]
chart.beddifference.yaxis.label.morph = Morphologische Breite [m]
chart.beddifference.yaxis.label.heights = Absolute H\u00f6he [m]
diff -r 75371c9ef472 -r d6782d0c7472 flys-artifacts/src/main/resources/messages_de_DE.properties
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties Fri Mar 22 11:56:37 2013 +0100
@@ -297,8 +297,6 @@
chart.beddifference.yaxis.label.diff = Differenz [m]
chart.beddifference.yaxis.label.height = Absolute H\u00f6he [m]
chart.beddifference.year.title = Sohlh\u00f6hendifferenz
-chart.beddifference.xaxis.label = Fluss-Km [km]
-chart.beddifference.yaxis.label.diff = Differenz [m]
chart.beddifference.yaxis.label.morph = Morphologische Breite [m]
chart.beddifference.yaxis.label.heights = Absolute H\u00f6he [m]
@@ -482,6 +480,9 @@
help.state.winfo.uesk.floodplain=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.floodplain
help.state.winfo.uesk.differences=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.differences
help.state.winfo.uesk.scenario=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
+help.state.winfo.uesk.dc-hws=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
+help.state.winfo.uesk.user-rgd=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
+help.state.winfo.uesk.barriers=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
help.state.winfo.historicalq.reference_gauge=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.historicalq.reference_gauge
help.state.winfo.historicalq.timerange=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.historicalq.timerange
help.state.winfo.historicalq.mode=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.historicalq.mode
diff -r 75371c9ef472 -r d6782d0c7472 flys-artifacts/src/main/resources/messages_en.properties
--- a/flys-artifacts/src/main/resources/messages_en.properties Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-artifacts/src/main/resources/messages_en.properties Fri Mar 22 11:56:37 2013 +0100
@@ -71,6 +71,8 @@
epoch=Epoch
off_epoch = off. Epochs
soundings = Soundings / Epochs
+t_per_a = t/a
+m3_per_a = m\u00b3/a
historical.mode.w = Waterlevel Analyse
historical.mode.q = Discharge Analyse
@@ -300,8 +302,6 @@
chart.beddifference.yaxis.label.diff = Difference [m]
chart.beddifference.yaxis.label.height = Absolute Height [m]
chart.beddifference.year.title = Bedheight Difference
-chart.beddifference.xaxis.label = River-Km [km]
-chart.beddifference.yaxis.label.diff = Difference [m]
chart.beddifference.yaxis.label.morph = Morphologic Width [m]
chart.beddifference.yaxis.label.heights = Absolute Height [m]
@@ -485,6 +485,9 @@
help.state.winfo.uesk.floodplain=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.floodplain
help.state.winfo.uesk.differences=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.differences
help.state.winfo.uesk.scenario=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
+help.state.winfo.uesk.dc-hws=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
+help.state.winfo.uesk.user-rgd=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
+help.state.winfo.uesk.barriers=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
help.state.winfo.historicalq.reference_gauge=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.historicalq.reference_gauge
help.state.winfo.historicalq.timerange=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.historicalq.timerange
help.state.winfo.historicalq.mode=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.historicalq.mode
diff -r 75371c9ef472 -r d6782d0c7472 flys-backend/contrib/shpimporter/importer.py
--- a/flys-backend/contrib/shpimporter/importer.py Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-backend/contrib/shpimporter/importer.py Fri Mar 22 11:56:37 2013 +0100
@@ -73,6 +73,8 @@
return result
def IsDoubleFieldSet(self, feat, name):
+ if not self.IsFieldSet(feat, name):
+ return False
try:
isset = feat.GetFieldAsDouble(name)
return isset is not None
diff -r 75371c9ef472 -r d6782d0c7472 flys-backend/doc/schema/oracle-spatial_idx.sql
--- a/flys-backend/doc/schema/oracle-spatial_idx.sql Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-backend/doc/schema/oracle-spatial_idx.sql Fri Mar 22 11:56:37 2013 +0100
@@ -1,12 +1,8 @@
--- TODO: index prevents `DELETE FROM rivers' on 11g
--- Error: "Ebenendimensionalitat stimmt nicht mit Geometrie-Dimensionen uberein"
--- CREATE INDEX river_axes_km_spatial_idx ON river_axes_km(GEOM) indextype IS MDSYS.SPATIAL_INDEX parameters ('LAYER_GTYPE=point');
+CREATE INDEX river_axes_km_spatial_idx ON river_axes_km(GEOM) indextype IS MDSYS.SPATIAL_INDEX parameters ('LAYER_GTYPE=point');
CREATE INDEX buildings_spatial_idx ON buildings(GEOM) indextype IS MDSYS.SPATIAL_INDEX parameters ('LAYER_GTYPE=LINE');
--- TODO: index prevents `DELETE FROM rivers' on 11g
--- Error: "Ebenendimensionalitat stimmt nicht mit Geometrie-Dimensionen uberein"
--- CREATE INDEX fixpoints_spatial_idx ON fixpoints(GEOM) indextype IS MDSYS.SPATIAL_INDEX parameters ('LAYER_GTYPE=POINT');
+CREATE INDEX fixpoints_spatial_idx ON fixpoints(GEOM) indextype IS MDSYS.SPATIAL_INDEX parameters ('LAYER_GTYPE=POINT');
CREATE INDEX river_axes_spatial_idx ON river_axes(GEOM) indextype IS MDSYS.SPATIAL_INDEX parameters ('LAYER_GTYPE=MULTILINE');
diff -r 75371c9ef472 -r d6782d0c7472 flys-backend/doc/schema/postgresql-spatial.sql
--- a/flys-backend/doc/schema/postgresql-spatial.sql Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-backend/doc/schema/postgresql-spatial.sql Fri Mar 22 11:56:37 2013 +0100
@@ -110,7 +110,6 @@
CREATE TABLE dem (
id int PRIMARY KEY NOT NULL,
river_id int REFERENCES rivers(id) ON DELETE CASCADE,
- -- XXX Should we use the ranges table instead?
name VARCHAR(64),
range_id INT REFERENCES ranges(id),
time_interval_id INT REFERENCES time_intervals(id),
diff -r 75371c9ef472 -r d6782d0c7472 flys-backend/src/main/java/de/intevation/flys/model/Gauge.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/Gauge.java Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/Gauge.java Fri Mar 22 11:56:37 2013 +0100
@@ -22,6 +22,7 @@
import de.intevation.flys.backend.SessionHolder;
+/** Database-mapped Gauge with all info about it. */
@Entity
@Table(name = "gauges")
public class Gauge
@@ -31,7 +32,6 @@
public static final int MASTER_DISCHARGE_TABLE = 0;
-
private Integer id;
private String name;
private River river;
diff -r 75371c9ef472 -r d6782d0c7472 flys-backend/src/main/java/de/intevation/flys/model/MainValue.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/MainValue.java Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/MainValue.java Fri Mar 22 11:56:37 2013 +0100
@@ -14,6 +14,8 @@
import java.math.BigDecimal;
+
+/** A Main or Extreme value of a rivers gauge. */
@Entity
@Table(name = "main_values")
public class MainValue
diff -r 75371c9ef472 -r d6782d0c7472 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Fri Mar 22 11:56:37 2013 +0100
@@ -1162,6 +1162,8 @@
String hws_points();
+ String hws_fed_unknown();
+
}
// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r 75371c9ef472 -r d6782d0c7472 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Fri Mar 22 11:56:37 2013 +0100
@@ -460,6 +460,7 @@
custom_lines = Own Digitalizations
hws_lines = Lines
hws_points = Points
+hws_fed_unknown = Unknown State
startcolor = Colorrange start color
endcolor = Colorrange end color
diff -r 75371c9ef472 -r d6782d0c7472 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Fri Mar 22 11:55:14 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Fri Mar 22 11:56:37 2013 +0100
@@ -461,6 +461,7 @@
custom_lines = Eigene Digitalisierungen
hws_lines = Liniendaten
hws_points = Punktdaten
+hws_fed_unknown = Unbekanntes Bundesland
startcolor = Farbverlauf Startfarbe
endcolor = Farbverlauf Endfarbe
More information about the Dive4elements-commits
mailing list