Ticket #10646: data_uri.diff

src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -30 +30 @@
 import org.openstreetmap.josm.io.remotecontrol.handler.ImageryHandler;
 import org.openstreetmap.josm.io.remotecontrol.handler.ImportHandler;
 import org.openstreetmap.josm.io.remotecontrol.handler.LoadAndZoomHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.LoadDataHandler;
 import org.openstreetmap.josm.io.remotecontrol.handler.LoadObjectHandler;
 import org.openstreetmap.josm.io.remotecontrol.handler.OpenFileHandler;
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler;
@@ -125 +126 @@
     static {
         addRequestHandlerClass(LoadAndZoomHandler.command, LoadAndZoomHandler.class, true);
         addRequestHandlerClass(LoadAndZoomHandler.command2, LoadAndZoomHandler.class, true);
+        addRequestHandlerClass(LoadDataHandler.command, LoadDataHandler.class, true);
         addRequestHandlerClass(ImageryHandler.command, ImageryHandler.class, true);
         addRequestHandlerClass(AddNodeHandler.command, AddNodeHandler.class, true);
         addRequestHandlerClass(AddWayHandler.command, AddWayHandler.class, true);

src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.HashMap;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+import org.openstreetmap.josm.io.OsmReader;
+
+/**
+ * Handler to load data directly from the URL
+ */
+public class LoadDataHandler extends RequestHandler {
+
+    /**
+     * The remote control command name used to import data.
+     */
+    public static final String command = "load_data";
+
+    /**
+     * Holds the data input string
+     */
+    private String data;
+    /**
+     * Holds the mime type. Currently only text/osm is supported
+     * But it could be extended to text/csv, text/gpx, ... or even binary encoded data
+     */
+    private String mimeType; 
+
+    @Override
+    protected void handleRequest() throws RequestHandlerErrorException {
+        try {
+            // Transform data string to inputstream
+            InputStream source = new ByteArrayInputStream(data.getBytes("UTF-8"));
+            DataSet dataSet = new DataSet();
+            if (mimeType.indexOf("text/osm") == 0)
+                dataSet = OsmReader.parseDataSet(source, null);
+            LoadDataTask loadDataTask = new LoadDataTask(isLoadInNewLayer(), dataSet, args.get("layer_name"));
+            Main.worker.submit(loadDataTask);
+        } catch (Exception e) {
+            Main.warn("Problem with data: " + data);
+            throw new RequestHandlerErrorException(e);
+        }
+    }
+
+    @Override
+    public String[] getMandatoryParams() {
+        return new String[]{"data"};
+    }
+
+    @Override
+    public String[] getOptionalParams() {
+        return new String[] {"new_layer", "mime_type", "layer_name"};
+    }
+
+    @Override
+    public String getUsage() {
+        return "Reads data encoded directly in the URL and adds it to the current data set";
+    }
+
+    @Override
+    public String[] getUsageExamples() {
+        return new String[] { "/load_data?layer_name=extra_layer&new_layer=true&data=%3Cosm%3E%3Cnode%3E...%3C%2Fnode%3E%3C%2Fosm%3E" };
+    }
+
+    @Override
+    public String getPermissionMessage() {
+        return tr("Remote Control has been asked to load the following data:")
+                + "<br>" + data;
+    }
+
+    @Override
+    public PermissionPrefWithDefault getPermissionPref() {
+        // Same permission as the import data, as the difference from a user pov is minimal
+        return PermissionPrefWithDefault.IMPORT_DATA;
+    }
+
+    @Override
+    protected void parseArgs() {
+        if (request.indexOf('?') == -1)
+            return; // nothing to do
+
+        HashMap<String, String> args = new HashMap<>();
+
+        // The data itself shouldn't contain any &, = or ? chars.
+        // Those are reserved for the URL parsing
+        // and should be URL encoded as %26, %3D or %3F
+        String query = request.substring(request.indexOf('?') + 1);
+        String[] params = query.split("&");
+        for (String param : params)
+        {
+            String[] kv = param.split("=");
+            if (kv.length == 2)
+                args.put(kv[0], kv[1]);
+        }
+        this.args = args;
+    }
+
+    @Override
+    protected void validateRequest() throws RequestHandlerBadRequestException {
+        if (args.get("data") == null)
+            throw new RequestHandlerBadRequestException("RemoteControl: No data defined in URL");
+       try { 
+            data = URLDecoder.decode(args.get("data"), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RequestHandlerBadRequestException("RemoteControl: UnsupportedEncodingException: " + e.getMessage(), e);
+        }
+        mimeType = args.get("mime_type");
+        if (mimeType == null)
+            mimeType = "text/osm";
+    }
+
+    public class LoadDataTask extends PleaseWaitRunnable {
+
+        protected DataSet dataSet;
+        protected boolean newLayer;
+        protected String layerName;
+
+        public LoadDataTask(boolean newLayer, DataSet dataSet, String layerName) {
+            super(tr("Loading data"), false);
+            this.dataSet = dataSet;
+            this.newLayer = newLayer;
+            this.layerName = layerName;
+        }
+
+        @Override public void realRun() {
+            // No real run, the data is already loaded
+        }
+
+        @Override protected void cancel() {
+            // No Cancel, would be hard without a real run
+        }
+
+        @Override protected void finish() {
+            OsmDataLayer layer = getEditLayer();
+            if (newLayer || layer == null) {
+                layer = createNewLayer(layerName, dataSet);
+                final boolean isDisplayingMapView = Main.isDisplayingMapView();
+
+                Main.main.addLayer(layer);
+                // If the mapView is not there yet, we cannot calculate the bounds (see constructor of MapView).
+                // Otherwise jump to the current download.
+                if (isDisplayingMapView) {
+                    computeBboxAndCenterScale(dataSet);
+                }
+            } else {
+                layer.mergeFrom(dataSet);
+                computeBboxAndCenterScale(dataSet);
+                // Mark the layer as changed
+                layer.onPostDownloadFromServer();
+            }
+
+        }
+
+        protected OsmDataLayer getEditLayer() {
+            if (!Main.isDisplayingMapView()) return null;
+            return Main.main.getEditLayer();
+        }
+
+        protected void computeBboxAndCenterScale(DataSet data) {
+            BoundingXYVisitor v = new BoundingXYVisitor();
+            v.computeBoundingBox(data.getNodes());
+            Main.map.mapView.recalculateCenterScale(v);
+        }
+
+        protected OsmDataLayer createNewLayer(String layerName, DataSet data) {
+            if (layerName == null || layerName.isEmpty()) {
+                layerName = OsmDataLayer.createNewName();
+            }
+            return new OsmDataLayer(data, layerName, null);
+        }
+    }
+}