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

Timestamp:

2019-09-24T15:03:53+02:00 (5 years ago)

Author:

simon04

Message:

fix #18163 - OverlappingWays: exclude tourism=camp_site

File:

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

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

@@ -16 +16 @@
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.function.Predicate;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -54 +55 @@
                     "barrier", "building", "building:part", "historic:building", "demolished:building",
                     "removed:building", "disused:building", "abandoned:building", "proposed:building", "man_made"));
+    protected static final Predicate<OsmPrimitive> IGNORED = primitive ->
+            IGNORED_KEYS.get().stream().anyMatch(primitive::hasKey) || primitive.hasTag("tourism", "camp_site");
 
     /** Constructor */
@@ -153 +156 @@
         for (TestError error : preliminaryErrors) {
             if (error.getSeverity() == Severity.WARNING || error.getHighlighted().size() / error.getPrimitives().size() >= 3) {
-                boolean ignore = false;
-                for (String ignoredKey : IGNORED_KEYS.get()) {
-                    if (error.getPrimitives().stream().anyMatch(p -> p.hasKey(ignoredKey))) {
-                        ignore = true;
-                        break;
-                    }
-                }
+                boolean ignore = error.getPrimitives().stream().anyMatch(IGNORED);
                 if (!ignore) {
                     errors.add(error);