Changeset 10852 in josm for trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java

Timestamp:

2016-08-19T02:40:50+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13358 - GeoJSON no longer permits projections other than WGS84, see ​https://tools.ietf.org/html/rfc7946

File:

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

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

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.Pair;
 
 /**
  * Writes OSM data as a GeoJSON string, using JSR 353: Java API for JSON Processing (JSON-P).
+ * <p>
+ * See <a href="https://tools.ietf.org/html/rfc7946">RFC7946: The GeoJSON Format</a>
  */
 public class GeoJSONWriter {
@@ -46 +49 @@
      * Constructs a new {@code GeoJSONWriter}.
      * @param layer The OSM data layer to save
-     * @param projection The projection to use for coordinates
+     * @since 10852
      */
-    public GeoJSONWriter(OsmDataLayer layer, Projection projection) {
+    public GeoJSONWriter(OsmDataLayer layer) {
         this.layer = layer;
-        this.projection = projection;
+        this.projection = ProjectionPreference.wgs84.getProjection();
     }
 
@@ -74 +77 @@
             JsonObjectBuilder object = Json.createObjectBuilder()
                     .add("type", "FeatureCollection")
-                    .add("crs", Json.createObjectBuilder().add("type", "name").add(
-                            "properties", Json.createObjectBuilder().add("name", projection.toCode())))
                     .add("generator", "JOSM");
             appendLayerBounds(layer.data, object);