Changeset 5989 in josm for trunk/src/org

Timestamp:

2013-06-05T00:26:22+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8760 - When merging nodes, keep the oldest used one, not just only the oldest one.

File:

• trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -153 +153 @@
      */
     public static Node selectTargetNode(Collection<Node> candidates) {
+        Node oldestNode = null;
         Node targetNode = null;
         Node lastNode = null;
         for (Node n : candidates) {
             if (!n.isNew()) {
-                if (targetNode == null) {
-                    targetNode = n;
-                } else if (n.getId() < targetNode.getId()) {
-                    targetNode = n;
+                // Among existing nodes, try to keep the oldest used one
+                if (!n.getReferrers().isEmpty()) {
+                    if (targetNode == null) {
+                        targetNode = n;
+                    } else if (n.getId() < targetNode.getId()) {
+                        targetNode = n;
+                    }
+                } else if (oldestNode == null) {
+                    oldestNode = n;
+                } else if (n.getId() < oldestNode.getId()) {
+                    oldestNode = n;
                 }
             }
@@ -166 +174 @@
         }
         if (targetNode == null) {
-            targetNode = lastNode;
+            targetNode = (oldestNode != null ? oldestNode : lastNode);
         }
         return targetNode;