Changeset 422 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2007-10-25T22:54:01+02:00 (19 years ago)

Author:

framm

Message:

• added patch by Matthew Newton <matthew-osm@…> to merge nodes. I know there's already a merge nodes in the utils plugin but I guess we need the node merge in the core, as we already have merging and splitting ways there...

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• MergeNodesAction.java (added)
• mapmode/SelectAction.java (modified) (3 diffs)

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

@@ -29 +29 @@
 import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.actions.MergeNodesAction;
 /**
  * Move is an action that can move all kind of OsmPrimitives (except Keys for now).
@@ -232 +233 @@
                 }
                 restoreCursor();
+    if (mode == Mode.move) {
+                  boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
+      if (ctrl) {
+                    Collection<OsmPrimitive> selection = Main.ds.getSelected();
+                    Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
+                    Collection<Node> nn = Main.map.mapView.getNearestNodes(e.getPoint(), affectedNodes);
+        if (nn != null) {
+          Node n = nn.iterator().next();
+          LinkedList<Node> selNodes = new LinkedList<Node>();
+          for (OsmPrimitive osm : selection)
+            if (osm instanceof Node)
+              selNodes.add((Node)osm);
+          if (selNodes.size() > 0) {
+            selNodes.add(n);
+            MergeNodesAction.mergeNodes(selNodes, n);
+          }
+        }
+      }
+    }
                 updateStatusLine();
                 mode = null;
@@ -264 +284 @@
                         return "Release the mouse button to select the objects in the rectangle.";
                 } else if (mode == Mode.move) {
-                        return "Release the mouse button to stop moving.";
+                        return "Release the mouse button to stop moving. Ctrl to merge with nearest node.";
                 } else if (mode == Mode.rotate) {
                         return "Release the mouse button to stop rotating.";