Changeset 14985 in josm for trunk/src/org

Timestamp:

2019-04-11T15:38:25+02:00 (6 years ago)

Author:

GerdP

Message:

fix #17591 Zoom to download doesn't work as expected
Partly revert changes from r14628: don't enlarge area for "Zoom to download" or "Zoom to downloaded data"

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AutoScaleAction.java (modified) (4 diffs)
• gui/NavigatableComponent.java (modified) (1 diff)

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

@@ -302 +302 @@
                 break;
             case DOWNLOAD:
-                modeDownload(new BoundingXYVisitor());
+                modeDownload();
                 break;
             }
@@ -395 +395 @@
     }
 
-    private void modeDownload(BoundingXYVisitor v) {
+    private void modeDownload() {
         if (lastZoomTime > 0 &&
                 System.currentTimeMillis() - lastZoomTime > Config.getPref().getLong("zoom.bounds.reset.time", TimeUnit.SECONDS.toMillis(10))) {
             lastZoomTime = -1;
         }
+        Bounds bbox = null;
         final DataSet dataset = getLayerManager().getActiveDataSet();
         if (dataset != null) {
@@ -407 +408 @@
                 if (lastZoomTime == -1 || lastZoomArea == -1 || lastZoomArea > s) {
                     lastZoomArea = s-1;
-                    v.visit(dataSources.get(lastZoomArea).bounds);
+                    bbox = dataSources.get(lastZoomArea).bounds;
                 } else if (lastZoomArea > 0) {
                     lastZoomArea -= 1;
-                    v.visit(dataSources.get(lastZoomArea).bounds);
+                    bbox = dataSources.get(lastZoomArea).bounds;
                 } else {
                     lastZoomArea = -1;
                     Area sourceArea = getLayerManager().getActiveDataSet().getDataSourceArea();
                     if (sourceArea != null) {
-                        v.visit(new Bounds(sourceArea.getBounds2D()));
+                        bbox = new Bounds(sourceArea.getBounds2D());
                     }
                 }
@@ -423 +424 @@
                 lastZoomArea = -1;
             }
-        }
-        MainApplication.getMap().mapView.zoomTo(v);
+            if (bbox != null) {
+                MainApplication.getMap().mapView.zoomTo(bbox);
+            }
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -811 +811 @@
         if (viewport == null) return;
         if (viewport.getBounds() != null) {
-            BoundingXYVisitor v = new BoundingXYVisitor();
-            v.visit(viewport.getBounds());
-            zoomTo(v);
+            zoomTo(viewport.getBounds());
         } else {
             zoomTo(viewport.getCenter(), viewport.getScale(), true);