Changeset 12136 in josm for trunk

Timestamp:

2017-05-13T14:43:25+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #14788 - add robustness against invalid coordinates in .osm files

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (1 diff)

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

@@ -220 +220 @@
         LatLon ll = null;
         if (lat != null && lon != null) {
-            ll = new LatLon(Double.parseDouble(lat), Double.parseDouble(lon));
-            nd.setCoor(ll);
+            try {
+                ll = new LatLon(Double.parseDouble(lat), Double.parseDouble(lon));
+                nd.setCoor(ll);
+            } catch (NumberFormatException e) {
+                Main.trace(e);
+            }
         }
         readCommon(nd);
-        if (ll != null && !ll.isValid()) {
+        if (lat != null && lon != null && (ll == null || !ll.isValid())) {
             throwException(tr("Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got ''{1}'', ''{2}''.",
                     Long.toString(nd.getId()), lat, lon));