Changes in src/org/openstreetmap/josm/gui/MapView.java [17:30] in josm

File:

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

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

@@ -17 +17 @@
 import javax.swing.event.ChangeListener;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.GeoPoint;
@@ -26 +27 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 /**
  * This is a component used in the MapFrame for browsing the map. It use is to
  * provide the MapMode's enough capabilities to operate. 
- * 
- * MapView holds the map data, organize it, convert it, provide access to it.
  * 
  * MapView hold meta-data about the data set currently displayed, as scale level,
@@ -73 +73 @@
         private ArrayList<Layer> layers = new ArrayList<Layer>();
         /**
+         * Direct link to the edit layer (if any) in the layers list.
+         */
+        private OsmDataLayer editLayer;
+        /**
          * The layer from the layers list that is currently active.
          */
@@ -86 +90 @@
          */
         public MapView(Layer layer) {
-                if (layer.getDataSet() == null)
-                        throw new IllegalArgumentException("Initial layer must have a dataset.");
-
                 addComponentListener(new ComponentAdapter(){
                         @Override
@@ -102 +103 @@
                 addLayer(layer);
                 Main.pref.addPropertyChangeListener(this);
-
-                // init screen
-                recalculateCenterScale();
         }
 
@@ -112 +110 @@
          */
         public void addLayer(Layer layer) {
+                // initialize the projection if it is the first layer
+                if (layers.isEmpty())
+                        Main.pref.getProjection().init(layer.getBoundsLatLon());
+
+                // reinitialize layer's data
+                layer.init(Main.pref.getProjection());
+
+                if (layer instanceof OsmDataLayer) {
+                        if (editLayer != null) {
+                                // merge the layer into the existing one
+                                if (!editLayer.isMergable(layer))
+                                        throw new IllegalArgumentException("Cannot merge argument");
+                                editLayer.mergeFrom(layer);
+                                repaint();
+                                return;
+                        }
+                        editLayer = (OsmDataLayer)layer;
+                }
+
+                // add as a new layer
                 layers.add(0,layer);
-
-                DataSet ds = layer.getDataSet();
-
-                if (ds != null) {
-                        // initialize the projection if it was the first layer
-                        if (layers.size() == 1)
-                                Main.pref.getProjection().init(ds);
-                        
-                        // initialize the dataset in the new layer
-                        for (Node n : ds.nodes)
-                                Main.pref.getProjection().latlon2xy(n.coor);
-                }
 
                 for (LayerChangeListener l : listeners)
                         l.layerAdded(layer);
 
+                // autoselect the new layer
                 setActiveLayer(layer);
         }
-        
+
         /**
          * Remove the layer from the mapview. If the layer was in the list before,
@@ -140 +147 @@
                         for (LayerChangeListener l : listeners)
                                 l.layerRemoved(layer);
+                if (layer == editLayer)
+                        editLayer = null;
         }
 
@@ -232 +241 @@
                 OsmPrimitive minPrimitive = null;
 
-                // calculate the object based on the current active dataset.
-                DataSet ds = getActiveDataSet();
-                
                 // nodes
-                for (Node n : ds.nodes) {
+                for (Node n : Main.main.ds.nodes) {
                         Point sp = getScreenPoint(n.coor);
                         double dist = p.distanceSq(sp);
@@ -248 +254 @@
                 
                 // pending line segments
-                for (LineSegment ls : ds.pendingLineSegments()) {
-                        Point A = getScreenPoint(ls.getStart().coor);
-                        Point B = getScreenPoint(ls.getEnd().coor);
+                for (LineSegment ls : Main.main.ds.lineSegments) {
+                        Point A = getScreenPoint(ls.start.coor);
+                        Point B = getScreenPoint(ls.end.coor);
                         double c = A.distanceSq(B);
                         double a = p.distanceSq(B);
@@ -263 +269 @@
                 // tracks & line segments
                 minDistanceSq = Double.MAX_VALUE;
-                for (Track t : ds.tracks()) {
-                        for (LineSegment ls : t.segments()) {
-                                Point A = getScreenPoint(ls.getStart().coor);
-                                Point B = getScreenPoint(ls.getEnd().coor);
+                for (Track t : Main.main.ds.tracks) {
+                        for (LineSegment ls : t.segments) {
+                                Point A = getScreenPoint(ls.start.coor);
+                                Point B = getScreenPoint(ls.end.coor);
                                 double c = A.distanceSq(B);
                                 double a = p.distanceSq(B);
@@ -320 +326 @@
                 for (int i = layers.size()-1; i >= 0; --i) {
                         Layer l = layers.get(i);
-                        if (l.isVisible())
+                        if (l.visible)
                                 l.paint(g, this);
                 }
@@ -332 +338 @@
                 // reset all datasets.
                 Projection p = Main.pref.getProjection();
-                for (Layer l : layers) {
-                        DataSet ds = l.getDataSet();
-                        if (ds != null)
-                                for (Node n : ds.nodes)
-                                        p.latlon2xy(n.coor);
-                }
+                for (Node n : Main.main.ds.nodes)
+                        p.latlon2xy(n.coor);
                 recalculateCenterScale();
         }
@@ -375 +377 @@
 
         
-        /**
-         * Return the dataSet for the current selected layer. If the active layer
-         * does not have a dataset, return the DataSet from the next layer a.s.o.
-         *  
-         * @return The DataSet of the current active layer.
-         */
-        public DataSet getActiveDataSet() {
-                if (activeLayer.getDataSet() != null)
-                        return activeLayer.getDataSet();
-                for (Layer l : layers) {
-                        DataSet ds = l.getDataSet();
-                        if (ds != null)
-                                return ds;
-                }
-                throw new IllegalStateException("No dataset found.");
-        }
-
         /**
          * Change to the new projection. Recalculate the dataset and zoom, if autoZoom
@@ -425 +410 @@
                                 h = 20;
                         
-                        Bounds bounds = getActiveDataSet().getBoundsXY();
-                        
+                        Bounds bounds = null;
+                        for (Layer l : layers) {
+                                if (bounds == null)
+                                        bounds = l.getBoundsXY();
+                                else {
+                                        Bounds lb = l.getBoundsXY();
+                                        if (lb != null)
+                                                bounds = bounds.mergeXY(lb);
+                                }
+                        }
+
                         boolean oldAutoScale = autoScale;
                         GeoPoint oldCenter = center;
@@ -479 +473 @@
         /**
          * Set the active selection to the given value and raise an layerchange event.
+         * Also, swap the active dataset in Main.main if it is a datalayer.
          */
         public void setActiveLayer(Layer layer) {
@@ -485 +480 @@
                 Layer old = activeLayer;
                 activeLayer = layer;
+                if (layer instanceof OsmDataLayer)
+                        Main.main.ds = ((OsmDataLayer)layer).data;
                 if (old != layer) {
-                        if (old != null && old.getDataSet() != null)
-                                old.getDataSet().clearSelection();
                         for (LayerChangeListener l : listeners)
                                 l.activeLayerChange(old, layer);
@@ -500 +495 @@
                 return activeLayer;
         }
+
+        /**
+         * @return The current edit layer. If no edit layer exist, one is created.
+         *              So editLayer does never return <code>null</code>.
+         */
+        public OsmDataLayer editLayer() {
+                if (editLayer == null)
+                        addLayer(new OsmDataLayer(new DataSet(), "unnamed"));
+                return editLayer;
+        }
 }