Changeset 2395 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2009-11-07T06:22:27+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3839: Layer order: gpx defaults above data-layer

File:

• trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -43 +43 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
@@ -148 +149 @@
 
     /**
+     * Adds a GPX layer. A GPX layer is added below the lowest data layer.
+     * 
+     * @param layer the GPX layer
+     */
+    protected void addGpxLayer(GpxLayer layer) {
+        if (layers.isEmpty()) {
+            layers.add(layer);
+            return;
+        }
+        for (int i=layers.size()-1; i> 0; i--) {
+            if (layers.get(i) instanceof OsmDataLayer) {
+                if (i == layers.size()) {
+                    layers.add(layer);
+                } else {
+                    layers.add(i+1, layer);
+                }
+                return;
+            }
+        }
+        layers.add(layer);
+    }
+
+    /**
      * Add a layer to the current MapView. The layer will be added at topmost
      * position.
@@ -158 +182 @@
         if (layer.isBackgroundLayer() || layers.isEmpty()) {
             layers.add(layer);
+        } else if (layer instanceof GpxLayer){
+            addGpxLayer((GpxLayer)layer);
         } else {
             layers.add(0, layer);