# HG changeset patch
# User Bettina Gruenbauer <bettina@intevation.de>
# Date 1363262016 -3600
# Node ID 55122db34cd0d0f7632153cefb80f257a81e7714
# Parent  ee7b0306b2bf11b9fde8175c7cd82ebafcb25293# Parent  3f35d9db48c120e97f2e2f3bfbd31fdcb94b72fe
merge

diff -r 3f35d9db48c1 -r 55122db34cd0 flys-artifacts/doc/conf/floodmap.xml
--- a/flys-artifacts/doc/conf/floodmap.xml	Thu Mar 14 12:45:51 2013 +0100
+++ b/flys-artifacts/doc/conf/floodmap.xml	Thu Mar 14 12:53:36 2013 +0100
@@ -30,4 +30,112 @@
         <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="Donaurna">
+        <srid value="31467"/>
+        <dgm-srid value="25833"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Donaurna"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+    </river>
+    <river name="DonauSK">
+        <srid value="31467"/>
+        <dgm-srid value="25833"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="DonauSK"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+    </river>
+    <river name="Fulda">
+        <srid value="31467"/>
+        <dgm-srid value="31467"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Fulda"/>
+        <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-Wilt-Bogen">
+        <srid value="31467"/>
+        <dgm-srid value="31466"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saar-Wilt-Bogen"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+    </river>
+    <river name="Werra">
+        <srid value="31467"/>
+        <dgm-srid value="31467"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Werra"/>
+        <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>
 </floodmap>
diff -r 3f35d9db48c1 -r 55122db34cd0 flys-artifacts/doc/conf/rivermap.xml
--- a/flys-artifacts/doc/conf/rivermap.xml	Thu Mar 14 12:45:51 2013 +0100
+++ b/flys-artifacts/doc/conf/rivermap.xml	Thu Mar 14 12:53:36 2013 +0100
@@ -27,4 +27,94 @@
         <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"/>
+        <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="Donaurna">
+        <srid value="31467"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Donaurna"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+    </river>
+    <river name="DonauSK">
+        <srid value="31467"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="DonauSK"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+    </river>
+    <river name="Fulda">
+        <srid value="31467"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Fulda"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+    </river>
+    <river name="Fulda-Sommer">
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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-Wilt-Bogen">
+        <srid value="31467"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saar-Wilt-Bogen"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+    </river>
+    <river name="Werra">
+        <srid value="31467"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Werra"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+    </river>
+    <river name="Werra-Sommer">
+        <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"/>
+        <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>
 </rivermap>