Changeset 2327 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-10-27T01:21:32+01:00 (16 years ago)

Author:

Gubaer

Message:

Cleanup in download logic (less global, more encapsulation)

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• BoundingBoxDownloader.java (modified) (3 diffs)
• GpxWriter.java (modified) (1 diff)
• OsmWriter.java (modified) (1 diff)

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;

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

@@ -127 +127 @@
         if(bounds != null)
         {
-            String b = "minlat=\"" + bounds.min.lat() + "\" minlon=\"" + bounds.min.lon() +
-                "\" maxlat=\"" + bounds.max.lat() + "\" maxlon=\"" + bounds.max.lon() + "\"" ;
+            String b = "minlat=\"" + bounds.getMin().lat() + "\" minlon=\"" + bounds.getMin().lon() +
+                "\" maxlat=\"" + bounds.getMax().lat() + "\" maxlon=\"" + bounds.getMax().lon() + "\"" ;
             inline("bounds", b);
         }

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

@@ -93 +93 @@
         for (DataSource s : ds.dataSources) {
             out.println("  <bounds minlat='"
-                    + s.bounds.min.lat()+"' minlon='"
-                    + s.bounds.min.lon()+"' maxlat='"
-                    + s.bounds.max.lat()+"' maxlon='"
-                    + s.bounds.max.lon()
+                    + s.bounds.getMin().lat()+"' minlon='"
+                    + s.bounds.getMin().lon()+"' maxlat='"
+                    + s.bounds.getMax().lat()+"' maxlon='"
+                    + s.bounds.getMax().lon()
                     +"' origin='"+XmlWriter.encode(s.origin)+"' />");
         }