Changeset 18122 in osm for applications

Timestamp:

2009-10-13T21:36:03+02:00 (15 years ago)

Author:

skela

Message:

Fixed #3669 in the JOSM Validator plugin: Do not complain about nodes
with same name if each same-name node has a unique ref value.

File:

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

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

@@ -6 +6 @@
 import java.util.List;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.ArrayList;
 
@@ -26 +27 @@
 
     @Override public void startTest(ProgressMonitor monitor) {
-        super.startTest(monitor);
+        super.startTest(monitor);
         namesToNodes = new HashMap<String, List<Node>>();
     }
@@ -47 +48 @@
         for (List<Node> nodes : namesToNodes.values()) {
             if (nodes.size() > 1) {
-                errors.add(new TestError(this, Severity.OTHER,
-                    tr("Nodes with same name"), SAME_NAME, nodes));
+                // Report the same-name nodes, unless each has a unique ref=*.
+                HashSet<String> refs = new HashSet<String>();
+
+                for (Node n : nodes) {
+                    String ref = n.get("ref");
+                    if (ref == null || !refs.add(ref)) {
+                        errors.add(new TestError(this, Severity.OTHER,
+                            tr("Nodes with same name"), SAME_NAME, nodes));
+                        break;
+                    }
+                }
             }
         }