Changeset 17185 in josm

Timestamp:

2020-10-13T11:57:39+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19822: Inconsistent behavior with GeoJSON multipolygons
Handle care when one polygon is part of two(or more) multipolygons. e.g. serves as inner in relation A, but as a outer for relation B

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/GeoJSONReader.java (modified) (1 diff)
• test/data/regress/19822/problem3.geojson (added)
• test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/GeoJSONReader.java

@@ -433 +433 @@
         for (TestError e : test.getErrors()) {
             if (e.getPrimitives().size() == 2 && !e.isFixable()) {
-                Way mpWay = null;
-                Way tagged = null;
+                List<Way> mpWays = new ArrayList<>();
+                Way replacement = null;
                 for (OsmPrimitive p : e.getPrimitives()) {
                     if (p.isTagged() && p.referrers(Relation.class).count() == 0)
-                        tagged = (Way) p;
+                        replacement = (Way) p;
                     else if (p.referrers(Relation.class).anyMatch(Relation::isMultipolygon))
-                        mpWay = (Way) p;
-                }
-                if (mpWay != null && tagged != null) {
+                        mpWays.add((Way) p);
+                }
+                if (replacement == null && mpWays.size() == 2) {
+                    replacement = mpWays.remove(1);
+                }
+                if (replacement != null && mpWays.size() == 1) {
+                    Way mpWay = mpWays.get(0);
                     for (Relation r : mpWay.referrers(Relation.class).filter(Relation::isMultipolygon)
                             .collect(Collectors.toList())) {
                         for (int i = 0; i < r.getMembersCount(); i++) {
                             if (r.getMember(i).getMember().equals(mpWay)) {
-                                r.setMember(i, new RelationMember(r.getRole(i), tagged));
+                                r.setMember(i, new RelationMember(r.getRole(i), replacement));
                             }
                         }

trunk/test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java

@@ -198 +198 @@
                     new GeoJSONReader().doParseDataSet(in, null).getPrimitives(it -> true));
             assertTrue(primitives.stream().anyMatch(p -> p instanceof Relation && p.isMultipolygon()));
+            assertEquals(3, primitives.stream().filter(Way.class::isInstance).count());
+        }
+    }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/19822">Bug #19822</a>.
+     * @throws Exception in case of error
+     */
+    @Test
+    public void testTicket19822Nested() throws Exception {
+        try (InputStream in = TestUtils.getRegressionDataStream(19822, "problem3.geojson")) {
+            final List<OsmPrimitive> primitives = new ArrayList<>(
+                    new GeoJSONReader().doParseDataSet(in, null).getPrimitives(it -> true));
+            assertTrue(primitives.stream().anyMatch(p -> p instanceof Relation && p.isMultipolygon()));
+            assertEquals(3, primitives.stream().filter(Way.class::isInstance).count());
         }
     }