[PATCH] Filter waterleveldifferences according to unit
Wald Commits
scm-commit at wald.intevation.org
Thu Sep 26 17:31:29 CEST 2013
# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1380209485 -7200
# Node ID 87a7cdb6ee1eac8440fe9ee9b4cdaf01df3ddeca
# Parent ff4304735ac14d6c5dff6c680fec58cc83ff1fa7
Filter waterleveldifferences according to unit.
diff -r ff4304735ac1 -r 87a7cdb6ee1e artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml Thu Sep 26 16:18:55 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml Thu Sep 26 17:31:25 2013 +0200
@@ -1336,16 +1336,34 @@
<dc:filter expr="$kind=6">
<dc:if test="dc:has-result()">
<delta_w>
- <dc:group expr="dc:replace($wst_description, 'CSV/', '')">
- <relativepoint name="{dc:group-key()}">
- <dc:for-each>
- <column name="{$wst_column_name}"
- ids="delta_w-wstv-{$wst_column_position}-{$wst_id}"
- factory="staticwkms" target_out="{$out}"
- info="{$info} [km {$deffrom} - {$defto}]"/>
- </dc:for-each>
- </relativepoint>
- </dc:group>
+ <delta_w_cm>
+ <dc:filter expr="contains($wst_description, 'cm.csv')">
+ <dc:group expr="dc:replace($wst_description, 'CSV/', '')">
+ <relativepoint name="{dc:group-key()}">
+ <dc:for-each>
+ <column name="{$wst_column_name}"
+ ids="delta_w-wstv-{$wst_column_position}-{$wst_id}"
+ factory="staticwkms" target_out="{$out}"
+ info="{$info} [km {$deffrom} - {$defto}]"/>
+ </dc:for-each>
+ </relativepoint>
+ </dc:group>
+ </dc:filter>
+ </delta_w_cm>
+ <delta_w_cma>
+ <dc:filter expr="contains($wst_description, 'cm-a.csv')">
+ <dc:group expr="dc:replace($wst_description, 'CSV/', '')">
+ <relativepoint name="{dc:group-key()}">
+ <dc:for-each>
+ <column name="{$wst_column_name}"
+ ids="delta_w-wstv-{$wst_column_position}-{$wst_id}"
+ factory="staticwkms" target_out="{$out}"
+ info="{$info} [km {$deffrom} - {$defto}]"/>
+ </dc:for-each>
+ </relativepoint>
+ </dc:group>
+ </dc:filter>
+ </delta_w_cma>
</delta_w>
</dc:if>
</dc:filter>
diff -r ff4304735ac1 -r 87a7cdb6ee1e gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Thu Sep 26 16:18:55 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Thu Sep 26 17:31:25 2013 +0200
@@ -934,6 +934,10 @@
String delta_w();
+ String delta_w_cm();
+
+ String delta_w_cma();
+
String wlevel();
// Capabilities Information Panel
diff -r ff4304735ac1 -r 87a7cdb6ee1e gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Thu Sep 26 16:18:55 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Thu Sep 26 17:31:25 2013 +0200
@@ -497,6 +497,8 @@
floodmarks = Flood Marks
pegel_had_measurement_points = HAD Discharge-Measurement points
delta_w = Waterleveldifferences
+delta_w_cm = cm
+delta_w_cma = cm/a
wlevel = Waterlevels
# No translation for the pegelonline wms service layer names.
gauge_points = Pegelpunkte (WSV)
diff -r ff4304735ac1 -r 87a7cdb6ee1e gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Thu Sep 26 16:18:55 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Thu Sep 26 17:31:25 2013 +0200
@@ -502,6 +502,8 @@
floodmarks = HW-Marken
pegel_had_measurement_points = HAD Abflussmessstellen (WMS)
delta_w = Wasserspiegeldifferenzen
+delta_w_cm = cm
+delta_w_cma = cm/a
wlevel = Wasserspiegellagen
gauge_points = Pegelmessstelle (WMS)
gauge_level = Wasserstand (WMS)
diff -r ff4304735ac1 -r 87a7cdb6ee1e gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Thu Sep 26 16:18:55 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Thu Sep 26 17:31:25 2013 +0200
@@ -480,7 +480,10 @@
bedheights = Bedheights
morph_width = morphologic Width
datacage = Datacage
-delta_w = Delta W
+delta_w = Waterleveldifferences
+delta_w_cm = cm
+delta_w_cma = cm/a
+wlevel = Waterlevels
startcolor = Colorrange start color
endcolor = Colorrange end color
More information about the Dive4elements-commits
mailing list