Changeset 15424 in josm for trunk/src/org

Timestamp:

2019-10-05T21:32:56+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #10564 - add GeoJSON import (adapted from geojson plugin)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ExtensionFileFilter.java (modified) (2 diffs)
• actions/downloadtasks/DownloadGeoJsonTask.java (added)
• gui/io/importexport/GeoJSONImporter.java (added)
• io/GeoJSONReader.java (added)
• io/GeoJSONServerReader.java (added)
• plugins/PluginHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -21 +21 @@
 import org.openstreetmap.josm.gui.io.importexport.FileExporter;
 import org.openstreetmap.josm.gui.io.importexport.FileImporter;
+import org.openstreetmap.josm.gui.io.importexport.GeoJSONImporter;
 import org.openstreetmap.josm.gui.io.importexport.GpxImporter;
 import org.openstreetmap.josm.gui.io.importexport.JpgImporter;
@@ -64 +65 @@
                 OsmImporter.class,
                 OsmChangeImporter.class,
+                GeoJSONImporter.class,
                 GpxImporter.class,
                 NMEAImporter.class,

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -150 +150 @@
             new DeprecatedPlugin("download_along", inCore),
             new DeprecatedPlugin("plastic_laf", tr("no longer required")),
-            new DeprecatedPlugin("osmarender", tr("no longer required"))
+            new DeprecatedPlugin("osmarender", tr("no longer required")),
+            new DeprecatedPlugin("geojson", inCore)
         );
     }