Changeset 12806 in josm

Timestamp:

2017-09-09T17:48:13+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - remove GUI references from GeoJSONWriter

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/io/importexport/GeoJSONExporter.java (modified) (1 diff)
• 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/gui/io/importexport/GeoJSONExporter.java

@@ -36 +36 @@
         if (layer instanceof OsmDataLayer) {
             try (Writer out = Files.newBufferedWriter(file.toPath(), StandardCharsets.UTF_8)) {
-                out.write(new GeoJSONWriter((OsmDataLayer) layer).write());
+                out.write(new GeoJSONWriter(((OsmDataLayer) layer).data).write());
             }
         } else {

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

@@ -43 +43 @@
 public class GeoJSONWriter {
 
-    private final OsmDataLayer layer;
+    private final DataSet data;
     private final Projection projection;
     private static final boolean SKIP_EMPTY_NODES = true;
@@ -51 +51 @@
      * @param layer The OSM data layer to save
      * @since 10852
-     */
+     * @deprecated To be removed end of 2017. Use {@link #GeoJSONWriter(DataSet)} instead
+     */
+    @Deprecated
     public GeoJSONWriter(OsmDataLayer layer) {
-        this.layer = layer;
+        this(layer.data);
+    }
+
+    /**
+     * Constructs a new {@code GeoJSONWriter}.
+     * @param ds The OSM data set to save
+     * @since 12806
+     */
+    public GeoJSONWriter(DataSet ds) {
+        this.data = ds;
         this.projection = ProjectionPreference.wgs84.getProjection();
     }
@@ -79 +90 @@
                     .add("type", "FeatureCollection")
                     .add("generator", "JOSM");
-            appendLayerBounds(layer.data, object);
-            appendLayerFeatures(layer.data, object);
+            appendLayerBounds(data, object);
+            appendLayerFeatures(data, object);
             writer.writeObject(object.build());
             return stringWriter.toString();

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

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 /**
@@ -41 +40 @@
         final DataSet ds = new DataSet();
         ds.addPrimitive(node);
-        final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
-        final GeoJSONWriter writer = new GeoJSONWriter(layer);
+        final GeoJSONWriter writer = new GeoJSONWriter(ds);
         assertEquals(("" +
                 "{\n" +
@@ -80 +78 @@
         way.setNodes(Arrays.asList(n1, n2));
         ds.addPrimitive(way);
-        final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
-        final GeoJSONWriter writer = new GeoJSONWriter(layer);
+        final GeoJSONWriter writer = new GeoJSONWriter(ds);
         assertEquals(("" +
                 "{\n" +
@@ -118 +115 @@
         try (FileInputStream in = new FileInputStream(TestUtils.getTestDataRoot() + "multipolygon.osm")) {
             DataSet ds = OsmReader.parseDataSet(in, null);
-            final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
-            final GeoJSONWriter writer = new GeoJSONWriter(layer);
+            final GeoJSONWriter writer = new GeoJSONWriter(ds);
             assertTrue(writer.write().contains("MultiPolygon"));
         }
@@ -132 +128 @@
         try (FileInputStream in = new FileInputStream("data_nodist/multipolygon.osm")) {
             DataSet ds = OsmReader.parseDataSet(in, null);
-            final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
-            final GeoJSONWriter writer = new GeoJSONWriter(layer);
+            final GeoJSONWriter writer = new GeoJSONWriter(ds);
             assertTrue(writer.write().contains("MultiPolygon"));
         }