Changeset 6485 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-12-17T19:13:35+01:00 (11 years ago)

Author:

Don-vip

Message:

see #7307 - GeoJSON export: add generator:JOSM and bbox

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 
 import org.json.JSONStringer;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Changeset;
@@ -28 +30 @@
         out = new JSONStringer();
         out.object().key("type").value("FeatureCollection");
+        out.key("generator").value("JOSM");
+        appendLayerBounds();
         out.key("features").array();
         for (Node n : layer.data.getNodes()) {
@@ -62 +66 @@
     }
 
-    protected String escape(String s) {
-        return s.replace("\"", "\\\"").replace("\\", "\\\\").replace("\n", "\\n");
-    }
-
     protected void appendPrimitive(OsmPrimitive p) {
         if (p.isIncomplete()) {
@@ -91 +91 @@
         }
     }
+
+    protected void appendLayerBounds() {
+        Iterator<Bounds> it = layer.data.getDataSourceBounds().iterator();
+        if (it.hasNext()) {
+            Bounds b = new Bounds(it.next());
+            while (it.hasNext()) {
+                b.extend(it.next());
+            }
+            appendBounds(b);
+        }
+    }
+
+    protected void appendBounds(Bounds b) {
+        if (b != null) {
+            out.key("bbox").array()
+            .value(b.getMinLon()).value(b.getMinLat())
+            .value(b.getMaxLon()).value(b.getMaxLat()).endArray();
+        }
+    }
 }