Changeset 13194 in josm

Timestamp:

2017-12-05T00:58:56+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15634 - add robustness against invalid GPX files

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/GpxReader.java (modified) (2 diffs)
• test/data/regress/15634 (added)
• test/data/regress/15634/drumlish.gpx (added)
• test/unit/org/openstreetmap/josm/io/GpxReaderTest.java (modified) (2 diffs)

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

@@ -90 +90 @@
         }
 
+        private double parseCoord(Attributes atts, String key) {
+            String val = atts.getValue(key);
+            if (val != null) {
+                return parseCoord(val);
+            } else {
+                // Some software do not respect GPX schema and use "minLat" / "minLon" instead of "minlat" / "minlon"
+                return parseCoord(atts.getValue(key.replaceFirst("l", "L")));
+            }
+        }
+
         private double parseCoord(String s) {
-            try {
-                return Double.parseDouble(s);
-            } catch (NumberFormatException ex) {
-                return Double.NaN;
-            }
+            if (s != null) {
+                try {
+                    return Double.parseDouble(s);
+                } catch (NumberFormatException ex) {
+                    Logging.trace(ex);
+                }
+            }
+            return Double.NaN;
         }
 
         private LatLon parseLatLon(Attributes atts) {
             return new LatLon(
-                    parseCoord(atts.getValue("lat")),
-                    parseCoord(atts.getValue("lon")));
+                    parseCoord(atts, "lat"),
+                    parseCoord(atts, "lon"));
         }
 
@@ -178 +191 @@
                 case "bounds":
                     data.put(META_BOUNDS, new Bounds(
-                                parseCoord(atts.getValue("minlat")),
-                                parseCoord(atts.getValue("minlon")),
-                                parseCoord(atts.getValue("maxlat")),
-                                parseCoord(atts.getValue("maxlon"))));
+                                parseCoord(atts, "minlat"),
+                                parseCoord(atts, "minlon"),
+                                parseCoord(atts, "maxlat"),
+                                parseCoord(atts, "maxlon")));
                     break;
                 default: // Do nothing

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

@@ -13 +13 @@
 
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -64 +66 @@
         new GpxReader(new ByteArrayInputStream("--foo--bar--".getBytes(StandardCharsets.UTF_8))).parse(true);
     }
+
+    /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/15634">#15634</a>
+     * @throws IOException if an error occurs during reading
+     * @throws SAXException if any XML error occurs
+     */
+    @Test
+    public void testTicket15634() throws IOException, SAXException {
+        assertEquals(new Bounds(53.7229357, -7.9135019, 53.9301103, -7.59656),
+                GpxReaderTest.parseGpxData(TestUtils.getRegressionDataFile(15634, "drumlish.gpx")).getMetaBounds());
+    }
 }