Changeset 15691 in josm for trunk/src

Timestamp:

2020-01-12T14:54:20+01:00 (5 years ago)

Author:

GerdP

Message:

fix #18544: Don't warn crossing administrative and protected_area boundaries

• exclude boundary=protected_area crossings
• check also complete members of incomplete relations
• if segments are crossing: collect boundary tags of all parent relations and complain if any match is found

File:

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

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

@@ -8 +8 @@
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -214 +216 @@
         @Override
         public boolean isPrimitiveUsable(OsmPrimitive p) {
-            return super.isPrimitiveUsable(p) && p.hasKey("boundary")
-                    && (!(p instanceof Relation) || (((Relation) p).isMultipolygon() && !((Relation) p).hasIncompleteMembers()));
+            return super.isPrimitiveUsable(p) && p.hasKey("boundary") && !p.hasTag("boundary", "protected_area")
+                    && (!(p instanceof Relation) || (((Relation) p).isMultipolygon()));
         }
 
         @Override
         boolean ignoreWaySegmentCombination(Way w1, Way w2) {
-            return !Objects.equals(w1.get("boundary"), w2.get("boundary"));
+            // ignore ways which have no common boundary tag value
+            Set<String> s1 = getBoundaryTags(w1);
+            Set<String> s2 = getBoundaryTags(w2);
+            for (String type : s1) {
+                if (s2.contains(type))
+                    return false;
+            }
+            return true;
+        }
+
+        /**
+         * Collect all boundary tag values of the way and its parent relations
+         * @param w the way to check
+         * @return set with the found boundary tag values
+         */
+        private static Set<String> getBoundaryTags(Way w) {
+            final Set<String> types = new HashSet<>();
+            String type = w.get("boundary");
+            if (type != null)
+                types.add(type);
+            w.referrers(Relation.class).filter(Relation::isMultipolygon).map(r -> r.get("boundary"))
+                    .filter(Objects::nonNull).forEach(types::add);
+            types.remove("protected_area");
+            return types;
         }
 
@@ -226 +251 @@
         public void visit(Relation r) {
             for (Way w : r.getMemberPrimitives(Way.class)) {
-                visit(w);
+                if (!w.isIncomplete())
+                    visit(w);
             }
         }