[Dive4elements-commits] [PATCH 3 of 3] Add Floodmarks and all specified WMS services to datacage
Wald Commits
scm-commit at wald.intevation.org
Thu Apr 4 10:54:47 CEST 2013
# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1365064801 -7200
# Node ID 38713f32a785c0669d3cc638ee877552d1b0e7bb
# Parent 5b50247d4d99ffa4cce9a30263afcfcb3fa5b9a4
Add Floodmarks and all specified WMS services to datacage
diff -r 5b50247d4d99 -r 38713f32a785 flys-artifacts/doc/conf/artifacts/map.xml
--- a/flys-artifacts/doc/conf/artifacts/map.xml Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/map.xml Thu Apr 04 10:40:01 2013 +0200
@@ -26,6 +26,7 @@
<facet name="floodmap.hydr_boundaries_poly"/>
<facet name="floodmap.catchment"/>
<facet name="floodmap.floodplain"/>
+ <facet name="floodmap.floodmarks"/>
<facet name="floodmap.lines"/>
<facet name="floodmap.buildings"/>
<facet name="floodmap.fixpoints"/>
diff -r 5b50247d4d99 -r 38713f32a785 flys-artifacts/doc/conf/artifacts/winfo.xml
--- a/flys-artifacts/doc/conf/artifacts/winfo.xml Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/winfo.xml Thu Apr 04 10:40:01 2013 +0200
@@ -563,6 +563,7 @@
<facet name="floodmap.lines"/>
<facet name="floodmap.buildings"/>
<facet name="floodmap.fixpoints"/>
+ <facet name="floodmap.floodmarks"/>
<facet name="floodmap.floodmaps"/>
<facet name="floodmap.gauge_location"/>
<facet name="floodmap.externalwms"/>
diff -r 5b50247d4d99 -r 38713f32a785 flys-artifacts/doc/conf/conf.xml
--- a/flys-artifacts/doc/conf/conf.xml Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-artifacts/doc/conf/conf.xml Thu Apr 04 10:40:01 2013 +0200
@@ -54,6 +54,9 @@
<artifact-factory name="wmsfixpointsfactory" description="Factory to create an artifact to be used in WINFO"
ttl="3600000"
artifact="de.intevation.flys.artifacts.WMSFixpointsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+ <artifact-factory name="wmsfloodmarkfactory" description="Factory to create an artifact to be used in WINFO"
+ ttl="3600000"
+ artifact="de.intevation.flys.artifacts.WMSFloodmarksArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
<artifact-factory name="wmsfloodmapsfactory" description="Factory to create an artifact to be used in WINFO"
ttl="3600000"
artifact="de.intevation.flys.artifacts.WMSFloodmapsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
diff -r 5b50247d4d99 -r 38713f32a785 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-artifacts/doc/conf/meta-data.xml Thu Apr 04 10:40:01 2013 +0200
@@ -1570,8 +1570,10 @@
</dc:macro>
<dc:macro name="flood-map-gaugelocations">
- <dc:attribute name="factory" value="externalwmsfactory"/>
- <dc:attribute name="ids" value="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelonline-Pegelpunkte"/>
+ <gauge_points factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV)"/>
+ <gauge_names factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelnamen;Pegelnamen (WSV)"/>
+ <gauge_level factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelwasserstand;Aktueller Wasserstand (WSV)"/>
+ <gauge_tendency factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;TendenzWasserstand;Tendenz des Wasserstands (WSV)"/>
</dc:macro>
<dc:macro name="flood-map-uesk">
@@ -1703,11 +1705,6 @@
</dc:context>
</dc:macro>
- <dc:macro name="flood-map-catchments">
- <dc:attribute name="factory" value="externalwmsfactory"/>
- <dc:attribute name="ids" value="http://geoportal.bafg.de/wmsproxy/INSPIRE/DrainageBasin;HY.PHYSICALWATERS.CATCHMENTS;Einzugsgebiet"/>
- </dc:macro>
-
<dc:macro name="flood-map-routing">
<qps>
<dc:call-macro name="flood-map-qps"/>
@@ -1719,14 +1716,33 @@
</axis>
</dc:macro>
+ <dc:macro name="floodmarks">
+ <dc:context>
+ <dc:statement>
+ SELECT DISTINCT
+ coalesce(CAST (year AS VARCHAR(64)), 'Unbekanntes Jahr') as year
+ FROM flood_marks
+ WHERE river_id = ${river_id}
+ </dc:statement>
+ <dc:if test="dc:has-result()">
+ <floodmarks>
+ <dc:for-each>
+ <floodmark name="{$year}"
+ factory="wmsfloodmarkfactory"
+ ids="{$river_id};{$year};{$year}"/>
+ </dc:for-each>
+ </floodmarks>
+ </dc:if>
+ </dc:context>
+ </dc:macro>
+
<dc:macro name="flood-map-complete">
<buildings>
<dc:call-macro name="flood-map-buildings"/>
</buildings>
- <catchments>
- <dc:call-macro name="flood-map-catchments"/>
- </catchments>
- <dc:comment><!-- TODO: HW-Marken --></dc:comment>
+ <catchments factory="externalwmsfactory"
+ ids="http://geoportal.bafg.de/wmsproxy/INSPIRE/DrainageBasin;HY.PHYSICALWATERS.CATCHMENTS;Einzugsgebiet"/>
+ <dc:call-macro name="floodmarks"/>
<hws>
<dc:call-macro name="hwslines"/>
<dc:call-macro name="hwspoints"/>
@@ -1743,6 +1759,8 @@
<dc:call-macro name="flood-map-gaugelocations"/>
</gaugelocations>
<background factory="wmsbackground" ids="{$river_id}"/>
+ <pegel_had_measurement_points factory="externalwmsfactory"
+ ids="http://geoportal.bafg.de/wmsproxy/HAD/HAD_31;0;HAD Abflussmessstellen"/>
</dc:macro>
</dc:if>
diff -r 5b50247d4d99 -r 38713f32a785 flys-artifacts/doc/conf/themes.xml
--- a/flys-artifacts/doc/conf/themes.xml Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-artifacts/doc/conf/themes.xml Thu Apr 04 10:40:01 2013 +0200
@@ -212,6 +212,7 @@
<mapping from="floodmap.lines" to="FloodmapLines" />
<mapping from="floodmap.buildings" to="Buildings" />
<mapping from="floodmap.fixpoints" to="Fixpoints" />
+ <mapping from="floodmap.floodmarks" to="Floodmarks" />
<mapping from="floodmap.floodmaps" to="Floodmaps" />
<mapping from="floodmap.gauge_location" to="GaugeLocation" />
<mapping from="floodmap.jetties" to="Jetties" />
diff -r 5b50247d4d99 -r 38713f32a785 flys-artifacts/doc/conf/themes/default/floodmap.xml
--- a/flys-artifacts/doc/conf/themes/default/floodmap.xml Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-artifacts/doc/conf/themes/default/floodmap.xml Thu Apr 04 10:40:01 2013 +0200
@@ -59,15 +59,13 @@
</inherits>
</theme>
-
- <theme name="GaugeLocation">
+ <theme name="Floodmarks">
<inherits>
<inherit from="MapLines" />
<inherit from="Symbol" />
</inherits>
</theme>
-
<theme name="Qps">
<inherits>
<inherit from="MapLines" />
diff -r 5b50247d4d99 -r 38713f32a785 flys-artifacts/doc/conf/themes/second/floodmap.xml
--- a/flys-artifacts/doc/conf/themes/second/floodmap.xml Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-artifacts/doc/conf/themes/second/floodmap.xml Thu Apr 04 10:40:01 2013 +0200
@@ -21,6 +21,13 @@
</inherits>
</theme>
+ <theme name="Floodmarks">
+ <inherits>
+ <inherit from="MapLines" />
+ <inherit from="Symbol" />
+ </inherits>
+ </theme>
+
<theme name="WSPLGEN">
<inherits>
<inherit from="Uesk" />
diff -r 5b50247d4d99 -r 38713f32a785 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 Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java Thu Apr 04 10:40:01 2013 +0200
@@ -171,6 +171,7 @@
String FLOODMAP_LINES = "floodmap.lines";
String FLOODMAP_BUILDINGS = "floodmap.buildings";
String FLOODMAP_FIXPOINTS = "floodmap.fixpoints";
+ String FLOODMAP_FLOODMARKS = "floodmap.floodmarks";
String FLOODMAP_FLOODMAPS = "floodmap.floodmaps";
String FLOODMAP_GAUGE_LOCATION = "floodmap.gauge_location";
String FLOODMAP_EXTERNAL_WMS = "floodmap.externalwms";
diff -r 5b50247d4d99 -r 38713f32a785 flys-backend/src/main/java/de/intevation/flys/backend/FLYSCredentials.java
--- a/flys-backend/src/main/java/de/intevation/flys/backend/FLYSCredentials.java Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-backend/src/main/java/de/intevation/flys/backend/FLYSCredentials.java Thu Apr 04 10:40:01 2013 +0200
@@ -28,6 +28,7 @@
import de.intevation.flys.model.FedState;
import de.intevation.flys.model.Fixpoint;
import de.intevation.flys.model.Floodmaps;
+import de.intevation.flys.model.Floodmark;
import de.intevation.flys.model.Floodplain;
import de.intevation.flys.model.FloodplainKind;
import de.intevation.flys.model.FlowVelocityMeasurement;
@@ -148,6 +149,7 @@
ElevationModel.class,
FedState.class,
Fixpoint.class,
+ Floodmark.class,
Floodplain.class,
FloodplainKind.class,
Floodmaps.class,
diff -r 5b50247d4d99 -r 38713f32a785 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 Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Thu Apr 04 10:40:01 2013 +0200
@@ -1186,5 +1186,17 @@
String measurements();
+ String floodmarks();
+
+ String pegel_had_measurement_points();
+
+ String gauge_points();
+
+ String gauge_names();
+
+ String gauge_level();
+
+ String gauge_tendency();
+
}
// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r 5b50247d4d99 -r 38713f32a785 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 Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Thu Apr 04 10:40:01 2013 +0200
@@ -472,6 +472,13 @@
sobek_flooded = SOBEK-Boundary flooded / not flooded
sobek_areas = SOBEK-Areas
measurements = Measurements
+floodmarks = Flood Marks
+pegel_had_measurement_points = HAD Discharge-Measurement points
+# No translation for the pegelonline wms service layer names.
+gauge_points = Pegelpunkte (WSV)
+gauge_level = Aktueller Wasserstand (WSV)
+gauge_names = Pegelnamen (WSV)
+gauge_tendency = Tendenz des Wasserstands (WSV)
startcolor = Colorrange start color
endcolor = Colorrange end color
diff -r 5b50247d4d99 -r 38713f32a785 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 Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Thu Apr 04 10:40:01 2013 +0200
@@ -473,6 +473,12 @@
sobek_flooded = SOBEK-Grenzlinie durchflutet / nicht durchflutet
sobek_areas = SOBEK-Bereiche
measurements = Messungen
+floodmarks = HW-Marken
+pegel_had_measurement_points = HAD Abflussmessstellen
+gauge_points = Pegelpunkte (WSV)
+gauge_level = Aktueller Wasserstand (WSV)
+gauge_names = Pegelnamen (WSV)
+gauge_tendency = Tendenz des Wasserstands (WSV)
startcolor = Farbverlauf Startfarbe
endcolor = Farbverlauf Endfarbe
More information about the Dive4elements-commits
mailing list