Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 15182) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 15183) @@ -81,4 +81,6 @@ /** set when used to build a multipolygon relation */ private Relation createdRelation; + /** might be set when creating a relation and touching rings were found. */ + private boolean repeatCheck; /** @@ -250,5 +252,5 @@ // we found no intersection or crossing between the polygons and they are closed // now we can calculate the nesting level to verify the roles with some simple node checks - checkRoles(r, allPolygons, wayMap, sharedNodes); + checkOrSetRoles(r, allPolygons, wayMap, sharedNodes); } } @@ -461,5 +463,5 @@ * @param sharedNodes all nodes shared by multiple ways of this multipolygon */ - private void checkRoles(Relation r, List allPolygons, Map wayMap, Set sharedNodes) { + private void checkOrSetRoles(Relation r, List allPolygons, Map wayMap, Set sharedNodes) { PolygonLevelFinder levelFinder = new PolygonLevelFinder(sharedNodes); List list = levelFinder.findOuterWays(allPolygons); @@ -577,5 +579,7 @@ } } - if (loop == 0 || samePoly || (loop == 1 && !allInner)) { + if (r == createdRelation && loop == 1 && !allInner) { + repeatCheck = true; + } else if (loop == 0 || samePoly || (loop == 1 && !allInner)) { String msg = loop == 0 ? tr("Intersection between multipolygon ways") : samePoly ? tr("Multipolygon ring contains segments twice") @@ -922,13 +926,16 @@ r.addMember(new RelationMember("", w)); } - errors.clear(); - Multipolygon polygon = null; - boolean hasRepeatedMembers = checkRepeatedWayMembers(r); - if (!hasRepeatedMembers) { - polygon = new Multipolygon(r); - // don't check style consistency here - checkGeometryAndRoles(r, polygon); - } - createdRelation = null; + do { + repeatCheck = false; + errors.clear(); + Multipolygon polygon = null; + boolean hasRepeatedMembers = checkRepeatedWayMembers(r); + if (!hasRepeatedMembers) { + polygon = new Multipolygon(r); + // don't check style consistency here + checkGeometryAndRoles(r, polygon); + } + createdRelation = null; // makes sure that repeatCheck is only set once + } while (repeatCheck); errors.removeIf(e->e.getSeverity() == Severity.OTHER); return r; Index: /trunk/test/data/regress/17768/touching-inner-outer.osm =================================================================== --- /trunk/test/data/regress/17768/touching-inner-outer.osm (revision 15183) +++ /trunk/test/data/regress/17768/touching-inner-outer.osm (revision 15183) @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /trunk/test/data/regress/17768/touching-inner.osm =================================================================== --- /trunk/test/data/regress/17768/touching-inner.osm (revision 15183) +++ /trunk/test/data/regress/17768/touching-inner.osm (revision 15183) @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java (revision 15182) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java (revision 15183) @@ -2,9 +2,15 @@ package org.openstreetmap.josm.data.validation.tests; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.InputStream; import java.util.stream.Collectors; import org.junit.Rule; import org.junit.Test; +import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.io.OsmReader; import org.openstreetmap.josm.testutils.JOSMTestRules; @@ -16,6 +22,4 @@ public class MultipolygonTestTest { - private static final MultipolygonTest MULTIPOLYGON_TEST = new MultipolygonTest(); - private static final RelationChecker RELATION_TEST = new RelationChecker(); /** @@ -24,5 +28,5 @@ @Rule @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules().projection().mapStyles().presets().main(); + public JOSMTestRules test = new JOSMTestRules().projection().mapStyles().presets().main().preferences(); /** @@ -32,7 +36,37 @@ @Test public void testMultipolygonFile() throws Exception { + final MultipolygonTest MULTIPOLYGON_TEST = new MultipolygonTest(); + final RelationChecker RELATION_TEST = new RelationChecker(); ValidatorTestUtils.testSampleFile("data_nodist/multipolygon.osm", ds -> ds.getRelations().stream().filter(Relation::isMultipolygon).collect(Collectors.toList()), name -> name.startsWith("06") || name.startsWith("07") || name.startsWith("08"), MULTIPOLYGON_TEST, RELATION_TEST); } + + /** + * Non-regression test for ticket #17768. + * @throws Exception if an error occurs + */ + @Test + public void testTicket17768TouchingInner() throws Exception { + try (InputStream is = TestUtils.getRegressionDataStream(17768, "touching-inner.osm")) { + MultipolygonTest mpTest = new MultipolygonTest(); + mpTest.makeFromWays(OsmReader.parseDataSet(is, null).getWays()); + // inner touches inner, is considered OK in OSM + assertTrue(mpTest.getErrors().isEmpty()); + } + } + + /** + * Non-regression test for ticket #17768. + * @throws Exception if an error occurs + */ + @Test + public void testTicket17768TouchingInnerOuter() throws Exception { + try (InputStream is = TestUtils.getRegressionDataStream(17768, "touching-inner-outer.osm")) { + MultipolygonTest mpTest = new MultipolygonTest(); + mpTest.makeFromWays(OsmReader.parseDataSet(is, null).getWays()); + // inner touches outer, should return error + assertEquals(1, mpTest.getErrors().size()); + } + } }