Changeset 3652 in josm

Timestamp:

Nov 8, 2010 11:29:07 PM (3 years ago)

Author:

bastiK

Message:

fixed #5609 (patch by cmuelle8) - Unable to move node under another one

File:

• trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (6 diffs)

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

@@ -593 +593 @@
                     if (ntsel == null && nd.isSelected()) {
                         ntsel = nd;
+                        // if there are multiple nearest nodes, prefer the one
+                        // that is selected. This is required in order to drag
+                        // the selected node if multiple nodes have the same
+                        // coordinates (e.g. after unglue)
+                        use_selected |= (distSq == minDistSq);
                     }
                     // find the nearest newest node that is within about the same
@@ -604 +609 @@
             // take nearest selected, nearest new or true nearest node to p, in that order
             n = (ntsel != null && use_selected) ? ntsel
-                    : ((ntnew != null) ? ntnew
-                            : nlists.values().iterator().next().get(0));
-        }
-
+                    : (ntnew != null) ? ntnew
+                            : nlists.values().iterator().next().get(0);
+        }
         return n;
     }
@@ -994 +998 @@
      * @return o as collection of o's type.
      */
-    public final static <T> Collection<T> asColl(T o) {
+    public static <T> Collection<T> asColl(T o) {
         if (o == null)
             return Collections.emptySet();
@@ -1000 +1004 @@
     }
 
-    public final static double perDist(Point2D pt, Point2D a, Point2D b) {
+    public static double perDist(Point2D pt, Point2D a, Point2D b) {
         if (pt != null && a != null && b != null) {
             double pd = (
@@ -1018 +1022 @@
      *      with its orthogonal line running through pt
      */
-    public final static Point2D project(Point2D pt, Point2D a, Point2D b) {
+    public static Point2D project(Point2D pt, Point2D a, Point2D b) {
         if (pt != null && a != null && b != null) {
             double r = ((
@@ -1038 +1042 @@
      * @return new point at a + r*(ab)
      */
-    public final static Point2D project(double r, Point2D a, Point2D b) {
+    public static Point2D project(double r, Point2D a, Point2D b) {
         Point2D ret = null;