Changeset 8249 in josm for trunk/src/org

Timestamp:

2015-04-23T18:32:29+02:00 (9 years ago)

Author:

simon04

Message:

see #11356 - Remote control: fix opening overpass query

The compatibility code calling DownloadOsmTask had not been executed.

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java

@@ -33 +33 @@
     protected void handleRequest() throws RequestHandlerErrorException {
         try {
-            if (Main.pref.getBoolean("remotecontrol.import.interactive", true)) {
+            if (suitableDownloadTasks.isEmpty()) {
+                // It should maybe be better to reject the request in that case ?
+                // For compatibility reasons with older instances of JOSM, arbitrary choice of DownloadOsmTask
+                // As of 2015-04, Overpass Turbo requires this branch of code ...
+                Main.debug("Remote control, /import: defaulting to DownloadOsmTask");
+                new DownloadOsmTask().loadUrl(isLoadInNewLayer(), url.toExternalForm(), null);
+            } else if (Main.pref.getBoolean("remotecontrol.import.interactive", true)) {
                 // OpenLocationAction queries the user if more than one task is suitable
                 new OpenLocationAction().openUrl(isLoadInNewLayer(), url.toExternalForm());
@@ -105 +111 @@
         // Find download tasks for the given URL
         suitableDownloadTasks = Main.main.menu.openLocation.findDownloadTasks(urlString, true);
-        if (suitableDownloadTasks.isEmpty()) {
-            // It should maybe be better to reject the request in that case ?
-            // For compatibility reasons with older instances of JOSM, arbitrary choice of DownloadOsmTask
-            suitableDownloadTasks.add(new DownloadOsmTask());
-        }
     }
 }