Changeset 13927 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.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/downloadtasks/DownloadGpsTask.java (modified) (5 diffs)

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

@@ -59 +59 @@
 
     @Override
-    public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
-        downloadTask = new DownloadTask(newLayer,
+    public Future<?> download(DownloadParams settings, Bounds downloadArea, ProgressMonitor progressMonitor) {
+        downloadTask = new DownloadTask(settings,
                 new BoundingBoxDownloader(downloadArea), progressMonitor);
         // We need submit instead of execute so we can wait for it to finish and get the error
@@ -68 +68 @@
 
     @Override
-    public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
+    public Future<?> loadUrl(DownloadParams settings, String url, ProgressMonitor progressMonitor) {
         CheckParameterUtil.ensureParameterNotNull(url, "url");
         final Optional<String> mappedUrl = Stream.of(GpxUrlPattern.USER_TRACE_ID, GpxUrlPattern.EDIT_TRACE_ID)
@@ -76 +76 @@
                 .findFirst();
         if (mappedUrl.isPresent()) {
-            return loadUrl(newLayer, mappedUrl.get(), progressMonitor);
+            return loadUrl(settings, mappedUrl.get(), progressMonitor);
         }
         if (Stream.of(GpxUrlPattern.TRACE_ID, GpxUrlPattern.EXTERNAL_GPX_SCRIPT,
                       GpxUrlPattern.EXTERNAL_GPX_FILE, GpxUrlPattern.TASKING_MANAGER)
                 .anyMatch(p -> url.matches(p.pattern()))) {
-            downloadTask = new DownloadTask(newLayer,
+            downloadTask = new DownloadTask(settings,
                     new OsmServerLocationReader(url), progressMonitor);
             // Extract .gpx filename from URL to set the new layer name
@@ -94 +94 @@
             for (int i = 0; i < table.length; i++) {
                 if ("bbox".equals(table[i]) && i < table.length-1)
-                    return download(newLayer, new Bounds(table[i+1], ",", ParseMethod.LEFT_BOTTOM_RIGHT_TOP), progressMonitor);
+                    return download(settings, new Bounds(table[i+1], ",", ParseMethod.LEFT_BOTTOM_RIGHT_TOP), progressMonitor);
             }
         }
@@ -117 +117 @@
         private final boolean newLayer;
 
-        DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
+        DownloadTask(DownloadParams settings, OsmServerReader reader, ProgressMonitor progressMonitor) {
             super(tr("Downloading GPS data"), progressMonitor, false);
             this.reader = reader;
-            this.newLayer = newLayer;
+            this.newLayer = settings.isNewLayer();
         }