Changeset 422 in josm for trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

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

File:

• trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (1 diff)

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.
          */