Changeset 2327 in josm for trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

Timestamp:

27.10.2009 01:21:32 (3 years ago)

Author:

Gubaer

Message:

Cleanup in download logic (less global, more encapsulation)

File:

• trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -7 +7 @@
 import java.io.InputStream;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -24 +24 @@
     private final double lon2;
 
-    public BoundingBoxDownloader(double lat1, double lon1, double lat2, double lon2) {
-        this.lat1 = lat1;
-        this.lon1 = lon1;
-        this.lat2 = lat2;
-        this.lon2 = lon2;
-        // store the bounding box in the preferences so it can be
-        // re-used across invocations of josm
-        Main.pref.put("osm-download.bounds", lat1+";"+lon1+";"+lat2+";"+lon2);
+    public BoundingBoxDownloader(Bounds downloadArea) {
+        this.lat1 = downloadArea.getMin().lat();
+        this.lon1 = downloadArea.getMin().lon();
+        this.lat2 = downloadArea.getMax().lat();
+        this.lon2 = downloadArea.getMax().lon();
     }
 
@@ -44 +41 @@
         try {
             progressMonitor.indeterminateSubTask(tr("Contacting OSM Server..."));
-            String url = "trackpoints?bbox="+lon1+","+lat1+","+lon2+","+lat2+"&page=";
+            String url = "trackpoints?bbox="+lon1+","+lat1+","+lon2+","+lat2+"&page=";            
 
             boolean done = false;