Changeset 16893 in josm for trunk

Timestamp:

2020-08-14T23:46:00+02:00 (4 years ago)

Author:

simon04

Message:

fix #3450 - SlippyMapBBoxChooser: confirm download bounds outside current map view

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• bbox/SlippyMapBBoxChooser.java (modified) (1 diff)
• download/DownloadDialog.java (modified) (2 diffs)
• download/DownloadSettings.java (modified) (3 diffs)
• download/OSMDownloadSource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -359 +359 @@
         // Do nothing
     }
+
+    /**
+     * Returns the currently visible map area
+     * @return the currently visible map area
+     */
+    public Bounds getVisibleMapArea() {
+        final ICoordinate topLeft = getPosition(0, 0);
+        final ICoordinate bottomRight = getPosition(getWidth(), getHeight());
+        final Bounds bounds = new Bounds(topLeft.getLat(), topLeft.getLon(), false);
+        bounds.extend(bottomRight.getLat(), bottomRight.getLon());
+        return bounds;
+    }
 }

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

@@ -44 +44 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
@@ -502 +503 @@
      */
     public DownloadSettings getDownloadSettings(boolean newLayer) {
-        return new DownloadSettings(currentBounds, newLayer, isZoomToDownloadedDataRequired());
+        final Component areaSelector = tpDownloadAreaSelectors.getSelectedComponent();
+        final Bounds slippyMapBounds = areaSelector instanceof SlippyMapBBoxChooser
+                ? ((SlippyMapBBoxChooser) areaSelector).getVisibleMapArea()
+                : null;
+        return new DownloadSettings(currentBounds, slippyMapBounds, newLayer, isZoomToDownloadedDataRequired());
     }
 

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

@@ -15 +15 @@
 
     private final Bounds downloadBounds;
+    private final Bounds slippyMapBounds;
     private final boolean downloadAsNewLayer;
     private final boolean zoomToDownloadedData;
@@ -21 +22 @@
      * Initializes a new instance of {@code DownloadSettings}.
      * @param bbox The bounding box
+     * @param slippyMapBounds The bounds of the {@link SlippyMapChooser}/{@link org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser}
      * @param downloadAsNewLayer The flag defining if a new layer must be created for the downloaded data.
      * @param zoomToDownloadedData The flag defining if the map view, see {@link SlippyMapChooser},
-     *                             must zoom to the downloaded data.
      */
-    public DownloadSettings(Bounds bbox, boolean downloadAsNewLayer, boolean zoomToDownloadedData) {
+    public DownloadSettings(Bounds bbox, Bounds slippyMapBounds, boolean downloadAsNewLayer, boolean zoomToDownloadedData) {
         this.downloadBounds = bbox;
+        this.slippyMapBounds = slippyMapBounds;
         this.downloadAsNewLayer = downloadAsNewLayer;
         this.zoomToDownloadedData = zoomToDownloadedData;
@@ -54 +56 @@
         return Optional.ofNullable(downloadBounds);
     }
+
+    /**
+     * Gets the slippy map bounds
+     * @return the slippy map bounds or an empty {@link Optional} if no slippy map was used to select the download bounds
+     */
+    public Optional<Bounds> getSlippyMapBounds() {
+        return Optional.ofNullable(slippyMapBounds);
+    }
 }

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

@@ -273 +273 @@
             }
 
+            final Boolean slippyMapShowsDownloadBounds = settings.getSlippyMapBounds()
+                    .map(b -> b.intersects(settings.getDownloadBounds().get()))
+                    .orElse(true);
+            if (!slippyMapShowsDownloadBounds) {
+                final int confirmation = JOptionPane.showConfirmDialog(
+                        this.getParent(),
+                        tr("The slippy map no longer shows the selected download bounds. Continue?"),
+                        tr("Confirmation"),
+                        JOptionPane.OK_CANCEL_OPTION,
+                        JOptionPane.QUESTION_MESSAGE
+                );
+                if (confirmation != JOptionPane.OK_OPTION) {
+                    return false;
+                }
+            }
+
             /*
              * Checks if the user selected the type of data to download. At least one the following