Changeset 5216 in josm for trunk/src/org

Timestamp:

2012-05-06T18:08:21+02:00 (13 years ago)

Author:

Don-vip

Message:

fix #7673 - merging nodes with Ctrl key sometimes replaces known id with id:0

File:

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

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

@@ -152 +152 @@
      * @return the selected target node
      */
-    public static Node selectTargetNode(List<Node> candidates) {
+    public static Node selectTargetNode(Collection<Node> candidates) {
         Node targetNode = null;
         Node lastNode = null;
@@ -241 +241 @@
 
     public static Command mergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetNode) {
-        return mergeNodes(layer, nodes, targetNode, targetNode);
+        if (nodes == null) {
+            return null;
+        }
+        Set<Node> allNodes = new HashSet<Node>(nodes);
+        allNodes.add(targetNode);
+        return mergeNodes(layer, nodes, selectTargetNode(allNodes), targetNode);
     }