Changeset 17131 in josm for trunk/src/org/openstreetmap

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

File:

• trunk/src/org/openstreetmap/josm/io/GeoJSONReader.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) {