Changeset 1302 in josm for trunk/src/org

Timestamp:

2009-01-19T14:07:58+01:00 (15 years ago)

Author:

stoecker

Message:

applied #2046. patch by Detlef Reichl

File:

• trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -23 +24 @@
 public class AutoScaleAction extends JosmAction {
 
-    public static final String[] modes = { marktr("data"), marktr("layer"), marktr("selection"), marktr("conflict") };
+    public static final String[] modes = { marktr("data"), marktr("layer"), marktr("selection"), marktr("conflict"), marktr("download") };
     private final String mode;
 
@@ -40 +41 @@
         if (mode.equals("conflict")) {
             shortcut = KeyEvent.VK_4;
+        }
+        if (mode.equals("download")) {
+            shortcut = KeyEvent.VK_5;
         }
 
@@ -85 +89 @@
             v.enlargeBoundingBox();
         }
+        else if (mode.equals("download")) {
+            if (Main.pref.hasKey("osm-download.bounds")) {
+                try {
+                    String bounds[] = Main.pref.get("osm-download.bounds").split(";");
+                    double minlat = Double.parseDouble(bounds[0]);
+                    double minlon = Double.parseDouble(bounds[1]);
+                    double maxlat = Double.parseDouble(bounds[2]);
+                    double maxlon = Double.parseDouble(bounds[3]);
+                    
+                    v.visit(Main.proj.latlon2eastNorth(new LatLon(minlat, minlon)));
+                    v.visit(Main.proj.latlon2eastNorth(new LatLon(maxlat, maxlon)));
+                }
+                catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
         return v;
     }