Changeset 13927 in josm for trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

Timestamp:

2018-06-13T22:17:23+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11000 - Remote control: allow to specify layer_name for import

File:

• trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (modified) (4 diffs)

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

@@ -36 +36 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmUrlTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadSessionTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadParams;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
 import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
@@ -225 +226 @@
      */
     public List<Future<?>> openUrl(boolean newLayer, String url) {
-        return openUrl(newLayer, DOWNLOAD_ZOOMTODATA.get(), url);
+        return openUrl(new DownloadParams().withNewLayer(newLayer), url);
+    }
+
+    /**
+     * Open the given URL.
+     * @param settings download settings
+     * @param url The URL to open
+     * @return the list of tasks that have been started successfully (can be empty).
+     * @since 13927
+     */
+    public List<Future<?>> openUrl(DownloadParams settings, String url) {
+        return openUrl(settings, DOWNLOAD_ZOOMTODATA.get(), url);
     }
 
@@ -247 +259 @@
      */
     public List<Future<?>> openUrl(boolean newLayer, boolean zoomToData, String url) {
+        return openUrl(new DownloadParams().withNewLayer(newLayer), zoomToData, url);
+    }
+
+    /**
+     * Open the given URL.
+     * @param settings download settings
+     * @param zoomToData true to zoom to entire newly downloaded data, false otherwise
+     * @param url The URL to open
+     * @return the list of tasks that have been started successfully (can be empty).
+     * @since 13927
+     */
+    public List<Future<?>> openUrl(DownloadParams settings, boolean zoomToData, String url) {
         Collection<DownloadTask> tasks = findDownloadTasks(url, false);
 
@@ -262 +286 @@
             try {
                 task.setZoomAfterDownload(zoomToData);
-                result.add(MainApplication.worker.submit(new PostDownloadHandler(task, task.loadUrl(newLayer, url, monitor))));
+                result.add(MainApplication.worker.submit(new PostDownloadHandler(task, task.loadUrl(settings, url, monitor))));
             } catch (IllegalArgumentException e) {
                 Logging.error(e);