Changeset 943 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2008-09-10T01:09:39+02:00 (16 years ago)

Author:

framm

Message:

• fixed virtual node problem where clicking and not dragging one virtual node, then clicking and dragging part of another way that did not have a virtual node, would create and move the virtual node clicked first.

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (5 diffs)

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

@@ -168 +168 @@
                         return;
 
-                if(virtualWay != null)
-                {
+                if (virtualWay != null) {
                         Collection<Command> virtualCmds = new LinkedList<Command>();
                         virtualCmds.add(new AddCommand(virtualNode));
@@ -181 +180 @@
                         virtualWay = null;
                         virtualNode = null;
-                }
-                else
-                {
+                } else {
                         Collection<OsmPrimitive> selection = Main.ds.getSelected();
                         Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
@@ -193 +190 @@
                         Command c = !Main.main.undoRedo.commands.isEmpty()
                                 ? Main.main.undoRedo.commands.getLast() : null;
-                        if(c instanceof SequenceCommand)
+                        if (c instanceof SequenceCommand)
                                 c = ((SequenceCommand)c).getLastCommand();
 
@@ -232 +229 @@
                 snapDistance *= snapDistance;
                 OsmPrimitive osm = c.getNearestNode(p);
+                virtualWay = null;
+                virtualNode = null;
+                
                 if (osm == null)
                 {
                         WaySegment nearestWaySeg = c.getNearestWaySegment(p);
-                        if(nearestWaySeg != null)
+                        if (nearestWaySeg != null)
                         {
                                 osm = nearestWaySeg.way;
@@ -246 +246 @@
                                         {
                                                 Point pc = new Point((p1.x+p2.x)/2, (p1.y+p2.y)/2);
-                                                if(p.distanceSq(pc) < snapDistance)
+                                                if (p.distanceSq(pc) < snapDistance)
                                                 {
                                                         virtualWay = nearestWaySeg;