Changeset 10165 in josm for trunk/src

Timestamp:

2016-04-29T13:57:56+02:00 (8 years ago)

Author:

simon04

Message:

fix #12803 - JOSM writes invalid crs entry in GeoJSON

File:

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

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

@@ -3 +3 @@
 
 import java.io.StringWriter;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -68 +70 @@
             JsonObjectBuilder object = Json.createObjectBuilder()
                     .add("type", "FeatureCollection")
-                    .add("crs", Json.createObjectBuilder().add("type", "name").add("name", projection.toCode()))
+                    .add("crs", Json.createObjectBuilder().add("type", "name").add(
+                            "properties", Json.createObjectBuilder().add("name", projection.toCode())))
                     .add("generator", "JOSM");
             appendLayerBounds(layer.data, object);
@@ -119 +122 @@
 
     private static JsonArrayBuilder getCoorArray(JsonArrayBuilder builder, EastNorth c) {
-        return builder.add(c.getX()).add(c.getY());
+        return builder
+                .add(BigDecimal.valueOf(c.getX()).setScale(11, RoundingMode.HALF_UP))
+                .add(BigDecimal.valueOf(c.getY()).setScale(11, RoundingMode.HALF_UP))
+                ;
     }