Changeset 27692 in osm for applications/editors/josm/plugins/mirrored_download/src

Timestamp:

2012-02-02T18:51:49+01:00 (12 years ago)

Author:

roland

Message:

Fallback bounds for downloads. Made server selection box editable.

Location:

applications/editors/josm/plugins/mirrored_download/src/mirrored_download

Files:

• BoundingBoxDownloader2.java (modified) (3 diffs)
• UrlSelectionDialog.java (modified) (1 diff)

applications/editors/josm/plugins/mirrored_download/src/mirrored_download/BoundingBoxDownloader2.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.xml.sax.SAXException;
@@ -19 +20 @@
 public class BoundingBoxDownloader2 extends BoundingBoxDownloader {
 
+    /**
+     * The boundings of the desired map data.
+     */
+    private final double lat1;
+    private final double lon1;
+    private final double lat2;
+    private final double lon2;
+    private final boolean crosses180th;
+
     public BoundingBoxDownloader2(Bounds downloadArea) {
         super(downloadArea);
+
+        this.lat1 = downloadArea.getMin().lat();
+        this.lon1 = downloadArea.getMin().lon();
+        this.lat2 = downloadArea.getMax().lat();
+        this.lon2 = downloadArea.getMax().lon();
+        this.crosses180th = downloadArea.crosses180thMeridian();
     }
 
-    protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor) throws OsmTransferException  {
+    protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor)
+        throws OsmTransferException  {
+
         try {
             OsmApi.getOsmApi().initialize(progressMonitor);
@@ -33 +51 @@
     }
 
+    public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
+
+        DataSet ds = super.parseOsm(progressMonitor);
+
+        System.out.println(ds.dataSources.toString());
+        if (ds != null && ds.dataSources.size() == 0)
+        {
+            if (crosses180th)
+            {
+                Bounds bounds = new Bounds(lat1, lon1, lat2, 180.0);
+                DataSource src = new DataSource(bounds, MirroredDownloadPlugin.getDownloadUrl());
+                ds.dataSources.add(src);
+
+                bounds = new Bounds(lat1, -180.0, lat2, lon2);
+                src = new DataSource(bounds, MirroredDownloadPlugin.getDownloadUrl());
+                ds.dataSources.add(src);
+            }
+            else
+            {
+                Bounds bounds = new Bounds(lat1, lon1, lat2, lon2);
+                DataSource src = new DataSource(bounds, MirroredDownloadPlugin.getDownloadUrl());
+                ds.dataSources.add(src);
+            }
+        }
+        System.out.println(ds.dataSources.toString());
+
+        return ds;
+    }
 }

applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionDialog.java

@@ -97 +97 @@
 
     cbSelectUrl = new JComboBox();
-    cbSelectUrl.setEditable(false);
+    cbSelectUrl.setEditable(true);
 
     cbSelectUrl.addItem("http://overpass.osm.rambler.ru/cgi/xapi?");