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

Timestamp:

2018-03-30T21:50:23+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16138 - do not output empty GeoJson geometries but null instead (as per ​RFC7946)

File:

• trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java (modified) (2 diffs)

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

@@ -14 +14 @@
 import javax.json.Json;
 import javax.json.JsonArrayBuilder;
+import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
+import javax.json.JsonValue;
 import javax.json.JsonWriter;
 import javax.json.stream.JsonGenerator;
@@ -173 +175 @@
             propObj.add(t.getKey(), t.getValue());
         }
+        final JsonObject prop = propObj.build();
 
         // Geometry
         final JsonObjectBuilder geomObj = Json.createObjectBuilder();
         p.accept(new GeometryPrimitiveVisitor(geomObj));
+        final JsonObject geom = geomObj.build();
 
         // Build primitive JSON object
         array.add(Json.createObjectBuilder()
                 .add("type", "Feature")
-                .add("properties", propObj)
-                .add("geometry", geomObj));
+                .add("properties", prop.isEmpty() ? JsonValue.NULL : prop)
+                .add("geometry", geom.isEmpty() ? JsonValue.NULL : geom));
     }