Changeset 17356 in josm for trunk/src

Timestamp:

2020-11-25T10:26:24+01:00 (4 years ago)

Author:

simon04

Message:

see #20152 - GeoJSONReader: better exception for illegal FeatureCollection

File:

• trunk/src/org/openstreetmap/josm/io/GeoJSONReader.java (modified) (2 diffs)

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

@@ -45 +45 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -85 +86 @@
                 .orElseThrow(() -> new IllegalDataException("No type")).getString()) {
             case "FeatureCollection":
+                JsonValue.ValueType valueType = object.get(FEATURES).getValueType();
+                CheckParameterUtil.ensureThat(valueType == JsonValue.ValueType.ARRAY, "features must be ARRAY, but is " + valueType);
                 parseFeatureCollection(object.getJsonArray(FEATURES));
                 break;