[PATCH] Remove obsolete configuration of DGM-SRID

Wald Commits scm-commit at wald.intevation.org
Thu Sep 19 17:08:06 CEST 2013


# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1379603282 -7200
# Node ID 4713bc0cc0eebb36f5b2c333748f68099f0615f5
# Parent  1f38656b68c4e23c2a39b19de274a3cac4d865a1
Remove obsolete configuration of DGM-SRID.

diff -r 1f38656b68c4 -r 4713bc0cc0ee artifacts/doc/conf/floodmap.xml
--- a/artifacts/doc/conf/floodmap.xml	Thu Sep 19 16:27:33 2013 +0200
+++ b/artifacts/doc/conf/floodmap.xml	Thu Sep 19 17:08:02 2013 +0200
@@ -14,127 +14,106 @@
 
     <river name="Saar">
         <srid value="31467"/>
-        <dgm-srid value="31466"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saar"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Mosel">
         <srid value="31467"/>
-        <dgm-srid value="31466"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Mosel"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Elbe">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Elbe"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Donau">
         <srid value="31467"/>
-        <dgm-srid value="25833"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Donau"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Donau (Regensburg Nordarm)">
         <srid value="31467"/>
-        <dgm-srid value="25833"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Donau (Regensburg Nordarm)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Donau (Schleusenkanäle)">
         <srid value="31467"/>
-        <dgm-srid value="25833"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Donau (Schleusenkanäle)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Fulda (Winter)">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Fulda (Winter)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Fulda (Sommer)">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Fulda (Sommer)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Lahn">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Lahn"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Main">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Main"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Main (Wehrarm Limbach)">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Main (Wehrarm Limbach)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Main (Wehrarm Volkach)">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Main (Wehrarm Volkach)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Neckar">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Neckar"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Neckar (über Wehrarme)">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Neckar (über Wehrarme)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Rhein">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Rhein"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Saale">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saale"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Saale-Thüringen">
         <srid value="31467"/>
-        <dgm-srid value="31468"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saale-Thüringen"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Saar (Wiltinger Bogen)">
         <srid value="31467"/>
-        <dgm-srid value="31466"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saar (Wiltinger Bogen)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Werra (Winter)">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Werra (Winter)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Werra (Sommer)">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Werra (Sommer)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Weser">
         <srid value="31467"/>
-        <dgm-srid value="31467"/>
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Weser"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
diff -r 1f38656b68c4 -r 4713bc0cc0ee artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java
--- a/artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java	Thu Sep 19 16:27:33 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java	Thu Sep 19 17:08:02 2013 +0200
@@ -80,9 +80,6 @@
     public static final String XPATH_FLOODMAP_RIVER_PROJECTION =
         "/artifact-database/floodmap/river[@name=$name]/srid/@value";
 
-    public static final String XPATH_FLOODMAP_DGM_PROJECTION =
-        "/artifact-database/floodmap/river[@name=$name]/dgm-srid/@value";
-
     public static final String XPATH_FLOODMAP_SHAPEFILE_DIR =
         "/artifact-database/floodmap/shapefile-path/@value";
 


More information about the Dive4elements-commits mailing list