Changeset 7636 in josm

Timestamp:

2014-10-20T00:03:35+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #10646 - Remote Control v1.6: new load_data handler to load OSM data directly from URL (modified patch by sanderd17)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (5 diffs)
• gui/PleaseWaitRunnable.java (modified) (1 diff)
• io/remotecontrol/RemoteControl.java (modified) (1 diff)
• io/remotecontrol/RequestProcessor.java (modified) (2 diffs)
• io/remotecontrol/handler/LoadDataHandler.java (added)

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

@@ -45 +45 @@
     protected DataSet downloadedData;
     protected DownloadTask downloadTask;
-
-    protected OsmDataLayer targetLayer;
 
     protected String newLayerName = null;
@@ -171 +169 @@
     }
 
-    protected class DownloadTask extends PleaseWaitRunnable {
-        protected OsmServerReader reader;
+    /**
+     * Superclass of internal download task.
+     * @since 7635
+     */
+    public static abstract class AbstractInternalTask extends PleaseWaitRunnable {
+
+        protected final boolean newLayer;
         protected DataSet dataSet;
-        protected boolean newLayer;
+
+        /**
+         * Constructs a new {@code AbstractInternalTask}.
+         *
+         * @param newLayer if {@code true}, force download to a new layer
+         * @param title message for the user
+         * @param ignoreException If true, exception will be propagated to calling code. If false then
+         * exception will be thrown directly in EDT. When this runnable is executed using executor framework
+         * then use false unless you read result of task (because exception will get lost if you don't)
+         */
+        public AbstractInternalTask(boolean newLayer, String title, boolean ignoreException) {
+            super(title, ignoreException);
+            this.newLayer = newLayer;
+        }
+
+        /**
+         * Constructs a new {@code AbstractInternalTask}.
+         *
+         * @param newLayer if {@code true}, force download to a new layer
+         * @param title message for the user
+         * @param progressMonitor progress monitor
+         * @param ignoreException If true, exception will be propagated to calling code. If false then
+         * exception will be thrown directly in EDT. When this runnable is executed using executor framework
+         * then use false unless you read result of task (because exception will get lost if you don't)
+         */
+        public AbstractInternalTask(boolean newLayer, String title, ProgressMonitor progressMonitor, boolean ignoreException) {
+            super(title, progressMonitor, ignoreException);
+            this.newLayer = newLayer;
+        }
+
+        protected OsmDataLayer getEditLayer() {
+            if (!Main.isDisplayingMapView()) return null;
+            return Main.main.getEditLayer();
+        }
+
+        protected int getNumDataLayers() {
+            int count = 0;
+            if (!Main.isDisplayingMapView()) return 0;
+            Collection<Layer> layers = Main.map.mapView.getAllLayers();
+            for (Layer layer : layers) {
+                if (layer instanceof OsmDataLayer) {
+                    count++;
+                }
+            }
+            return count;
+        }
+
+        protected OsmDataLayer getFirstDataLayer() {
+            if (!Main.isDisplayingMapView()) return null;
+            Collection<Layer> layers = Main.map.mapView.getAllLayersAsList();
+            for (Layer layer : layers) {
+                if (layer instanceof OsmDataLayer)
+                    return (OsmDataLayer) layer;
+            }
+            return null;
+        }
+
+        protected OsmDataLayer createNewLayer(String layerName) {
+            if (layerName == null || layerName.isEmpty()) {
+                layerName = OsmDataLayer.createNewName();
+            }
+            return new OsmDataLayer(dataSet, layerName, null);
+        }
+
+        protected OsmDataLayer createNewLayer() {
+            return createNewLayer(null);
+        }
+
+        protected void computeBboxAndCenterScale(Bounds bounds) {
+            BoundingXYVisitor v = new BoundingXYVisitor();
+            if (bounds != null) {
+                v.visit(bounds);
+            } else {
+                v.computeBoundingBox(dataSet.getNodes());
+            }
+            Main.map.mapView.recalculateCenterScale(v);
+        }
+
+        protected OsmDataLayer addNewLayerIfRequired(String newLayerName, Bounds bounds) {
+            int numDataLayers = getNumDataLayers();
+            if (newLayer || numDataLayers == 0 || (numDataLayers > 1 && getEditLayer() == null)) {
+                // the user explicitly wants a new layer, we don't have any layer at all
+                // or it is not clear which layer to merge to
+                //
+                final OsmDataLayer layer = createNewLayer(newLayerName);
+                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(bounds);
+                }
+                return layer;
+            }
+            return null;
+        }
+
+        protected void loadData(String newLayerName, Bounds bounds) {
+            OsmDataLayer layer = addNewLayerIfRequired(newLayerName, bounds);
+            if (layer == null) {
+                layer = getEditLayer();
+                if (layer == null) {
+                    layer = getFirstDataLayer();
+                }
+                layer.mergeFrom(dataSet);
+                computeBboxAndCenterScale(bounds);
+                layer.onPostDownloadFromServer();
+            }
+        }
+    }
+
+    protected class DownloadTask extends AbstractInternalTask {
+        protected final OsmServerReader reader;
 
         public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
-            super(tr("Downloading data"), progressMonitor, false);
+            super(newLayer, tr("Downloading data"), progressMonitor, false);
             this.reader = reader;
-            this.newLayer = newLayer;
         }
 
@@ -186 +302 @@
         }
 
-        @Override public void realRun() throws IOException, SAXException, OsmTransferException {
+        @Override
+        public void realRun() throws IOException, SAXException, OsmTransferException {
             try {
                 if (isCanceled())
@@ -208 +325 @@
         }
 
-        protected OsmDataLayer getEditLayer() {
-            if (!Main.isDisplayingMapView()) return null;
-            return Main.main.getEditLayer();
-        }
-
-        protected int getNumDataLayers() {
-            int count = 0;
-            if (!Main.isDisplayingMapView()) return 0;
-            Collection<Layer> layers = Main.map.mapView.getAllLayers();
-            for (Layer layer : layers) {
-                if (layer instanceof OsmDataLayer) {
-                    count++;
-                }
-            }
-            return count;
-        }
-
-        protected OsmDataLayer getFirstDataLayer() {
-            if (!Main.isDisplayingMapView()) return null;
-            Collection<Layer> layers = Main.map.mapView.getAllLayersAsList();
-            for (Layer layer : layers) {
-                if (layer instanceof OsmDataLayer)
-                    return (OsmDataLayer) layer;
-            }
-            return null;
-        }
-
-        protected OsmDataLayer createNewLayer(String layerName) {
-            if (layerName == null || layerName.isEmpty()) {
-                layerName = OsmDataLayer.createNewName();
-            }
-            return new OsmDataLayer(dataSet, layerName, null);
-        }
-
-        protected OsmDataLayer createNewLayer() {
-            return createNewLayer(null);
-        }
-
-        @Override protected void finish() {
+        @Override
+        protected void finish() {
             if (isFailed() || isCanceled())
                 return;
@@ -259 +339 @@
 
             rememberDownloadedData(dataSet);
-            int numDataLayers = getNumDataLayers();
-            if (newLayer || numDataLayers == 0 || (numDataLayers > 1 && getEditLayer() == null)) {
-                // the user explicitly wants a new layer, we don't have any layer at all
-                // or it is not clear which layer to merge to
-                //
-                targetLayer = createNewLayer(newLayerName);
-                final boolean isDisplayingMapView = Main.isDisplayingMapView();
-
-                Main.main.addLayer(targetLayer);
-
-                // 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();
-                }
-            } else {
-                targetLayer = getEditLayer();
-                if (targetLayer == null) {
-                    targetLayer = getFirstDataLayer();
-                }
-                targetLayer.mergeFrom(dataSet);
-                computeBboxAndCenterScale();
-                targetLayer.onPostDownloadFromServer();
-            }
-        }
-
-        protected void computeBboxAndCenterScale() {
-            BoundingXYVisitor v = new BoundingXYVisitor();
-            if (currentBounds != null) {
-                v.visit(currentBounds);
-            } else {
-                v.computeBoundingBox(dataSet.getNodes());
-            }
-            Main.map.mapView.recalculateCenterScale(v);
-        }
-
-        @Override protected void cancel() {
+            loadData(newLayerName, currentBounds);
+        }
+
+        @Override
+        protected void cancel() {
             setCanceled(true);
             if (reader != null) {

trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

@@ -75 +75 @@
      * exception will be thrown directly in EDT. When this runnable is executed using executor framework
      * then use false unless you read result of task (because exception will get lost if you don't)
-     * @throws IllegalArgumentException thrown if parent is null
      */
     public PleaseWaitRunnable(String title, ProgressMonitor progressMonitor, boolean ignoreException) {

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java

@@ -33 +33 @@
      */
     static final int protocolMajorVersion = 1;
-    static final int protocolMinorVersion = 5;
+    static final int protocolMinorVersion = 6;
 
     /**

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

@@ -31 +31 @@
 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;
@@ -126 +127 @@
         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);