Changeset 6870 in josm for trunk/src/org

Timestamp:

2014-02-18T19:24:21+01:00 (10 years ago)

Author:

simon04

Message:

fix #9598 - Validator: do not report "Overlapping ways" for buildings

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/OverlappingWays.java (modified) (2 diffs)
• tools/Predicates.java (modified) (1 diff)

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

@@ -28 +28 @@
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Predicates;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -152 +154 @@
         // see ticket #9598 - only report if at least 3 segments are shared
         for (TestError error : preliminaryErrors) {
-            if (error.getHighlighted().size() / error.getPrimitives().size() >= 3) {
+            if (error.getHighlighted().size() / error.getPrimitives().size() >= 3
+                    && !Utils.exists(error.getPrimitives(), Predicates.hasKey("building"))) {
                 errors.add(error);
             }

trunk/src/org/openstreetmap/josm/tools/Predicates.java

@@ -87 +87 @@
 
     /**
+     * Returns a {@link Predicate} executing {@link OsmPrimitive#hasKey(String)}.
+     */
+    public static Predicate<OsmPrimitive> hasKey(final String key) {
+        return new Predicate<OsmPrimitive>() {
+            @Override
+            public boolean evaluate(OsmPrimitive p) {
+                return p.hasKey(key);
+            }
+        };
+    }
+
+    /**
      * Returns a {@link Predicate} executing {@link Collection#contains(Object)}.
      */