Changeset 5600 in josm for trunk

Timestamp:

2012-11-25T21:24:25+01:00 (12 years ago)

Author:

simon04

Message:

fix #8142 - Remote control: add zoom_mode parameter to load_and_zoom handler

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -126 +126 @@
         }
 
+        final Bounds bbox = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon));
         if (args.containsKey("select") && PermissionPrefWithDefault.CHANGE_SELECTION.isAllowed()) {
             // select objects after downloading, zoom to selection.
@@ -168 +169 @@
                     ds.setSelected(newSel);
                     if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
-                        AutoScaleAction.autoScale("selection");
+                        // zoom_mode=(download|selection), defaults to selection
+                        if (!"download".equals(args.get("zoom_mode"))) {
+                            AutoScaleAction.autoScale("selection");
+                        } else {
+                            zoom(bbox);
+                        }
                     }
                     if (Main.isDisplayingMapView() && Main.map.relationListDialog != null) {
@@ -179 +185 @@
         } else if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
             // after downloading, zoom to downloaded area.
-            zoom(minlat, maxlat, minlon, maxlon);
+            zoom(bbox);
         }
 
@@ -215 +221 @@
     }
 
-    protected void zoom(double minlat, double maxlat, double minlon, double maxlon) {
-        final Bounds bounds = new Bounds(new LatLon(minlat, minlon),
-                new LatLon(maxlat, maxlon));
-
+    protected void zoom(final Bounds bounds) {
         // make sure this isn't called unless there *is* a MapView
-        //
         if (Main.isDisplayingMapView()) {
             Main.worker.execute(new Runnable() {