Changeset 5097 in josm for trunk

Timestamp:

2012-03-17T23:51:40+01:00 (12 years ago)

Author:

simon04

Message:

see #7511 - make DownloadDialog, Osm download related classes more adaptable

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• gui/download/DownloadDialog.java (modified) (4 diffs)
• io/BoundingBoxDownloader.java (modified) (4 diffs)
• io/OsmServerReader.java (modified) (1 diff)

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

@@ -48 +48 @@
     }
 
+    @Override
     public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
-
-        downloadTask = new DownloadTask(newLayer,
-                new BoundingBoxDownloader(downloadArea), progressMonitor);
-        currentBounds = new Bounds(downloadArea);
+        return download(new BoundingBoxDownloader(downloadArea), newLayer, downloadArea, progressMonitor);
+    }
+
+    public Future<?> download(OsmServerReader reader, boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
+        return download(new DownloadTask(newLayer, reader, progressMonitor), downloadArea);
+    }
+
+    protected Future<?> download(DownloadTask downloadTask, Bounds downloadArea) {
+        this.downloadTask = downloadTask;
+        this.currentBounds = new Bounds(downloadArea);
         // We need submit instead of execute so we can wait for it to finish and get the error
         // message if necessary. If no one calls getErrorMessage() it just behaves like execute.

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -66 +66 @@
     }
 
-    private final List<DownloadSelection> downloadSelections = new ArrayList<DownloadSelection>();
-    private final JTabbedPane tpDownloadAreaSelectors = new JTabbedPane();
-    private JCheckBox cbNewLayer;
-    private JCheckBox cbStartup;
-    private final JLabel sizeCheck = new JLabel();
-    private Bounds currentBounds = null;
-    private boolean canceled;
-
-    private JCheckBox cbDownloadOsmData;
-    private JCheckBox cbDownloadGpxData;
+    protected final List<DownloadSelection> downloadSelections = new ArrayList<DownloadSelection>();
+    protected final JTabbedPane tpDownloadAreaSelectors = new JTabbedPane();
+    protected JCheckBox cbNewLayer;
+    protected JCheckBox cbStartup;
+    protected final JLabel sizeCheck = new JLabel();
+    protected Bounds currentBounds = null;
+    protected boolean canceled;
+
+    protected JCheckBox cbDownloadOsmData;
+    protected JCheckBox cbDownloadGpxData;
     /** the download action and button */
     private DownloadAction actDownload;
-    private SideButton btnDownload;
+    protected SideButton btnDownload;
 
     private void makeCheckBoxRespondToEnter(JCheckBox cb) {
@@ -85 +85 @@
     }
 
-    public JPanel buildMainPanel() {
-        // generic constraints used by different components
-        GridBagConstraints gridBagConstraints;
-
+    protected JPanel buildMainPanel() {
         JPanel pnl = new JPanel();
         pnl.setLayout(new GridBagLayout());
@@ -100 +97 @@
         cbDownloadGpxData.setToolTipText(tr("Select to download GPS traces in the selected download area."));
         pnl.add(cbDownloadGpxData,  GBC.eol().insets(5,5,1,5));
+
+        buildMainPanelAboveDownloadSelections(pnl);
 
         // predefined download selections
@@ -390 +389 @@
     }
 
+    protected void buildMainPanelAboveDownloadSelections(JPanel pnl) {
+    }
+
     class CancelAction extends AbstractAction {
         public CancelAction() {

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

@@ -18 +18 @@
      * 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;
+    protected final double lat1;
+    protected final double lon1;
+    protected final double lat2;
+    protected final double lon2;
+    protected final boolean crosses180th;
 
     public BoundingBoxDownloader(Bounds downloadArea) {
@@ -101 +101 @@
     }
 
+    protected String getRequestForBbox(double lon1, double lat1, double lon2, double lat2) {
+        return "map?bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2;
+    }
+
     /**
      * Read the data from the osm server address.
@@ -114 +118 @@
             if (crosses180th) {
                 // API 0.6 does not support requests crossing the 180th meridian, so make two requests
-                in = getInputStream("map?bbox="+lon1+","+lat1+",180.0,"+lat2, progressMonitor.createSubTaskMonitor(9, false));
+                in = getInputStream(getRequestForBbox(lon1, lat1, 180.0, lat2), progressMonitor.createSubTaskMonitor(9, false));
                 if (in == null)
                     return null;
                 ds = OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
 
-                in = getInputStream("map?bbox=-180.0,"+lat1+","+lon2+","+lat2, progressMonitor.createSubTaskMonitor(9, false));
+                in = getInputStream(getRequestForBbox(-180.0, lat1, lon2, lat2), progressMonitor.createSubTaskMonitor(9, false));
                 if (in == null)
                     return null;
@@ -129 +133 @@
             } else {
                 // Simple request
-                in = getInputStream("map?bbox="+lon1+","+lat1+","+lon2+","+lat2, progressMonitor.createSubTaskMonitor(9, false));
+                in = getInputStream(getRequestForBbox(lon1, lat1, lon2, lat2), progressMonitor.createSubTaskMonitor(9, false));
                 if (in == null)
                     return null;

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

@@ -43 +43 @@
         try {
             api.initialize(progressMonitor);
-            urlStr = api.getBaseUrl() + urlStr;
+            urlStr = urlStr.startsWith("http") ? urlStr : (getBaseUrl() + urlStr);
             return getInputStreamRaw(urlStr, progressMonitor);
         } finally {
             progressMonitor.invalidate();
         }
+    }
+
+    protected String getBaseUrl() {
+        return api.getBaseUrl();
     }