Changeset 16377 in josm for trunk

Timestamp:

2020-04-24T12:06:05+02:00 (4 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

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/UnclosedWaysTest.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) {

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnclosedWaysTest.java

@@ -79 +79 @@
 
     /**
-     * Test to make sure the multipolygon ways are ignored
+     * Test to make sure the multipolygon ways are not ignored
+     * See #19136, #19145
      * @throws Exception if an exception occurs
      */
@@ -96 +97 @@
         uwTest.visit(w);
         assertTrue(ElemStyles.hasAreaElemStyle(w, false));
+        assertEquals(1, uwTest.getErrors().size());
+
+        uwTest.endTest();
+    }
+
+    /**
+     * Test to make sure the boundary ways are ignored when member of a boundary relation
+     * See #19136, #19145
+     * @throws Exception if an exception occurs
+     */
+    @Test
+    public void testWayInBoundary() throws Exception {
+        UnclosedWays uwTest = new UnclosedWays();
+        uwTest.initialize();
+        uwTest.startTest(null);
+        DataSet ds = new DataSet();
+
+        // Erroneous tag
+        Way w = createUnclosedWay("boundary=administrative", ds);
+        Relation r = (Relation) OsmUtils.createPrimitive("relation type=boundary");
+        r.addMember(new RelationMember("inner", w));
+        ds.addPrimitive(r);
+        uwTest.visit(w);
+        assertFalse(ElemStyles.hasAreaElemStyle(w, false));
         assertEquals(0, uwTest.getErrors().size());
 
@@ -101 +126 @@
     }
 
+    /**
+     * Test to make sure that amenity=* is closed.
+     * See #19145
+     * @throws Exception if an exception occurs
+     */
+    @Test
+    public void testAmenity() throws Exception {
+        UnclosedWays uwTest = new UnclosedWays();
+        uwTest.initialize();
+        uwTest.startTest(null);
+        DataSet ds = new DataSet();
+
+        // Erroneous tag
+        Way w = createUnclosedWay("amenity=school", ds);
+        uwTest.visit(w);
+        assertTrue(ElemStyles.hasAreaElemStyle(w, false));
+        assertEquals(1, uwTest.getErrors().size());
+        assertEquals(1103, uwTest.getErrors().iterator().next().getCode());
+
+        uwTest.endTest();
+    }
+
  }