Changeset 5503 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-09-07T22:56:01+02:00 (12 years ago)

Author:

Don-vip

Message:

Validator: no warning if all nodes at the same position have a distinct elevation (this happens for example with geodesic points in France)

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

@@ -9 +9 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -126 +127 @@
         for (Object v: potentialDuplicates) {
             if (v instanceof Node) {
-                // just one node at this position. Nothing to report as
-                // error
+                // just one node at this position. Nothing to report as error
                 continue;
             }
 
-            // multiple nodes at the same position -> report errors
-            //
+            // multiple nodes at the same position -> check if all nodes have a distinct elevation
             List<Node> nodes = (List<Node>) v;
+            Set<String> eles = new HashSet<String>();
+            for (Node n : nodes) {
+                String ele = n.get("ele");
+                if (ele != null) {
+                    eles.add(ele);
+                }
+            }
+            if (eles.size() == nodes.size()) {
+                // All nodes at this position have a distinct elevation.
+                // This is normal in some particular cases (for example, geodesic points in France)
+                // Do not report this as an error
+                continue;
+            }
+            
+            // report errors
             errors.addAll(buildTestErrors(this, nodes));
         }