Changeset 10852 in josm

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

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/GeoJSONExporter.java (modified) (3 diffs)
• src/org/openstreetmap/josm/io/GeoJSONWriter.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -102 +102 @@
                 org.openstreetmap.josm.io.OsmGzipExporter.class,
                 org.openstreetmap.josm.io.OsmBzip2Exporter.class,
-                org.openstreetmap.josm.io.GeoJSONExporter.CurrentProjection.class, // needs to be considered earlier than GeoJSONExporter
                 org.openstreetmap.josm.io.GeoJSONExporter.class,
                 org.openstreetmap.josm.io.WMSLayerExporter.class,

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

@@ -10 +10 @@
 import java.nio.file.Files;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
-import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
-import org.openstreetmap.josm.tools.Utils;
 
+/**
+ * Exporter to write map data to a GeoJSON file.
+ * @since 4886
+ */
 public class GeoJSONExporter extends FileExporter {
 
-    protected final Projection projection;
+    /** File extension filter for .geojson files */
     public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
             "geojson,json", "geojson", tr("GeoJSON Files") + " (*.geojson *.json)");
-    public static final ExtensionFileFilter FILE_FILTER_PROJECTED = new ExtensionFileFilter(
-            "proj.geojson", "proj.geojson", tr("Projected GeoJSON Files") + " (*.proj.geojson)");
-
-    /**
-     * A GeoJSON exporter which obtains the current map projection when exporting ({@link #exportData(File, Layer)}).
-     */
-    public static class CurrentProjection extends GeoJSONExporter {
-        public CurrentProjection() {
-            super(FILE_FILTER_PROJECTED, null);
-        }
-    }
 
     /**
@@ -39 +28 @@
      */
     public GeoJSONExporter() {
-        this(FILE_FILTER, ProjectionPreference.wgs84.getProjection());
-    }
-
-    private GeoJSONExporter(ExtensionFileFilter fileFilter, Projection projection) {
-        super(fileFilter);
-        this.projection = projection;
+        super(FILE_FILTER);
     }
 
@@ -50 +34 @@
     public void exportData(File file, Layer layer) throws IOException {
         if (layer instanceof OsmDataLayer) {
-            String json = new GeoJSONWriter((OsmDataLayer) layer, Utils.firstNonNull(projection, Main.getProjection())).write();
             try (Writer out = Files.newBufferedWriter(file.toPath(), StandardCharsets.UTF_8)) {
-                out.write(json);
+                out.write(new GeoJSONWriter((OsmDataLayer) layer).write());
             }
         } else {

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);

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

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+
+import java.io.FileInputStream;
 
 import org.junit.BeforeClass;
@@ -13 +15 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
-
-import java.io.FileInputStream;
 
 /**
@@ -41 +40 @@
         ds.addPrimitive(node);
         final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
-        final GeoJSONWriter writer = new GeoJSONWriter(layer, ProjectionPreference.wgs84.getProjection());
+        final GeoJSONWriter writer = new GeoJSONWriter(layer);
         assertEquals(("" +
                 "{\n" +
                 "    'type':'FeatureCollection',\n" +
-                "    'crs':{\n" +
-                "        'type':'name',\n" +
-                "        'properties':{\n" +
-                "            'name':'EPSG:4326'\n" +
-                "        }\n" +
-                "    },\n" +
                 "    'generator':'JOSM',\n" +
                 "    'features':[\n" +
@@ -73 +66 @@
     /**
      * Unit test for multipolygon
+     * @throws Exception if an error occurs
      */
     @Test
@@ -79 +73 @@
             DataSet ds = OsmReader.parseDataSet(in, null);
             final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
-            final GeoJSONWriter writer = new GeoJSONWriter(layer, ProjectionPreference.wgs84.getProjection());
+            final GeoJSONWriter writer = new GeoJSONWriter(layer);
             assertTrue(writer.write().contains("MultiPolygon"));
         }