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

Timestamp:

2014-03-28T21:55:22+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9820 - validator: fix regression from r6862 in overlapping ways test

File:

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

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

@@ -52 +52 @@
 
     protected static final CollectionProperty IGNORED_KEYS = new CollectionProperty(
-            "overlapping-ways.ignored-keys", Arrays.asList("barrier", "building"));
+            "overlapping-ways.ignored-keys", Arrays.asList("barrier", "building", "historic:building"));
 
     /** Constructor */
@@ -156 +156 @@
         }
 
-        // see ticket #9598 - only report if at least 3 segments are shared
+        // see ticket #9598 - only report if at least 3 segments are shared, except for overlapping ways, i.e warnings (see #9820)
         for (TestError error : preliminaryErrors) {
-            if (error.getHighlighted().size() / error.getPrimitives().size() >= 3) {
+            if (error.getSeverity().equals(Severity.WARNING) || error.getHighlighted().size() / error.getPrimitives().size() >= 3) {
                 boolean ignore = false;
                 for (String ignoredKey : IGNORED_KEYS.get()) {