Changeset 11847 in josm for trunk

Timestamp:

2017-04-06T23:16:04+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #14618 - add robustness to OsmUrlToBounds.parseDouble

File:

• trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -78 +78 @@
             } else {
                 String z = map.get("zoom");
-                b = positionToBounds(parseDouble(map, "lat"),
-                        parseDouble(map, "lon"),
+                b = positionToBounds(parseDouble(map, "lat"), parseDouble(map, "lon"),
                         z == null ? 18 : Integer.parseInt(z));
             }
-        } catch (NumberFormatException | ArrayIndexOutOfBoundsException ex) {
-            Main.error(ex);
+        } catch (IllegalArgumentException | ArrayIndexOutOfBoundsException ex) {
+            Main.error(ex, url);
         }
         return b;
@@ -132 +131 @@
         if (map.containsKey(key))
             return Double.parseDouble(map.get(key));
-        return Double.parseDouble(map.get('m'+key));
+        if (map.containsKey('m'+key))
+            return Double.parseDouble(map.get('m'+key));
+        throw new IllegalArgumentException(map.toString() + " does not contain " + key);
     }