Changeset 15205 in josm for trunk/src/org

Timestamp:

2019-07-06T18:37:14+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17871 - Don't zoom to download area by default for "Update Data" and "Download Along" actions.

Zoom to download can be restored with advanced properties:

• update.data.zoom-after-download
• download.along.zoom-after-download

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• DownloadAlongAction.java (modified) (2 diffs)
• UpdateDataAction.java (modified) (2 diffs)
• downloadtasks/DownloadTaskList.java (modified) (2 diffs)

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

@@ -27 +27 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
@@ -128 +129 @@
         }
         final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
-        final Future<?> future = new DownloadTaskList().download(false, toDownload, osmDownload, gpxDownload, monitor);
+        final Future<?> future = new DownloadTaskList(Config.getPref().getBoolean("download.along.zoom-after-download"))
+                .download(false, toDownload, osmDownload, gpxDownload, monitor);
         waitFuture(future, monitor);
     }

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

@@ -18 +18 @@
 import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -91 +92 @@
             // bounds defined? => use the bbox downloader
             final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
-            final Future<?> future = new DownloadTaskList().download(false /* no new layer */, areasToDownload, true, false, monitor);
+            final Future<?> future = new DownloadTaskList(Config.getPref().getBoolean("update.data.zoom-after-download"))
+                    .download(false /* no new layer */, areasToDownload, true, false, monitor);
             waitFuture(future, monitor);
         }

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java

@@ -50 +50 @@
     private final List<DownloadTask> tasks = new LinkedList<>();
     private final List<Future<?>> taskFutures = new LinkedList<>();
+    private final boolean zoomAfterDownload;
     private ProgressMonitor progressMonitor;
+
+    /**
+     * Constructs a new {@code DownloadTaskList}. Zooms to each download area.
+     */
+    public DownloadTaskList() {
+        this(true);
+    }
+
+    /**
+     * Constructs a new {@code DownloadTaskList}.
+     * @param zoomAfterDownload whether to zoom to each download area
+     * @since 15205
+     */
+    public DownloadTaskList(boolean zoomAfterDownload) {
+        this.zoomAfterDownload = zoomAfterDownload;
+    }
 
     private void addDownloadTask(ProgressMonitor progressMonitor, DownloadTask dt, Rectangle2D td, int i, int n) {
         ProgressMonitor childProgress = progressMonitor.createSubTaskMonitor(1, false);
         childProgress.setCustomText(tr("Download {0} of {1} ({2} left)", i, n, n - i));
+        dt.setZoomAfterDownload(zoomAfterDownload);
         Future<?> future = dt.download(new DownloadParams(), new Bounds(td), childProgress);
         taskFutures.add(future);
@@ -109 +127 @@
         progressMonitor.beginTask(tr("Updating data"));
         try {
-            List<Rectangle2D> rects = new ArrayList<>(areas.size());
-            for (Area a : areas) {
-                rects.add(a.getBounds2D());
-            }
-
+            List<Rectangle2D> rects = areas.stream().map(Area::getBounds2D).collect(Collectors.toList());
             return download(newLayer, rects, osmData, gpxData, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
         } finally {