Ticket #1469: Virtual For All.patch

src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -60 +60 @@
     private boolean didMove = false;
     private boolean cancelDrawMode = false;
     Node virtualNode = null;
-    WaySegment virtualWay = null;
+    Collection<WaySegment> virtualWays = new ArrayList<WaySegment>();
     SequenceCommand virtualCmds = null;
 
     /**
@@ -146 +146 @@
     @Override public void mouseDragged(MouseEvent e) {
         if(!Main.map.mapView.isVisibleDrawableLayer())
             return;
-        
+
         cancelDrawMode = true;
         if (mode == Mode.select) return;
 
@@ -180 +180 @@
         if (dx == 0 && dy == 0)
             return;
 
-        if (virtualWay != null)    {
+        if (virtualWays.size() > 0) {
             Collection<Command> virtualCmds = new LinkedList<Command>();
             virtualCmds.add(new AddCommand(virtualNode));
-            Way w = virtualWay.way;
-            Way wnew = new Way(w);
-            wnew.addNode(virtualWay.lowerIndex+1, virtualNode);
-            virtualCmds.add(new ChangeCommand(w, wnew));
+            for(WaySegment virtualWay : virtualWays) {
+                Way w = virtualWay.way;
+                Way wnew = new Way(w);
+                wnew.addNode(virtualWay.lowerIndex+1, virtualNode);
+                virtualCmds.add(new ChangeCommand(w, wnew));
+            }
             virtualCmds.add(new MoveCommand(virtualNode, dx, dy));
-            Main.main.undoRedo.add(new SequenceCommand(tr("Add and move a virtual new node to way"), virtualCmds));
+            String text = virtualWays.size() == 1
+                ? tr("Add and move a virtual new node to way")
+                : tr("Add and move a virtual new node to {0} ways", virtualWays.size());
+
+            Main.main.undoRedo.add(new SequenceCommand(text, virtualCmds));
             selectPrims(Collections.singleton((OsmPrimitive)virtualNode), false, false);
-            virtualWay = null;
+            virtualWays.clear();
             virtualNode = null;
         } else {
             // Currently we support moving and rotating, which do not affect relations.
@@ -221 +227 @@
 
                         JOptionPane.showMessageDialog(Main.parent,
                             tr("Cannot move objects outside of the world."));
+                        restoreCursor();
                         return;
                     }
                 }
@@ -238 +245 @@
         didMove = true;
     }
 
-    private Collection<OsmPrimitive> getNearestCollectionVirtual(Point p) {
+    private Collection<OsmPrimitive> getNearestCollectionVirtual(Point p, boolean allSegements) {
         MapView c = Main.map.mapView;
         int snapDistance = Main.pref.getInteger("mappaint.node.virtual-snap-distance", 8);
         snapDistance *= snapDistance;
         OsmPrimitive osm = c.getNearestNode(p);
-        virtualWay = null;
+        virtualWays.clear();
         virtualNode = null;
+        Node virtualWayNode = null;
 
         if (osm == null)
         {
-            WaySegment nearestWaySeg = c.getNearestWaySegment(p);
-            if (nearestWaySeg != null)
-            {
-                osm = nearestWaySeg.way;
+            Collection<WaySegment> nearestWaySegs = allSegements
+                 ? c.getNearestWaySegments(p)
+                 : Collections.singleton(c.getNearestWaySegment(p));
+
+            for(WaySegment nearestWS : nearestWaySegs) {
+                if (nearestWS == null)
+                    continue;
+
+                osm = nearestWS.way;
                 if(Main.pref.getInteger("mappaint.node.virtual-size", 8) > 0)
                 {
                     Way w = (Way)osm;
-                    Point p1 = c.getPoint(w.nodes.get(nearestWaySeg.lowerIndex).eastNorth);
-                    Point p2 = c.getPoint(w.nodes.get(nearestWaySeg.lowerIndex+1).eastNorth);
+                    Point p1 = c.getPoint(w.nodes.get(nearestWS.lowerIndex).eastNorth);
+                    Point p2 = c.getPoint(w.nodes.get(nearestWS.lowerIndex+1).eastNorth);
                     if(SimplePaintVisitor.isLargeSegment(p1, p2, Main.pref.getInteger("mappaint.node.virtual-space", 70)))
                     {
                         Point pc = new Point((p1.x+p2.x)/2, (p1.y+p2.y)/2);
                         if (p.distanceSq(pc) < snapDistance)
                         {
-                            virtualWay = nearestWaySeg;
-                            virtualNode = new Node(Main.map.mapView.getLatLon(pc.x, pc.y));
-                            osm = w;
+                            // Check that only segments on top of each other get added to the
+                            // virtual ways list. Otherwise ways that coincidentally have their
+                            // virtual node at the same spot will be joined which is likely unwanted
+                            if(virtualWayNode != null) {
+                                if(  !w.nodes.get(nearestWS.lowerIndex+1).equals(virtualWayNode)
+                                  && !w.nodes.get(nearestWS.lowerIndex  ).equals(virtualWayNode))
+                                    continue;
+                            } else
+                                virtualWayNode = w.nodes.get(nearestWS.lowerIndex+1);
+
+                            virtualWays.add(nearestWS);
+                            if(virtualNode == null)
+                                virtualNode = new Node(Main.map.mapView.getLatLon(pc.x, pc.y));
                         }
                     }
                 }
@@ -287 +310 @@
     @Override public void mousePressed(MouseEvent e) {
         if(!Main.map.mapView.isVisibleDrawableLayer())
             return;
-        
+
         cancelDrawMode = false;
         if (! (Boolean)this.getValue("active")) return;
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
         boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-        // boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
+        boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
         boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
-        
+
         // We don't want to change to draw tool if the user tries to (de)select
         // stuff but accidentally clicks in an empty area when selection is empty
         if(shift || ctrl)
@@ -305 +328 @@
         didMove = false;
         initialMoveThresholdExceeded = false;
 
-        Collection<OsmPrimitive> osmColl = getNearestCollectionVirtual(e.getPoint());
+        Collection<OsmPrimitive> osmColl = getNearestCollectionVirtual(e.getPoint(), alt);
 
         if (ctrl && shift) {
             if (Main.ds.getSelected().isEmpty()) selectPrims(osmColl, true, false);
@@ -329 +352 @@
         if(mode != Mode.move || shift || ctrl)
         {
             virtualNode = null;
-            virtualWay = null;
+            virtualWays.clear();
         }
 
         updateStatusLine();
-        Main.map.mapView.repaint();
+        // Mode.select redraws when selectPrims is called
+        // Mode.move   redraws when mouseDragged is called
+        // Mode.rotate redraws here
+        if(mode == Mode.rotate)
+            Main.map.mapView.repaint();
 
         mousePos = e.getPoint();
     }
@@ -344 +371 @@
     @Override public void mouseReleased(MouseEvent e) {
         if(!Main.map.mapView.isVisibleDrawableLayer())
             return;
-        
+
         if (mode == Mode.select) {
             selectionManager.unregister(Main.map.mapView);
 
@@ -397 +424 @@
             }
         }
 
-        updateStatusLine();
+        // I don't see why we need this.
+        //updateStatusLine();
         mode = null;
         updateStatusLine();
     }