Changeset 2758 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2010-01-07T18:20:47+01:00 (14 years ago)

Author:

mjulius

Message:

fixes #1653 - zoom to the previously shown area
This adds menu entries and the shortcuts '8' and '9' to zoom to the previous and next areas. See also ​http://josm.openstreetmap.de/wiki/Help/Menu/View

File:

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

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

@@ -28 +28 @@
 public class AutoScaleAction extends JosmAction {
 
-    public static final String[] MODES = { marktr("data"), marktr("layer"), marktr("selection"), marktr("conflict"), marktr("download") };
+    public static final String[] MODES = {
+        marktr("data"),
+        marktr("layer"),
+        marktr("selection"),
+        marktr("conflict"),
+        marktr("download"),
+        marktr("previous"),
+        marktr("next")};
 
     /**
@@ -81 +88 @@
             shortcut = KeyEvent.VK_5;
         }
+        if (mode.equals("previous")) {
+            shortcut = KeyEvent.VK_8;
+        }
+        if (mode.equals("next")) {
+            shortcut = KeyEvent.VK_9;
+        }
 
         return shortcut;
@@ -99 +112 @@
         } else if (mode.equals("conflict")) {
             putValue("help", ht("/Action/ZoomToConflict"));
-        }else if (mode.equals("download")) {
+        } else if (mode.equals("download")) {
             putValue("help", ht("/Action/ZoomToDownload"));
+        } else if (mode.equals("previous")) {
+            putValue("help", ht("/Action/ZoomPrevious"));
+        } else if (mode.equals("next")) {
+            putValue("help", ht("/Action/ZoomNext"));
         }
     }
@@ -106 +123 @@
     public void autoScale()  {
         if (Main.map != null) {
-            BoundingXYVisitor bbox = getBoundingBox();
-            if (bbox != null && bbox.getBounds() != null) {
-                Main.map.mapView.recalculateCenterScale(bbox);
+            if (mode.equals("previous")) {
+                Main.map.mapView.zoomPrevious();
+            } else if (mode.equals("next")) {
+                Main.map.mapView.zoomNext();
+            } else {
+                BoundingXYVisitor bbox = getBoundingBox();
+                if (bbox != null && bbox.getBounds() != null) {
+                    Main.map.mapView.recalculateCenterScale(bbox);
+                }
             }
         }