Changeset 12806 in josm for trunk/src/org

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/src/org/openstreetmap/josm

Files:

• gui/io/importexport/GeoJSONExporter.java (modified) (1 diff)
• io/GeoJSONWriter.java (modified) (3 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();