Changeset 5443 in josm for trunk/src/org

Timestamp:

2012-08-14T10:07:01+02:00 (12 years ago)

Author:

akks

Message:

see #7888: Ctrl-Drag moves the node/way under cursor; fix dragging after rotation; minor refactoring of SelectAction

File:

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

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

@@ -436 +436 @@
                 virtualManager.activateVirtualNodeNearPoint(e.getPoint());
             }
-            selectPrims(cycleManager.cycleSetup(nearestPrimitive, e.getPoint()), false, false);
+            OsmPrimitive toSelect = cycleManager.cycleSetup(nearestPrimitive, e.getPoint());
+            selectPrims(mv.asColl(toSelect), false, false);
             useLastMoveCommandIfPossible();
             break;
@@ -661 +662 @@
         // So don't add them in the first place to make handling easier
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelectedNodesAndWays();
+        if (selection.isEmpty()) { // if nothing was selected to drag, just select nearest node/way to the cursor
+            OsmPrimitive nearestPrimitive = mv.getNearestNodeOrWay(mv.getPoint(startEN), OsmPrimitive.isSelectablePredicate, true);
+            getCurrentDataSet().setSelected(nearestPrimitive);
+        }
+        
         Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
         // for these transformations, having only one node makes no sense - quit silently
@@ -690 +696 @@
             }
             getCurrentDataSet().endUpdate();
-        } else if (mode == Mode.rotate) {
+            return true;
+        } 
+
+        startEN = currentEN; // drag can continue after scaling/rotation
+
+        if (mode == Mode.rotate) {
             getCurrentDataSet().beginUpdate();
             if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand) c).getTransformedNodes())) {
@@ -885 +896 @@
          * @param nearest primitive found by simple method
          * @param p point where user clicked
-         * @return single-element collection with OsmPrimitive to be selected
+         * @return OsmPrimitive to be selected
          */
-        private Collection<OsmPrimitive> cycleSetup(OsmPrimitive nearest, Point p) {
+        private OsmPrimitive cycleSetup(OsmPrimitive nearest, Point p) {
             OsmPrimitive osm = null;
 
@@ -938 +949 @@
                 }
             }
-
-            return MapView.asColl(osm);
+            return osm;
         }