Changeset 10852 in josm for trunk/test/unit/org

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/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java (modified) (5 diffs)

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