Changeset 241 in josm for src

Timestamp:

2007-05-21T22:07:24+02:00 (18 years ago)

Author:

framm

Message:

support URLs with "bbox=..." (like API 0.4 "map" URL) in the URL box

File:

• src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified) (3 diffs)

src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java

@@ -14 +14 @@
 import java.awt.event.KeyListener;
 import java.util.HashMap;
+import java.util.StringTokenizer;
 
 import javax.swing.BorderFactory;
@@ -27 +28 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.GBC;
+
+import com.sun.corba.se.spi.orb.StringPair;
 /**
  * Bounding box selector.
@@ -179 +182 @@
                         return null;
                 String[] args = url.substring(i+1).split("&");
-                HashMap<String, Double> map = new HashMap<String, Double>();
+                HashMap<String, String> map = new HashMap<String, String>();
                 for (String arg : args) {
                         int eq = arg.indexOf('=');
                         if (eq != -1) {
-                                try {
-                                        map.put(arg.substring(0, eq), Double.parseDouble(arg.substring(eq + 1)));
-                                } catch (NumberFormatException e) {
-                                }
-                        }
-                }
-                try {
-                        double size = 180.0 / Math.pow(2, map.get("zoom"));
-                        return new Bounds(
-                                        new LatLon(map.get("lat") - size/2, map.get("lon") - size),
-                                        new LatLon(map.get("lat") + size/2, map.get("lon") + size));
-                } catch (Exception x) { // NPE or IAE
-                        return null;
+                                map.put(arg.substring(0, eq), arg.substring(eq + 1));
+                        }
+                }
+                if (map.containsKey("bbox")) {
+                        String bbox[] = map.get("bbox").split(",");
+                        try {
+                                return new Bounds(
+                                        new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[0])),
+                                        new LatLon(Double.parseDouble(bbox[3]), Double.parseDouble(bbox[2])));
+                        } catch (Exception x) { // NPE or IAE
+                                return null;
+                        }
+                        
+                } else {
+                        try {
+                                double size = 180.0 / Math.pow(2, Integer.parseInt(map.get("zoom")));
+                                return new Bounds(
+                                        new LatLon(Double.parseDouble(map.get("lat")) - size/2, Double.parseDouble(map.get("lon")) - size),
+                                        new LatLon(Double.parseDouble(map.get("lat")) + size/2, Double.parseDouble(map.get("lon")) + size));
+                        } catch (Exception x) { // NPE or IAE
+                                return null;
+                        }
                 }
         }