Changeset 422 in josm for trunk/src/org

Timestamp:

2007-10-25T22:54:01+02:00 (17 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

Files:

• actions/MergeNodesAction.java (added)
• actions/mapmode/SelectAction.java (modified) (3 diffs)
• gui/MainMenu.java (modified) (3 diffs)
• gui/NavigatableComponent.java (modified) (1 diff)

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.";

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -23 +23 @@
 import org.openstreetmap.josm.actions.GpxExportAction;
 import org.openstreetmap.josm.actions.HelpAction;
+import org.openstreetmap.josm.actions.MergeNodesAction;
 import org.openstreetmap.josm.actions.NewAction;
 import org.openstreetmap.josm.actions.OpenAction;
@@ -65 +66 @@
         public final Action alignInCircle = new AlignInCircleAction();
         public final Action alignInLine = new AlignInLineAction();
+        public final Action mergeNodes = new MergeNodesAction();
         public final Action upload = new UploadAction();
         public final Action save = new SaveAction(null);
@@ -129 +131 @@
                 toolsMenu.add(splitWay);
                 toolsMenu.add(combineWay);
+                toolsMenu.addSeparator();
+                toolsMenu.add(mergeNodes);
                 add(toolsMenu);
 

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -291 +291 @@
 
         /**
+         * @return A list of all nodes that are nearest to
+         * the mouse.  Does a simple sequential scan on all the data.
+         *
+         * @return A collection of all nodes or <code>null</code>
+         *              if no node under or near the point. The returned
+         *              list is never empty.
+         */
+        public Collection<Node> getNearestNodes(Point p) {
+                Collection<Node> nearest = new HashSet<Node>();
+                for (Node n : Main.ds.nodes) {
+                        if (!n.deleted && !n.incomplete
+                                        && getPoint(n.eastNorth).distanceSq(p) < 100) {
+                                nearest.add(n);
+                        }
+                }
+                return nearest.isEmpty() ? null : nearest;
+        }
+
+        /**
+         * @return the nearest nodes to the screen point given that is not 
+         * in ignore.
+         * 
+         * @param p the point for which to search the nearest segment.
+         * @param ignore a collection of nodes which are not to be returned.
+         * May be null.
+         */
+        public final Collection<Node> getNearestNodes(Point p, Collection<Node> ignore) {
+                Collection<Node> nearest = getNearestNodes(p);
+                if (nearest == null) return null;
+                if (ignore != null) nearest.removeAll(ignore);
+                return nearest.isEmpty() ? null : nearest;
+        }
+
+        /**
          * @return The projection to be used in calculating stuff.
          */