[PATCH] Remove FLYS-specific stuff from map configuration and allow to give a custom files in release script
Wald Commits
scm-commit at wald.intevation.org
Tue Mar 4 19:08:13 CET 2014
# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1393956482 -3600
# Node ID 9cce1b34e47b58da3d90e63b65e3e41a0baf78a4
# Parent abf3cb9cb6c4ad0f33eeb805b5bec273dc190a7b
Remove FLYS-specific stuff from map configuration and allow to give a custom files in release script.
diff -r abf3cb9cb6c4 -r 9cce1b34e47b artifacts/doc/conf/floodmap.xml
--- a/artifacts/doc/conf/floodmap.xml Tue Mar 04 18:40:00 2014 +0100
+++ b/artifacts/doc/conf/floodmap.xml Tue Mar 04 19:08:02 2014 +0100
@@ -2,7 +2,7 @@
<floodmap>
<shapefile-path value="${artifacts.config.dir}/../shapefiles"/>
<mapserver>
- <server path="http://example.com/cgi-bin/"/>
+ <server path="http://yourhost:8081/cgi-bin/"/>
<mapfile path="${artifacts.config.dir}/../flys.map"/>
<templates path="${artifacts.config.dir}/mapserver/"/>
<map-template path="mapfile.vm"/>
@@ -12,109 +12,9 @@
<logfile path="${artifacts.config.dir}/../velocity.log"/>
</velocity>
- <river name="Saar">
+ <river name="Beispielfluss">
<srid value="31467"/>
- <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"/>
- <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"/>
- <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="Donau (Regensburg Nordarm)">
- <srid value="31467"/>
- <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"/>
- <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"/>
- <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"/>
- <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 (Wiltinger Bogen)">
- <srid value="31467"/>
- <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"/>
- <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"/>
- <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-wms url="http://yourhost:8081/cgi-bin/river-wms" layers="Beispielfluss"/>
+ <background-wms url="http://osm.intevation.de/bfg/service?" layers="OSM-WMS-Dienst"/>
</river>
</floodmap>
diff -r abf3cb9cb6c4 -r 9cce1b34e47b artifacts/doc/conf/rivermap.xml
--- a/artifacts/doc/conf/rivermap.xml Tue Mar 04 18:40:00 2014 +0100
+++ b/artifacts/doc/conf/rivermap.xml Tue Mar 04 19:08:02 2014 +0100
@@ -2,7 +2,7 @@
<!--// configuration fragment for static river WMS //-->
<rivermap>
<mapserver>
- <server path="http://example.com/cgi-bin/"/>
+ <server path="http://yourhost:8081/cgi-bin/"/>
<mapfile path="${artifacts.config.dir}/../rivers.map"/>
<templates path="${artifacts.config.dir}/mapserver/"/>
<map-template path="river-mapfile.vm"/>
@@ -11,120 +11,10 @@
<velocity>
<logfile path="${artifacts.config.dir}/../rivermap_velocity.log"/>
</velocity>
-
- <river name="Saar">
+
+ <river name="Beispielfluss">
<srid value="31467"/>
- <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"/>
- <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"/>
- <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="Donau (Regensburg Nordarm)">
- <srid value="31467"/>
- <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"/>
- <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"/>
- <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"/>
- <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 (Wiltinger Bogen)">
- <srid value="31467"/>
- <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"/>
- <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"/>
- <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>
- <river name="Oder">
- <srid value="31467"/>
- <river-wms url="http://example.com/cgi-bin/river-wms" layers="Oder"/>
- <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
- </river>
- <river name="Havel">
- <srid value="31467"/>
- <river-wms url="http://example.com/cgi-bin/river-wms" layers="Havel"/>
- <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+ <river-wms url="http://yourhost:8081/cgi-bin/river-wms" layers="Beispielfluss"/>
+ <background-wms url="http://osm.intevation.de/bfg/service?" layers="OSM-WMS-Dienst"/>
</river>
</rivermap>
diff -r abf3cb9cb6c4 -r 9cce1b34e47b contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh Tue Mar 04 18:40:00 2014 +0100
+++ b/contrib/make_flys_release/make_release.sh Tue Mar 04 19:08:02 2014 +0100
@@ -222,6 +222,14 @@
sed -i -e "s@/usr/share/fonts/truetype/freefont@${FONT_PATH}@g" \
$FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/config.yaml
+if [ -r "$RIVERMAP_XML" ]; then
+ cp "$RIVERMAP_XML" $FLYS_SOURCE_DIR/river/artifacts/doc/conf/rivermap.xml
+fi
+
+if [ -r "$FLOODMAP_XML" ]; then
+ cp "$FLOODMAP_XML" $FLYS_SOURCE_DIR/river/artifacts/doc/conf/floodmap.xml
+fi
+
if [ ! -f $FLYS_SOURCE_DIR/OpenLayers-2.11.tar.gz ]; then
echo "INFO: download OpenLayers-2.11 for client"
cd $FLYS_SOURCE_DIR
More information about the Dive4elements-commits
mailing list