Changeset 13194 in josm for trunk/src

Timestamp:

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

Author:

Don-vip

Message:

fix #15634 - add robustness against invalid GPX files

File:

• trunk/src/org/openstreetmap/josm/io/GpxReader.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