Changeset 11166 in josm

Timestamp:

2016-10-26T13:09:07+02:00 (8 years ago)

Author:

simon04

Message:

fix #13827 - Exporting invalid multipolygon as GeoJSON crashes JOSM

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/GeoJSONWriter.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java (modified) (1 diff)

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

@@ -18 +18 @@
 import javax.json.stream.JsonGenerator;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -119 +120 @@
         @Override
         public void visit(Relation r) {
-            if (r != null && r.isMultipolygon() && !r.hasIncompleteMembers()) {
+            if (r == null || !r.isMultipolygon() || r.hasIncompleteMembers()) {
+                return;
+            }
+            try {
                 final Pair<List<JoinedPolygon>, List<JoinedPolygon>> mp = MultipolygonBuilder.joinWays(r);
                 final JsonArrayBuilder polygon = Json.createArrayBuilder();
@@ -130 +134 @@
                 final JsonArrayBuilder multiPolygon = Json.createArrayBuilder().add(polygon);
                 geomObj.add("coordinates", multiPolygon);
+            } catch (MultipolygonBuilder.JoinedPolygonCreationException ex) {
+                Main.warn("GeoJSON: Failed to export multipolygon " + r.getUniqueId());
+                Main.warn(ex);
             }
         }

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

@@ -77 +77 @@
         }
     }
+
+    /**
+     * Unit test for exporting invalid multipolygons, see #13827
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testMultipolygonRobustness() throws Exception {
+        try (FileInputStream in = new FileInputStream("data_nodist/multipolygon.osm")) {
+            DataSet ds = OsmReader.parseDataSet(in, null);
+            final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
+            final GeoJSONWriter writer = new GeoJSONWriter(layer);
+            assertTrue(writer.write().contains("MultiPolygon"));
+        }
+    }
 }