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

Timestamp:

2020-04-24T12:06:05+02:00 (5 years ago)

Author:

GerdP

Message:

fix #19145: some unclosed ways are not found

• fix typo amenties -> amenity
• only ignore multipolygon members when checking unclosed boundary=* ways, others would be old style multipolygons

File:

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

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

@@ -10 +10 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -143 +142 @@
 
         new UnclosedWaysCheck(1102, "landuse", marktr("landuse type {0}")),
-        new UnclosedWaysCheck(1103, "amenities", marktr("amenities type {0}")),
+        new UnclosedWaysCheck(1103, "amenity", marktr("amenity type {0}")),
         new UnclosedWaysCheck(1104, "sport",     marktr("sport type {0}"),
                 new HashSet<>(Arrays.asList("water_slide", "climbing", "skiing", "toboggan", "bobsleigh", "karting"))),
@@ -180 +179 @@
             return;
 
-        for (OsmPrimitive parent: w.getReferrers()) {
-            if (parent instanceof Relation && ((Relation) parent).isMultipolygon())
+        for (UnclosedWaysCheck c : checks) {
+            if ("boundary".equals(c.key) && w.referrers(Relation.class).anyMatch(Relation::isMultipolygon))
                 return;
-        }
-
-        for (UnclosedWaysCheck c : checks) {
             TestError error = c.getTestError(w, this);
             if (error != null) {