Changeset 15865 in josm for trunk/src

Timestamp:

2020-02-16T22:29:06+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18722 - exclude json file extension from GeoJsonImporter + add robustness

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/io/importexport/GeoJSONImporter.java (modified) (1 diff)
• io/GeoJSONReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java

@@ -33 +33 @@
 
     private static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
-        "geojson,json", "geojson", tr("GeoJSON file") + " (*.geojson, *.geojson.gz, *.geojson.bz2, *.geojson.xz, *.geojson.zip, *.json)",
+        "geojson", "geojson", tr("GeoJSON file") + " (*.geojson, *.geojson.gz, *.geojson.bz2, *.geojson.xz, *.geojson.zip)",
         ExtensionFileFilter.AddArchiveExtension.NONE, Arrays.asList("gz", "bz", "bz2", "xz", "zip"));
 

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

@@ -74 +74 @@
     private void parseRoot(final JsonObject object) throws IllegalDataException {
         parseCrs(object.getJsonObject(CRS));
-        switch (object.getString(TYPE)) {
+        switch (Optional.ofNullable(object.getJsonString(TYPE))
+                .orElseThrow(() -> new IllegalDataException("No type")).getString()) {
             case "FeatureCollection":
                 parseFeatureCollection(object.getJsonArray(FEATURES));