Changeset 19597 in osm for applications/editors

Timestamp:

2010-01-23T15:12:03+01:00 (15 years ago)

Author:

jttt

Message:

Fixed #4398 validator: repair: "doppelte Knoten": please, always merge ID:0 to already existing node with ID

File:

• applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java (modified) (10 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java

@@ -38 +38 @@
 
     /** The map of potential duplicates.
-     * 
+     *
      * If there is exactly one node for a given pos, the map includes a pair <pos, Node>.
-     * If there are multiple nodes for a given pos, the map includes a pair 
-     * <pos, NodesByEqualTagsMap>  
+     * If there are multiple nodes for a given pos, the map includes a pair
+     * <pos, NodesByEqualTagsMap>
      */
     Map<LatLon,Object> potentialDuplicates;
@@ -59 +59 @@
         potentialDuplicates = new HashMap<LatLon, Object>();
     }
- 
-   
+
+
         @Override
-        public void endTest() { 
+        public void endTest() {
                 for (Entry<LatLon, Object> entry: potentialDuplicates.entrySet()) {
                         Object v = entry.getValue();
@@ -69 +69 @@
                                 // error
                                 continue;
-                        }                       
-                        
-                        // multiple nodes at the same position -> report errors 
+                        }
+
+                        // multiple nodes at the same position -> report errors
                         //
                         NodesByEqualTagsMap map = (NodesByEqualTagsMap)v;
@@ -84 +84 @@
                 if (n.isUsable()) {
                         LatLon rounded = n.getCoor().getRoundedToOsmPrecision();
-                        if (potentialDuplicates.get(rounded) == null) {         
+                        if (potentialDuplicates.get(rounded) == null) {
                                 // in most cases there is just one node at a given position. We
-                                // avoid to create an extra object and add remember the node 
-                                // itself at this position 
+                                // avoid to create an extra object and add remember the node
+                                // itself at this position
                                 potentialDuplicates.put(rounded, n);
                         } else if (potentialDuplicates.get(rounded) instanceof Node) {
@@ -99 +99 @@
                                 potentialDuplicates.put(rounded, map);
                         } else if (potentialDuplicates.get(rounded) instanceof NodesByEqualTagsMap) {
-                                // we have multiple nodes at the same position. 
-                                // 
+                                // we have multiple nodes at the same position.
+                                //
                                 NodesByEqualTagsMap map = (NodesByEqualTagsMap)potentialDuplicates.get(rounded);
                                 map.add(n);
-                        }                       
+                        }
                 }
         }
@@ -116 +116 @@
         Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>(testError.getPrimitives());
         LinkedHashSet<Node> nodes = new LinkedHashSet<Node>(OsmPrimitive.getFilteredList(sel, Node.class));
-        Node target = MergeNodesAction.selectTargetNode(nodes);
+
+        // Use first existing node or first node if all nodes are new
+        Node target = null;
+        for (Node n: nodes) {
+            if (!n.isNew()) {
+                target = n;
+                break;
+            }
+        }
+        if (target == null) {
+            nodes.iterator().next();
+        }
+
         if(checkAndConfirmOutlyingDeletes(nodes))
             return MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodes, target);
@@ -157 +169 @@
         return true;
     }
-    
+
     static private class NodesByEqualTagsMap {
         /**
          * a bag of primitives with the same position. The bag key is represented
          * by the tag set of the primitive. This allows for easily find nodes at
-         * the same position with the same tag sets later. 
+         * the same position with the same tag sets later.
          */
         private Bag<Map<String,String>, OsmPrimitive> bag;
@@ -169 +181 @@
                 bag = new Bag<Map<String,String>, OsmPrimitive>();
         }
-        
+
         public void add(Node n) {
                 bag.add(n.getKeys(), n);
         }
-                
+
         public List<TestError> buildTestErrors(Test parentTest) {
                 List<TestError> errors = new ArrayList<TestError>();
                 // check whether we have multiple nodes at the same position with
-                // the same tag set 
-                //              
+                // the same tag set
+                //
                 for (Iterator<Map<String,String>> it = bag.keySet().iterator(); it.hasNext(); ) {
                         Map<String,String> tagSet = it.next();
                         if (bag.get(tagSet).size() > 1) {
                                 errors.add(new TestError(
-                                                parentTest, 
+                                                parentTest,
                                                 Severity.ERROR,
-                                                tr("Duplicated nodes"), 
-                                                DUPLICATE_NODE, 
+                                                tr("Duplicated nodes"),
+                                                DUPLICATE_NODE,
                                                 bag.get(tagSet)
                                 ));
                                 it.remove();
                         }
-                        
+
                 }
-                
+
                 // check whether we have multiple nodes at the same position with
-                // differing tag sets 
+                // differing tag sets
                 //
                 if (!bag.isEmpty()) {
@@ -204 +216 @@
                         if (duplicates.size() > 1) {
                                 errors.add(new TestError(
-                                                parentTest, 
+                                                parentTest,
                                                 Severity.WARNING,
                                                         tr("Nodes at same position"),
@@ -213 +225 @@
                 }
                 return errors;
-        }       
+        }
     }
 }