Changeset 15865 in josm

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/GeoJSONReader.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java (modified) (2 diffs)

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));

trunk/test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java

@@ -7 +7 @@
 import static org.junit.Assert.assertTrue;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -133 +135 @@
     }
 
+    /**
+     * Test reading a JSON file which is not a proper GeoJSON (type missing).
+     * @throws IllegalDataException always
+     */
+    @Test(expected = IllegalDataException.class)
+    public void testReadGeoJsonWithoutType() throws IllegalDataException {
+        new GeoJSONReader().doParseDataSet(new ByteArrayInputStream("{}".getBytes(StandardCharsets.UTF_8)), null);
+    }
+
     private static boolean areEqualNodes(final OsmPrimitive p1, final OsmPrimitive p2) {
         return (p1 instanceof Node)