Changeset 6862 in josm

Timestamp:

2014-02-17T19:42:07+01:00 (10 years ago)

Author:

simon04

Message:

see #9598 - Validator: report "Overlapping ways" only if at least 3 segments are shared

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/WaySegment.java (modified) (1 diff)
• validation/tests/OverlappingWays.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java

@@ -94 +94 @@
     @Override
     public String toString() {
-        return "WaySegment [way=" + way.getId() + ", lowerIndex=" + lowerIndex + "]";
+        return "WaySegment [way=" + way.getUniqueId() + ", lowerIndex=" + lowerIndex + "]";
     }
 }

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

@@ -74 +74 @@
         Map<List<Way>, Set<WaySegment>> seenWays = new HashMap<List<Way>, Set<WaySegment>>(500);
 
+        Collection<TestError> preliminaryErrors = new ArrayList<TestError>();
         for (Set<WaySegment> duplicated : nodePairs.values()) {
             int ways = duplicated.size();
@@ -137 +138 @@
                     }
 
-                    errors.add(new TestError(this,
+                    preliminaryErrors.add(new TestError(this,
                             type < OVERLAPPING_HIGHWAY_AREA ? Severity.WARNING : Severity.OTHER,
                                     errortype, type, prims, duplicated));
@@ -148 +149 @@
             }
         }
+
+        // see ticket #9598 - only report if at least 3 segments are shared
+        for (TestError error : preliminaryErrors) {
+            if (error.getHighlighted().size() / error.getPrimitives().size() >= 3) {
+                errors.add(error);
+            }
+        }
+
         super.endTest();
         nodePairs = null;