Changes in trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java [5085:5691] in josm

File:

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

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collection;
 import java.util.HashMap;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
@@ -17 +19 @@
 public class ImportHandler extends RequestHandler {
 
+    /**
+     * The remote control command name used to import data.
+     */
     public static final String command = "import";
+    
+    private URL url;
+    private Collection<DownloadTask> suitableDownloadTasks;
 
     @Override
     protected void handleRequest() throws RequestHandlerErrorException {
         try {
-            DownloadTask osmTask = new DownloadOsmTask();
-            osmTask.loadUrl(false, args.get("url"), null);
+            if (suitableDownloadTasks != null && !suitableDownloadTasks.isEmpty()) {
+                // TODO: add new_layer parameter
+                // TODO: handle multiple suitable download tasks ?
+                suitableDownloadTasks.iterator().next().loadUrl(false, url.toExternalForm(), null);
+            }
         } catch (Exception ex) {
             System.out.println("RemoteControl: Error parsing import remote control request:");
@@ -38 +49 @@
     @Override
     public String getPermissionMessage() {
+        // URL can be any suitable URL giving back OSM data, including OSM API calls, even if calls to the main API
+        // should rather be passed to LoadAndZoomHandler or LoadObjectHandler.
+        // Other API instances will however use the import handler to force JOSM to make requests to this API instance.
+        // (Example with OSM-FR website that makes calls to the OSM-FR API)
+        // For user-friendliness, let's try to decode these OSM API calls to give a better confirmation message.
+        String taskMessage = null;
+        if (suitableDownloadTasks != null && !suitableDownloadTasks.isEmpty()) {
+            // TODO: handle multiple suitable download tasks ?
+            taskMessage = suitableDownloadTasks.iterator().next().getConfirmationMessage(url);
+        }
         return tr("Remote Control has been asked to import data from the following URL:")
-                + "<br>" + request;
+                + "<br>" + (taskMessage == null ? url.toString() : taskMessage);
     }
 
@@ -53 +74 @@
             String query = request.substring(request.indexOf('?') + 1);
             if (query.indexOf("url=") == 0) {
-                args.put("url", decodeURL(query.substring(4)));
+                args.put("url", decodeParam(query.substring(4)));
             } else {
                 int urlIdx = query.indexOf("&url=");
                 if (urlIdx != -1) {
-                    String url = query.substring(urlIdx + 1);
-                    args.put("url", decodeURL(query.substring(urlIdx + 5)));
+                    /*String url =*/ query.substring(urlIdx + 1);
+                    args.put("url", decodeParam(query.substring(urlIdx + 5)));
                     query = query.substring(0, urlIdx);
                 } else {
@@ -77 +98 @@
     }
 
-    private String decodeURL(String url) {
+    @Override
+    protected void validateRequest() throws RequestHandlerBadRequestException {
+        final String urlString = args.get("url");
         try {
-            return URLDecoder.decode(url, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException();
+            // Ensure the URL is valid
+            url = new URL(urlString);
+        } catch (MalformedURLException e) {
+            throw new RequestHandlerBadRequestException("MalformedURLException: "+e.getMessage());
+        }
+        // Find download tasks for the given URL
+        suitableDownloadTasks = Main.main.menu.openLocation.findDownloadTasks(urlString);
+        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());
         }
     }