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

Timestamp:

2007-07-18T23:12:56+02:00 (17 years ago)

Author:

imi

Message:

• added support for multiple data layers

File:

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

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -81 +82 @@
 
                 // listend to selection changes to redraw the map
-                Main.ds.listeners.add(new SelectionChangedListener(){
+                DataSet.listeners.add(new SelectionChangedListener(){
                         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
                                 repaint();
@@ -102 +103 @@
         public void addLayer(Layer layer) {
                 if (layer instanceof OsmDataLayer) {
-                        final OsmDataLayer dataLayer = (OsmDataLayer)layer;
-                        if (editLayer != null) {
-                                editLayer.mergeFrom(layer);
-                                repaint();
-                                return;
-                        }
-                        editLayer = dataLayer;
-                        dataLayer.data.listeners.addAll(Main.ds.listeners);
-                        Main.ds = dataLayer.data;
-                        dataLayer.listenerModified.add(new ModifiedChangedListener(){
+                        editLayer = (OsmDataLayer)layer;
+                        Main.ds = editLayer.data;
+                        editLayer.listenerModified.add(new ModifiedChangedListener(){
                                 public void modifiedChanged(boolean value, OsmDataLayer source) {
                                         JOptionPane.getFrameForComponent(Main.parent).setTitle((value?"*":"")+tr("Java OpenStreetMap - Editor"));
@@ -118 +112 @@
                 }
 
-                // add as a new layer
-                if (layer instanceof OsmDataLayer)
-                        layers.add(0, layer);
-                else
-                        layers.add(layers.size(), layer);
+                layers.add(layers.size(), layer);
 
                 for (LayerChangeListener l : listeners)
@@ -176 +166 @@
                 for (int i = layers.size()-1; i >= 0; --i) {
                         Layer l = layers.get(i);
-                        if (l.visible)
+                        if (l.visible && l != getActiveLayer())
                                 l.paint(g, this);
                 }
+                if (getActiveLayer().visible)
+                        getActiveLayer().paint(g, this);
 
                 // draw world borders
@@ -261 +253 @@
                 if (!layers.contains(layer))
                         throw new IllegalArgumentException("Layer must be in layerlist");
+                if (layer instanceof OsmDataLayer) {
+                        editLayer = (OsmDataLayer)layer;
+                        Main.ds = editLayer.data;
+                        DataSet.fireSelectionChanged(Main.ds.getSelected());
+                }
                 Layer old = activeLayer;
                 activeLayer = layer;
@@ -266 +263 @@
                         for (LayerChangeListener l : listeners)
                                 l.activeLayerChange(old, layer);
+                repaint();
         }