Changeset 17131 in josm

Timestamp:

2020-10-09T06:59:05+02:00 (4 years ago)

Author:

GerdP

Message:

see #19822: Inconsistent behavior with GeoJSON multipolygons

• fix another place were fillTagsFromFeature() was called after a tag was added to the OSM primitive
• add javadoc for the rather confusing behaviour of fillTagsFromFeature()
• add unit test

Location:

trunk

Files:

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

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

@@ -163 +163 @@
         // create misc. non-geometry feature
         final Relation relation = new Relation();
+        fillTagsFromFeature(feature, relation);
         relation.put(TYPE, type.toString());
-        fillTagsFromFeature(feature, relation);
         getDataSet().addPrimitive(relation);
     }
@@ -325 +325 @@
     }
 
+    /**
+     * Replace all existing tags in primitive by the values given in the GeoJSON feature.
+     * @param feature the GeoJSON feature
+     * @param primitive the OSM primitive
+     */
     private static void fillTagsFromFeature(final JsonObject feature, final OsmPrimitive primitive) {
         if (feature != null) {

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -186 +187 @@
                 .allMatch(i -> areEqualNodes(((Way) p1).getNode(i), ((Way) p2).getNode(i)));
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/19822">Bug #19822</a>.
+     * @throws Exception in case of error
+     */
+    @Test
+    public void testTicket19822() throws Exception {
+        try (InputStream in = TestUtils.getRegressionDataStream(19822, "data.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()));
+        }
+    }
+
 }