Changeset 6872 in josm for trunk/src

Timestamp:

2014-02-19T00:23:48+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9695 - ignore barrier in overlapping ways test

File:

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

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

@@ -22 +22 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.preferences.CollectionProperty;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
@@ -32 +33 @@
 
 /**
- * Tests if there are overlapping ways
+ * Tests if there are overlapping ways.
  *
  * @author frsantos
@@ -49 +50 @@
     protected static final int OVERLAPPING_AREA = 120;
     protected static final int DUPLICATE_WAY_SEGMENT = 121;
+
+    protected static final CollectionProperty IGNORED_KEYS = new CollectionProperty(
+            "overlapping-ways.ignored-keys", Arrays.asList("barrier", "building"));
 
     /** Constructor */
@@ -154 +158 @@
         // see ticket #9598 - only report if at least 3 segments are shared
         for (TestError error : preliminaryErrors) {
-            if (error.getHighlighted().size() / error.getPrimitives().size() >= 3
-                    && !Utils.exists(error.getPrimitives(), Predicates.hasKey("building"))) {
-                errors.add(error);
+            if (error.getHighlighted().size() / error.getPrimitives().size() >= 3) {
+                boolean ignore = false;
+                for (String ignoredKey : IGNORED_KEYS.get()) {
+                    if (Utils.exists(error.getPrimitives(), Predicates.hasKey(ignoredKey))) {
+                        ignore = true;
+                        break;
+                    }
+                }
+                if (!ignore) {
+                    errors.add(error);
+                }
             }
         }