Changeset 19550 in josm

Timestamp:

2026-03-19T14:35:08+01:00 (3 hours ago)

Author:

stoecker

Message:

warn about downloading old data - patch by taylor.smock, fix #21904

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• OpenLocationAction.java (modified) (3 diffs)
• downloadtasks/DownloadOsmChangeTask.java (modified) (1 diff)
• downloadtasks/DownloadParams.java (modified) (1 diff)
• downloadtasks/DownloadTask.java (modified) (1 diff)

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

@@ -37 +37 @@
 import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
@@ -279 +280 @@
         List<Future<?>> result = new ArrayList<>();
         for (final DownloadTask task : tasks) {
+            DownloadParams currentParams = settings;
+            if (task.providesOldData() && !settings.isNewLayer()) {
+                currentParams = GuiHelper.runInEDTAndWaitAndReturn(() -> confirmNoNewLayer(settings, url));
+            }
             try {
                 task.setZoomAfterDownload(zoomToData);
-                result.add(MainApplication.worker.submit(new PostDownloadHandler(task, task.loadUrl(settings, url,
+                result.add(MainApplication.worker.submit(new PostDownloadHandler(task, task.loadUrl(currentParams, url,
                         new PleaseWaitProgressMonitor(tr("Download data"))))));
             } catch (IllegalArgumentException e) {
@@ -288 +293 @@
         }
         return Collections.unmodifiableList(result);
+    }
+
+    private static DownloadParams confirmNoNewLayer(DownloadParams originalParams, String url) {
+        if (ConditionalOptionPaneUtil.showConfirmationDialog("open-location-action.confirm-no-new-layer",
+                MainApplication.getMainFrame(),
+                tr("Do you want to create a new layer for {0}?<br>You may be mixing old and new data otherwise!", url),
+                tr("No new layer"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, JOptionPane.YES_OPTION)
+        ) {
+            return new DownloadParams(originalParams).withNewLayer(true);
+        }
+        return originalParams;
     }
 

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

@@ -87 +87 @@
     }
 
+    @Override
+    public boolean providesOldData() {
+        return true;
+    }
+
     /**
      * OsmChange download task.

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

@@ -16 +16 @@
     private DownloadPolicy downloadPolicy;
     private UploadPolicy uploadPolicy;
+
+    public DownloadParams() {
+        // Do nothing -- just make this constructor visible
+    }
+
+    /**
+     * Clone another {@link DownloadParams}
+     * @param other The download parameters to clone
+     */
+    public DownloadParams(DownloadParams other) {
+        this.newLayer = other.newLayer;
+        this.layerName = other.layerName;
+        this.locked = other.locked;
+        this.downloadPolicy = other.downloadPolicy;
+        this.uploadPolicy = other.uploadPolicy;
+    }
 
     /**

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

@@ -155 +155 @@
 
     /**
+     * If this task provides potentially old data, this should return {@code true}. If so, it would be a good decision
+     * to prompt users to verify if they want the data to be downloaded to the current layer.
+     * @return {@code true} if the data could be old.
+     * @since xxx
+     */
+    default boolean providesOldData() {
+        return false;
+    }
+
+    /**
      * Cancels the asynchronous download task.
      *