Changeset 17646 in josm for trunk/src

Timestamp:

2021-03-23T13:35:23+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20653 - catch IllegalArgumentException when parsing geojson

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

@@ -52 +52 @@
             progressMonitor.worked(1);
             MainApplication.getLayerManager().addLayer(new OsmDataLayer(data, file.getName(), file));
-        } catch (IOException | IllegalDataException e) {
+        } catch (IOException | IllegalArgumentException | IllegalDataException e) {
             Logging.error("Error while reading json file!");
             Logging.error(e);

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

@@ -413 +413 @@
             }
             mergeEqualMultipolygonWays();
-        } catch (IOException | JsonParsingException e) {
+        } catch (IOException | IllegalArgumentException | JsonParsingException e) {
             throw new IllegalDataException(e);
         }