Changeset 35275 in osm for applications/editors/josm/plugins/opendata/src

Timestamp:

2020-01-11T20:20:47+01:00 (5 years ago)

Author:

donvip

Message:

add GeoJSON support

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• OdConstants.java (modified) (1 diff)
• io/NetworkReader.java (modified) (4 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java

@@ -90 +90 @@
     public static final String JAR_EXT = "jar";
     public static final String XML_EXT = "xml";
+    public static final String JSON_EXT = "json";
+    public static final String GEOJSON_EXT = "geojson";
 
     /**

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.AbstractReader;
+import org.openstreetmap.josm.io.GeoJSONReader;
 import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -57 +58 @@
         FILE_READERS.put(OdConstants.MIF_EXT, MifReader.class);
         FILE_READERS.put(OdConstants.TAB_EXT, TabReader.class);
+        FILE_READERS.put(OdConstants.JSON_EXT, GeoJSONReader.class);
+        FILE_READERS.put(OdConstants.GEOJSON_EXT, GeoJSONReader.class);
     }
 
@@ -101 +104 @@
         } else if (contentType.startsWith("application/vnd.ms-excel")) {
             return XlsReader.class;
+        } else if (contentType.startsWith("application/geo+json") || contentType.startsWith("application/json")) {
+            return GeoJSONReader.class;
         } else if (contentType.startsWith("application/octet-stream")) {
             //return OdsReader.class;//FIXME, can be anything
@@ -159 +164 @@
             } else if (readerClass.equals(KmzReader.class)) {
                 return KmzReader.parseDataSet(in, instance);
+            } else if (readerClass.equals(GeoJSONReader.class)) {
+                return GeoJSONReader.parseDataSet(in, instance);
             } else if (readerClass.equals(MifReader.class)) {
                 return MifReader.parseDataSet(in, null, handler, instance);