Changeset 12087 in josm for trunk/src/org

Timestamp:

2017-05-08T15:53:13+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14754 - avoid silent failure with invalid lat/lon coordinates in .osm file

File:

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

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

@@ -218 +218 @@
         String lat = parser.getAttributeValue(null, "lat");
         String lon = parser.getAttributeValue(null, "lon");
+        LatLon ll = null;
         if (lat != null && lon != null) {
-            nd.setCoor(new LatLon(Double.parseDouble(lat), Double.parseDouble(lon)));
+            ll = new LatLon(Double.parseDouble(lat), Double.parseDouble(lon));
+            nd.setCoor(ll);
         }
         readCommon(nd);
+        if (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));
+        }
         Node n = new Node(nd.getId(), nd.getVersion());
         n.setVisible(nd.isVisible());