Changeset 1082 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

Timestamp:

2008-11-18T08:40:49+01:00 (15 years ago)

Author:

framm

Message:

• some changes regarding the "hatched download area": now also works for areas where server returns no data; colour preference is now called "outside downloaded area", not "downloaded Area"; changing the colour now invalidates the prepared pattern so that restart is not required; pattern is now transparent (patch from Stephan Knauss) so WMS and other layers are visible below. Fixes #1762, #1754, partly #1756

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (4 diffs)

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

@@ -11 +11 @@
 import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.BoundingBoxDownloader;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.xml.sax.SAXException;
+
 
 /**
@@ -22 +26 @@
  */
 public class DownloadOsmTask implements DownloadTask {
+
+    private static Bounds currentBounds;
 
         private static class Task extends PleaseWaitRunnable {
@@ -41 +47 @@
                         if (dataSet == null)
                                 return; // user cancelled download or error occoured
-                        if (dataSet.allPrimitives().isEmpty())
+                        if (dataSet.allPrimitives().isEmpty()) {
                                 errorMessage = tr("No data imported.");
+                // need to synthesize a download bounds lest the visual indication of downloaded
+                // area doesn't work
+                dataSet.dataSources.add(new DataSource(currentBounds, "OpenStreetMap server"));
+            }
+
                         OsmDataLayer layer = new OsmDataLayer(dataSet, tr("Data Layer"), null);
                         if (newLayer)
@@ -69 +80 @@
     
                 Task task = new Task(action != null && (action.dialog == null || action.dialog.newLayer.isSelected()), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon));
+        currentBounds = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon));
                 Main.worker.execute(task);
     }