Index: /applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java
===================================================================
--- /applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java (revision 12430)
+++ /applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java (revision 12431)
@@ -7,4 +7,5 @@
import java.io.*;
import java.net.Socket;
+import java.net.URLDecoder;
import java.util.Date;
import java.util.HashMap;
@@ -41,5 +42,5 @@
* Constructor
*
- * @param request The WMS request
+ * @param request
*/
public RequestProcessor(Socket request)
@@ -109,5 +110,6 @@
if (Main.pref.getBoolean("remotecontrol.always-confirm", false)) {
if (JOptionPane.showConfirmDialog(Main.parent,
- tr("Remote Control has been asked to load data from the API. Request details: {0}. Do you want to allow this?", url),
+ "" + tr("Remote Control has been asked to load data from the API.") +
+ "
" + tr("Request details: {0}", url) + "
" + tr("Do you want to allow this?"),
tr("Confirm Remote Control action"),
JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION) {
@@ -202,4 +204,36 @@
});
}
+ } else if (command.equals("/import")) {
+ if (Main.pref.getBoolean("remotecontrol.always-confirm", false)) {
+ if (JOptionPane.showConfirmDialog(Main.parent,
+ "" + tr("Remote Control has been asked to import data from the following URL:") +
+ "
" + url +
+ "
" + tr("Do you want to allow this?"),
+ tr("Confirm Remote Control action"),
+ JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION) {
+ sendForbidden(out);
+ return;
+ }
+ }
+ if (!(args.containsKey("url"))) {
+ sendBadRequest(out);
+ System.out.println("'import' remote control request must have url parameter");
+ return;
+ }
+ try {
+ if (!Main.pref.getBoolean("remotecontrol.permission.import", true))
+ throw new LoadDeniedException();
+
+ DownloadTask osmTask = new DownloadOsmTask();
+ osmTask.loadUrl(false, URLDecoder.decode(args.get("url"), "UTF-8"));
+ } catch (LoadDeniedException ex) {
+ System.out.println("RemoteControl: import forbidden by preferences");
+ } catch (Exception ex) {
+ sendError(out);
+ System.out.println("RemoteControl: Error parsing import remote control request:");
+ ex.printStackTrace();
+ return;
+ }
+ // TODO: select/zoom to downloaded
}
sendHeader(out, "200 OK", "text/plain", false);