[Dive4elements-commits] [PATCH 1 of 2] Map view in DigitizePanel now shows OSM background, river axis and

[Wald Commits]

# HG changeset patch
# User Christian Lins <christian.lins at intevation.de>
# Date 1353065770 -3600
# Node ID fac54b8470d408656c15c1238be634863b05c848
# Parent  105dd4cc33a6ad06b677c01ba1e7157c26716f59
Map view in DigitizePanel now shows OSM background, river axis and
manual drawn barriers again.

Please note that this change requires changes in conf/floodmap.xml
in artifact-server.

diff -r 105dd4cc33a6 -r fac54b8470d4 flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java	Thu Nov 15 17:45:15 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java	Fri Nov 16 12:36:10 2012 +0100
@@ -246,14 +246,14 @@
         parameterList.registerCollectionViewTabHandler(this);
 
         WMS axis = getLayer(
-            mapInfo.getWmsUrl(), "riveraxis",
+            mapInfo.getWmsUrl(), "FLYS-Map", // FIXME: Make layer name configurable
             mapInfo.getProjection(), false);
         WMS back = getLayer(
             mapInfo.getBackgroundWmsUrl(), mapInfo.getBackgroundWmsLayers(),
             mapInfo.getProjection(), false);
 
+        map.addLayer(back);
         map.addLayer(axis);
-        map.addLayer(back);
 
         if (geojson != null && geojson.length() > 0) {
             VectorFeature[] features = new GeoJSON().read(geojson);
diff -r 105dd4cc33a6 -r fac54b8470d4 flys-client/src/main/java/de/intevation/flys/client/client/ui/map/FloodMap.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/FloodMap.java	Thu Nov 15 17:45:15 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/FloodMap.java	Fri Nov 16 12:36:10 2012 +0100
@@ -160,7 +160,7 @@
             barrierLayer.setIsBaseLayer(true);
 
             map.addLayer(barrierLayer);
-            map.raiseLayer(barrierLayer, -10);
+            map.setLayerZIndex(barrierLayer, 1000);
 
             barrierLayer.addVectorFeatureAddedListener(this);
         }
diff -r 105dd4cc33a6 -r fac54b8470d4 flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapPanel.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapPanel.java	Thu Nov 15 17:45:15 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapPanel.java	Fri Nov 16 12:36:10 2012 +0100
@@ -69,8 +69,8 @@
         width -= 2; // minus black borders
         height -= toolbar.getHeight() + 4;
 
-        this.floodMapWidget.setWidth(Integer.toString(width));
-        this.floodMapWidget.setHeight(Integer.toString(height));
+        floodMapWidget.setSize(Integer.toString(width), Integer.toString(height));
+        floodMapWidget.getMap().updateSize();
     }
 
 
diff -r 105dd4cc33a6 -r fac54b8470d4 flys-client/src/main/java/de/intevation/flys/client/shared/model/MapInfo.java
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/MapInfo.java	Thu Nov 15 17:45:15 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/MapInfo.java	Fri Nov 16 12:36:10 2012 +0100
@@ -5,6 +5,8 @@
 
 public class MapInfo implements Serializable {
 
+    private static final long serialVersionUID = 6691651140549280493L;
+
     protected String river;
     protected int    srid;
     protected BBox   bbox;