Changeset 295 in josm for src/org/openstreetmap/josm/actions/downloadtasks

Timestamp:

2007-07-24T11:23:01+02:00 (18 years ago)

Author:

imi

Message:

• added "download to new layer" option
• added missing color preferences when opening preferences dialog

Location:

src/org/openstreetmap/josm/actions/downloadtasks

Files:

• DownloadGpsTask.java (modified) (4 diffs)
• DownloadOsmTask.java (modified) (3 diffs)

src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -12 +12 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
@@ -23 +24 @@
                 private DownloadAction action;
                 private Collection<Collection<GpsPoint>> rawData;
+                private final boolean newLayer;
 
-                public Task(BoundingBoxDownloader reader, DownloadAction action) {
+                public Task(boolean newLayer, BoundingBoxDownloader reader, DownloadAction action) {
                         super(tr("Downloading GPS data"));
                         this.reader = reader;
                         this.action = action;
+                        this.newLayer = newLayer;
                 }
 
@@ -38 +41 @@
                                 return;
                         String name = action.dialog.minlat + " " + action.dialog.minlon + " x " + action.dialog.maxlat + " " + action.dialog.maxlon;
-                        Main.main.addLayer(new RawGpsLayer(rawData, name, null));
+                        RawGpsLayer layer = new RawGpsLayer(true, rawData, name, null);
+                        if (newLayer || findMergeLayer() == null)
+                    Main.main.addLayer(layer);
+                        else
+                                findMergeLayer().mergeFrom(layer);
                 }
+
+                private Layer findMergeLayer() {
+                        if (Main.map == null)
+                                return null;
+                Layer active = Main.map.mapView.getActiveLayer();
+                if (active != null && active instanceof RawGpsLayer)
+                        return active;
+                for (Layer l : Main.map.mapView.getAllLayers())
+                        if (l instanceof RawGpsLayer && ((RawGpsLayer)l).fromServer)
+                                return l;
+                return null;
+        }
 
                 @Override protected void cancel() {
@@ -50 +69 @@
 
         public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) {
-                Task task = new Task(new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), action);
+                Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), action);
                 Main.worker.execute(task);
         }

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

@@ -25 +25 @@
                 private BoundingBoxDownloader reader;
                 private DataSet dataSet;
+                private boolean newLayer;
 
-                public Task(BoundingBoxDownloader reader) {
+                public Task(boolean newLayer, BoundingBoxDownloader reader) {
                         super(tr("Downloading data"));
                         this.reader = reader;
+                        this.newLayer = newLayer;
                 }
 
@@ -40 +42 @@
                         if (dataSet.allPrimitives().isEmpty())
                                 errorMessage = tr("No data imported.");
-                        Main.main.addLayer(new OsmDataLayer(dataSet, tr("Data Layer"), null));
+                        OsmDataLayer layer = new OsmDataLayer(dataSet, tr("Data Layer"), null);
+                        if (newLayer)
+                                Main.main.addLayer(layer);
+                        else
+                                Main.main.editLayer().mergeFrom(layer);
                 }
 
@@ -51 +57 @@
 
         public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) {
-                Task task = new Task(new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon));
+                Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon));
                 Main.worker.execute(task);
     }