Ticket #17591: 17591.patch

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

@@ -399 +399 @@
                 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) {
             List<DataSource> dataSources = new ArrayList<>(dataset.getDataSources());
@@ -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();
@@ -423 +426 @@
                 lastZoomArea = -1;
             }
         }
-        MainApplication.getMap().mapView.zoomTo(v);
+        if (bbox != null)
+            MainApplication.getMap().mapView.zoomTo(bbox);
+        else
+            MainApplication.getMap().mapView.zoomTo(v);
     }
 
     @Override