Changeset 11658 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-03-04T00:49:24+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #13922 - Add (expert) option to not zoom to the new downloaded data

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadAction.java (modified) (3 diffs)
• actions/OverpassDownloadAction.java (modified) (1 diff)
• actions/downloadtasks/AbstractDownloadTask.java (modified) (2 diffs)
• actions/downloadtasks/DownloadGpsTask.java (modified) (1 diff)
• actions/downloadtasks/DownloadNotesTask.java (modified) (2 diffs)
• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• gui/download/DownloadDialog.java (modified) (7 diffs)

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

@@ -48 +48 @@
             if (dialog.isDownloadOsmData()) {
                 DownloadOsmTask task = new DownloadOsmTask();
+                task.setZoomAfterDownload(dialog.isZoomToDownloadedDataRequired());
                 Future<?> future = task.download(dialog.isNewLayerRequired(), area, null);
                 Main.worker.submit(new PostDownloadHandler(task, future));
@@ -53 +54 @@
             if (dialog.isDownloadGpxData()) {
                 DownloadGpsTask task = new DownloadGpsTask();
+                task.setZoomAfterDownload(dialog.isZoomToDownloadedDataRequired());
                 Future<?> future = task.download(dialog.isNewLayerRequired(), area, null);
                 Main.worker.submit(new PostDownloadHandler(task, future));
@@ -58 +60 @@
             if (dialog.isDownloadNotes()) {
                 DownloadNotesTask task = new DownloadNotesTask();
+                task.setZoomAfterDownload(dialog.isZoomToDownloadedDataRequired());
                 Future<?> future = task.download(false, area, null);
                 Main.worker.submit(new PostDownloadHandler(task, future));

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

@@ -81 +81 @@
             Bounds area = dialog.getSelectedDownloadArea();
             DownloadOsmTask task = new DownloadOsmTask();
+            task.setZoomAfterDownload(dialog.isZoomToDownloadedDataRequired());
             Future<?> future = task.download(
                     new OverpassDownloadReader(area, OverpassServerPreference.getOverpassServer(), dialog.getOverpassQuery()),

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

@@ -17 +17 @@
     private boolean failed;
     protected T downloadedData;
+    protected boolean zoomAfterDownload = true;
 
     /**
@@ -75 +76 @@
     public final T getDownloadedData() {
         return downloadedData;
+    }
+
+    /**
+     * Sets whether the map view will zoom to download area after download
+     * @param zoomAfterDownload if true, the map view will zoom to download area after download
+     * @since 11658
+     */
+    public final void setZoomAfterDownload(boolean zoomAfterDownload) {
+        this.zoomAfterDownload = zoomAfterDownload;
     }
 

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

@@ -163 +163 @@
                 mergeLayer.mergeFrom(layer);
                 mergeLayer.invalidate();
-                if (Main.map != null) {
+                if (Main.map != null && zoomAfterDownload) {
                     Main.map.mapView.scheduleZoomTo(new ViewportData(layer.getViewProjectionBounds()));
                 }

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

@@ -14 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ViewportData;
 import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.osm.NoteData;
@@ -117 +118 @@
             if (!noteLayers.isEmpty()) {
                 noteLayers.get(0).getNoteData().addNotes(notesData);
+                if (Main.map != null && zoomAfterDownload) {
+                    Main.map.mapView.scheduleZoomTo(new ViewportData(noteLayers.get(0).getViewProjectionBounds()));
+                }
             } else {
                 Main.getLayerManager().addLayer(new NoteLayer(notesData, tr("Notes")));

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

@@ -115 +115 @@
      */
     public Future<?> download(OsmServerReader reader, boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
-        return download(new DownloadTask(newLayer, reader, progressMonitor), downloadArea);
+        return download(new DownloadTask(newLayer, reader, progressMonitor, zoomAfterDownload), downloadArea);
     }
 

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -63 +63 @@
     private static final BooleanProperty DOWNLOAD_NOTES = new BooleanProperty("download.notes", false);
     private static final BooleanProperty DOWNLOAD_NEWLAYER = new BooleanProperty("download.newlayer", false);
+    private static final BooleanProperty DOWNLOAD_ZOOMTODATA = new BooleanProperty("download.zoomtodata", true);
 
     /** the unique instance of the download dialog */
@@ -84 +85 @@
     protected JCheckBox cbNewLayer;
     protected JCheckBox cbStartup;
+    protected JCheckBox cbZoomToDownloadedData;
     protected final JLabel sizeCheck = new JLabel();
     protected transient Bounds currentBounds;
@@ -161 +163 @@
         cbStartup.addActionListener(e -> DOWNLOAD_AUTORUN.put(cbStartup.isSelected()));
 
+        cbZoomToDownloadedData = new JCheckBox(tr("Zoom to downloaded data"));
+        cbZoomToDownloadedData.setToolTipText(tr("Select to zoom to entire newly downloaded data."));
+
         pnl.add(cbNewLayer, GBC.std().anchor(GBC.WEST).insets(5, 5, 5, 5));
         pnl.add(cbStartup, GBC.std().anchor(GBC.WEST).insets(15, 5, 5, 5));
+        pnl.add(cbZoomToDownloadedData, GBC.std().anchor(GBC.WEST).insets(15, 5, 5, 5));
+
+        ExpertToggleAction.addVisibilitySwitcher(cbZoomToDownloadedData);
 
         pnl.add(sizeCheck, GBC.eol().anchor(GBC.EAST).insets(5, 5, 5, 2));
@@ -192 +200 @@
         InputMapUtils.addEnterActionWhenAncestor(cbDownloadNotes, actDownload);
         InputMapUtils.addEnterActionWhenAncestor(cbNewLayer, actDownload);
+        InputMapUtils.addEnterActionWhenAncestor(cbStartup, actDownload);
+        InputMapUtils.addEnterActionWhenAncestor(cbZoomToDownloadedData, actDownload);
 
         // -- cancel button
@@ -339 +349 @@
 
     /**
+     * Replies true if the user requires to zoom to new downloaded data
+     *
+     * @return true if the user requires to zoom to new downloaded data
+     * @since 11658
+     */
+    public boolean isZoomToDownloadedDataRequired() {
+        return cbZoomToDownloadedData.isSelected();
+    }
+
+    /**
      * Adds a new download area selector to the download dialog
      *
@@ -367 +387 @@
         DOWNLOAD_NOTES.put(cbDownloadNotes.isSelected());
         DOWNLOAD_NEWLAYER.put(cbNewLayer.isSelected());
+        DOWNLOAD_ZOOMTODATA.put(cbZoomToDownloadedData.isSelected());
         if (currentBounds != null) {
             Main.pref.put("osm-download.bounds", currentBounds.encodeAsString(";"));
@@ -381 +402 @@
         cbNewLayer.setSelected(DOWNLOAD_NEWLAYER.get());
         cbStartup.setSelected(isAutorunEnabled());
+        cbZoomToDownloadedData.setSelected(DOWNLOAD_ZOOMTODATA.get());
         int idx = Utils.clamp(DOWNLOAD_TAB.get(), 0, tpDownloadAreaSelectors.getTabCount() - 1);
         tpDownloadAreaSelectors.setSelectedIndex(idx);