Changeset 12087 in josm for trunk

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

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/OsmReader.java (modified) (1 diff)
• test/data/regress/14754 (added)
• test/data/regress/14754/malformed_for_14754.osm (added)
• test/unit/org/openstreetmap/josm/io/OsmReaderTest.java (modified) (2 diffs)

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

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

@@ -5 +5 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.InputStream;
@@ -31 +32 @@
         }
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/14754">Bug #14754</a>.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testTicket14754() throws Exception {
+        try (InputStream in = TestUtils.getRegressionDataStream(14754, "malformed_for_14754.osm")) {
+            OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
+            fail("should throw exception");
+        } catch (IllegalDataException e) {
+            assertEquals("Illegal value for attributes 'lat', 'lon' on node with ID 1425146006." +
+                    " Got '550.3311950157', '10.49428298298'." +
+                    " (at line 5, column 179). 578 bytes have been read", e.getMessage());
+        }
+    }
 }