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

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/gui

Files:

• MapView.java (modified) (4 diffs)
• NavigatableComponent.java (modified) (6 diffs)
• download/BookmarkSelection.java (modified) (4 diffs)
• download/BoundingBoxSelection.java (modified) (6 diffs)
• download/DownloadDialog.java (modified) (9 diffs)
• download/PlaceSelection.java (modified) (3 diffs)
• download/SlippyMapChooser.java (modified) (5 diffs)
• download/TileSelection.java (modified) (4 diffs)
• layer/OsmDataLayer.java (modified) (1 diff)
• preferences/ProjectionPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -369 +369 @@
         tempG.setColor(Color.WHITE);
         Bounds b = getProjection().getWorldBoundsLatLon();
-        double lat = b.min.lat();
-        double lon = b.min.lon();
-
-        Point p = getPoint(b.min);
+        double lat = b.getMin().lat();
+        double lon = b.getMin().lon();
+
+        Point p = getPoint(b.getMin());
 
         GeneralPath path = new GeneralPath();
 
         path.moveTo(p.x, p.y);
-        double max = b.max.lat();
+        double max = b.getMax().lat();
         for(; lat <= max; lat += 1.0)
         {
@@ -383 +383 @@
             path.lineTo(p.x, p.y);
         }
-        lat = max; max = b.max.lon();
+        lat = max; max = b.getMax().lon();
         for(; lon <= max; lon += 1.0)
         {
@@ -389 +389 @@
             path.lineTo(p.x, p.y);
         }
-        lon = max; max = b.min.lat();
+        lon = max; max = b.getMin().lat();
         for(; lat >= max; lat -= 1.0)
         {
@@ -395 +395 @@
             path.lineTo(p.x, p.y);
         }
-        lat = max; max = b.min.lon();
+        lat = max; max = b.getMin().lon();
         for(; lon >= max; lon -= 1.0)
         {

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -60 +60 @@
     private EastNorth calculateDefaultCenter() {
         Bounds b = Main.proj.getWorldBoundsLatLon();
-        double lat = (b.max.lat() + b.min.lat())/2;
-        double lon = (b.max.lon() + b.min.lon())/2;
+        double lat = (b.getMax().lat() + b.getMin().lat())/2;
+        double lon = (b.getMax().lon() + b.getMin().lon())/2;
 
         return Main.proj.latlon2eastNorth(new LatLon(lat, lon));
@@ -128 +128 @@
     public ProjectionBounds getMaxProjectionBounds() {
         Bounds b = getProjection().getWorldBoundsLatLon();
-        return new ProjectionBounds(getProjection().latlon2eastNorth(b.min),
-                getProjection().latlon2eastNorth(b.max));
+        return new ProjectionBounds(getProjection().latlon2eastNorth(b.getMin()),
+                getProjection().latlon2eastNorth(b.getMax()));
     }
 
@@ -193 +193 @@
         double lat = cl.lat();
         double lon = cl.lon();
-        if(lat < b.min.lat()) {changed = true; lat = b.min.lat(); }
-        else if(lat > b.max.lat()) {changed = true; lat = b.max.lat(); }
-        if(lon < b.min.lon()) {changed = true; lon = b.min.lon(); }
-        else if(lon > b.max.lon()) {changed = true; lon = b.max.lon(); }
+        if(lat < b.getMin().lat()) {changed = true; lat = b.getMin().lat(); }
+        else if(lat > b.getMax().lat()) {changed = true; lat = b.getMax().lat(); }
+        if(lon < b.getMin().lon()) {changed = true; lon = b.getMin().lon(); }
+        else if(lon > b.getMax().lon()) {changed = true; lon = b.getMax().lon(); }
         if(changed) {
             newCenter = new CachedLatLon(lat, lon).getEastNorth();
@@ -209 +209 @@
         int width = getWidth()/2;
         int height = getHeight()/2;
-        LatLon l1 = new LatLon(b.min.lat(), lon);
-        LatLon l2 = new LatLon(b.max.lat(), lon);
+        LatLon l1 = new LatLon(b.getMin().lat(), lon);
+        LatLon l2 = new LatLon(b.getMax().lat(), lon);
         EastNorth e1 = getProjection().latlon2eastNorth(l1);
         EastNorth e2 = getProjection().latlon2eastNorth(l2);
@@ -217 +217 @@
         {
             double newScaleH = d/height;
-            e1 = getProjection().latlon2eastNorth(new LatLon(lat, b.min.lon()));
-            e2 = getProjection().latlon2eastNorth(new LatLon(lat, b.max.lon()));
+            e1 = getProjection().latlon2eastNorth(new LatLon(lat, b.getMin().lon()));
+            e2 = getProjection().latlon2eastNorth(new LatLon(lat, b.getMax().lon()));
             d = e2.east() - e1.east();
             if(d < width*newScale) {
@@ -292 +292 @@
 
     public void zoomTo(Bounds box) {
-        zoomTo(new ProjectionBounds(getProjection().latlon2eastNorth(box.min),
-                getProjection().latlon2eastNorth(box.max)));
+        zoomTo(new ProjectionBounds(getProjection().latlon2eastNorth(box.getMin()),
+                getProjection().latlon2eastNorth(box.getMax())));
     }
 

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

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 
 import javax.swing.DefaultListModel;
@@ -42 +39 @@
 
         JPanel dlg = new JPanel(new GridBagLayout());
-        gui.tabpane.addTab(tr("Bookmarks"), dlg);
+        gui.addDownloadAreaSelector(dlg, tr("Bookmarks"));
 
         bookmarks = new BookmarkList();
@@ -49 +46 @@
                 Preferences.Bookmark b = (Preferences.Bookmark)bookmarks.getSelectedValue();
                 if (b != null) {
-                    gui.minlat = b.latlon[0];
-                    gui.minlon = b.latlon[1];
-                    gui.maxlat = b.latlon[2];
-                    gui.maxlon = b.latlon[3];
-                    gui.boundingBoxChanged(BookmarkSelection.this);
+                    gui.boundingBoxChanged(b.asBounds(),BookmarkSelection.this);
                 }
             }
@@ -108 +101 @@
 
     public void boundingBoxChanged(DownloadDialog gui) {
-        tempBookmark = new Preferences.Bookmark();
-        tempBookmark.latlon[0] = gui.minlat;
-        tempBookmark.latlon[1] = gui.minlon;
-        tempBookmark.latlon[2] = gui.maxlat;
-        tempBookmark.latlon[3] = gui.maxlon;
+        tempBookmark = new Preferences.Bookmark(gui.getSelectedDownloadArea());
         bookmarks.clearSelection();
     }

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

@@ -9 +9 @@
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 
 import javax.swing.JLabel;
@@ -56 +54 @@
                             double maxlat = Double.parseDouble(latlon[2].getText());
                             double maxlon = Double.parseDouble(latlon[3].getText());
-                            if (minlat != gui.minlat || minlon != gui.minlon || maxlat != gui.maxlat || maxlon != gui.maxlon) {
-                                gui.minlat = minlat; gui.minlon = minlon;
-                                gui.maxlat = maxlat; gui.maxlon = maxlon;
-                                gui.boundingBoxChanged(BoundingBoxSelection.this);
+                            Bounds b = new Bounds(minlat,minlon, maxlat,maxlon);
+                            if (gui.getSelectedDownloadArea() == null) return;
+                            if (gui.getSelectedDownloadArea() == null || !gui.getSelectedDownloadArea().equals(new Bounds(minlat,minlon, maxlat,maxlon))) {
+                                gui.boundingBoxChanged(b, BoundingBoxSelection.this);
                             }
                         } catch (NumberFormatException x) {
@@ -119 +117 @@
         });
 
-        gui.tabpane.addTab(tr("Bounding Box"), dlg);
+        gui.addDownloadAreaSelector(dlg, tr("Bounding Box"));
     }
 
@@ -132 +130 @@
     private boolean parseURL(DownloadDialog gui) {
         Bounds b = OsmUrlToBounds.parse(osmUrl.getText());
-        if(b == null) return false;
-        gui.minlon = b.min.lon();
-        gui.minlat = b.min.lat();
-        gui.maxlon = b.max.lon();
-        gui.maxlat = b.max.lat();
-        gui.boundingBoxChanged(BoundingBoxSelection.this);
+        if(b == null) return false;        
+        gui.boundingBoxChanged(b,BoundingBoxSelection.this);
         updateBboxFields(gui);
         updateUrl(gui);
@@ -144 +138 @@
 
     private void updateBboxFields(DownloadDialog gui) {
-        latlon[0].setText(Double.toString(gui.minlat));
-        latlon[1].setText(Double.toString(gui.minlon));
-        latlon[2].setText(Double.toString(gui.maxlat));
-        latlon[3].setText(Double.toString(gui.maxlon));
+        Bounds b = gui.getSelectedDownloadArea();
+        if (b == null) return;
+        latlon[0].setText(Double.toString(b.getMin().lat()));
+        latlon[1].setText(Double.toString(b.getMin().lon()));
+        latlon[2].setText(Double.toString(b.getMax().lat()));
+        latlon[3].setText(Double.toString(b.getMax().lon()));
         for (JTextField f : latlon) {
             f.setCaretPosition(0);
@@ -154 +150 @@
 
     private void updateUrl(DownloadDialog gui) {
-        showUrl.setText(OsmUrlToBounds.getURL(new Bounds(
-                new LatLon(gui.minlat, gui.minlon), new LatLon(gui.maxlat, gui.maxlon))));
+        if (gui.getSelectedDownloadArea() == null) return;
+        showUrl.setText(OsmUrlToBounds.getURL(gui.getSelectedDownloadArea()));
     }
 }

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

@@ -15 +15 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -24 +25 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.DownloadAction;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.tools.GBC;
@@ -46 +42 @@
  */
 public class DownloadDialog extends JPanel {
-
-    /**
-     * The list of download tasks. First entry should be the osm data entry
-     * and the second the gps entry. After that, plugins can register additional
-     * download possibilities.
-     */
-    public final List<DownloadTask> downloadTasks = new ArrayList<DownloadTask>(5);
-
-    public final List<DownloadSelection> downloadSelections = new ArrayList<DownloadSelection>();
-    public final JTabbedPane tabpane = new JTabbedPane();
-    public final JCheckBox newLayer;
-    public final JLabel sizeCheck = new JLabel();
-
-    public double minlon;
-    public double minlat;
-    public double maxlon;
-    public double maxlat;
+    static private final Logger logger = Logger.getLogger(DownloadDialog.class.getName());
+
+    private final List<DownloadSelection> downloadSelections = new ArrayList<DownloadSelection>();
+    private final JTabbedPane tpDownloadAreaSelectors = new JTabbedPane();
+    private final JCheckBox cbNewLayer;
+    private final JLabel sizeCheck = new JLabel();
+
+    private Bounds currentBounds = null;
+
+    private JCheckBox cbDownloadOsmData = new JCheckBox(tr("OpenStreetMap data"), true);
+    private JCheckBox cbDownloadGpxData = new JCheckBox(tr("Raw GPS data"));
 
 
@@ -68 +58 @@
         setLayout(new GridBagLayout());
 
-        downloadTasks.add(new DownloadOsmTask());
-        downloadTasks.add(new DownloadGpsTask());
-
         // adding the download tasks
         add(new JLabel(tr("Data Sources and Types")), GBC.eol().insets(0,5,0,0));
-        for (DownloadTask task : downloadTasks) {
-            add(task.getCheckBox(), GBC.eol().insets(20,0,0,0));
-            // don't override defaults, if we (initially) don't have any preferences
-            if(Main.pref.hasKey("download."+task.getPreferencesSuffix())) {
-                task.getCheckBox().setSelected(Main.pref.getBoolean("download."+task.getPreferencesSuffix()));
-            }
-        }
-
+        add(cbDownloadOsmData,  GBC.eol().insets(20,0,0,0));
+        add(cbDownloadGpxData,  GBC.eol().insets(20,0,0,0));
+        
         // predefined download selections
         downloadSelections.add(new SlippyMapChooser());
@@ -97 +79 @@
             s.addGui(this);
         }
-
-        if (Main.map != null) {
-            MapView mv = Main.map.mapView;
-            minlon = mv.getLatLon(0, mv.getHeight()).lon();
-            minlat = mv.getLatLon(0, mv.getHeight()).lat();
-            maxlon = mv.getLatLon(mv.getWidth(), 0).lon();
-            maxlat = mv.getLatLon(mv.getWidth(), 0).lat();
-            boundingBoxChanged(null);
-        }
-        else if (Main.pref.hasKey("osm-download.bounds")) {
-            // read the bounding box from the preferences
-            try {
-                String bounds[] = Main.pref.get("osm-download.bounds").split(";");
-                minlat = Double.parseDouble(bounds[0]);
-                minlon = Double.parseDouble(bounds[1]);
-                maxlat = Double.parseDouble(bounds[2]);
-                maxlon = Double.parseDouble(bounds[3]);
-                boundingBoxChanged(null);
-            }
-            catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        newLayer = new JCheckBox(tr("Download as new layer"), Main.pref.getBoolean("download.newlayer", false));
-        add(newLayer, GBC.eol().insets(0,5,0,0));
+   
+        cbNewLayer = new JCheckBox(tr("Download as new layer"));
+        add(cbNewLayer, GBC.eol().insets(0,5,0,0));
 
         add(new JLabel(tr("Download Area")), GBC.eol().insets(0,5,0,0));
-        add(tabpane, GBC.eol().fill());
+        add(tpDownloadAreaSelectors, GBC.eol().fill());
 
         try {
-            tabpane.setSelectedIndex(Main.pref.getInteger("download.tab", 0));
+            tpDownloadAreaSelectors.setSelectedIndex(Main.pref.getInteger("download.tab", 0));
         } catch (Exception ex) {
             Main.pref.putInteger("download.tab", 0);
@@ -145 +104 @@
             }
         });
+        
+        restoreSettings();
     }
 
@@ -163 +124 @@
         Bounds b = OsmUrlToBounds.parse(result);
         if (b != null) {
-            minlon = b.min.lon();
-            minlat = b.min.lat();
-            maxlon = b.max.lon();
-            maxlat = b.max.lat();
-            boundingBoxChanged(null);
+            boundingBoxChanged(new Bounds(b),null);
         }
     }
 
     private void updateSizeCheck() {
-        if ((maxlon-minlon)*(maxlat-minlat) > Main.pref.getDouble("osm-server.max-request-area", 0.25)) {
+        if (currentBounds == null) {
+            sizeCheck.setText(tr("No area selected yet"));
+            sizeCheck.setForeground(Color.darkGray);
+        } else if (currentBounds.getArea() > Main.pref.getDouble("osm-server.max-request-area", 0.25)) {
             sizeCheck.setText(tr("Download area too large; will probably be rejected by server"));
             sizeCheck.setForeground(Color.red);
@@ -188 +148 @@
      * @param eventSource - the DownloadSelection object that fired this notification.
      */
-    public void boundingBoxChanged(DownloadSelection eventSource) {
+    public void boundingBoxChanged(Bounds b, DownloadSelection eventSource) {
+        this.currentBounds = b;
         for (DownloadSelection s : downloadSelections) {
             if (s != eventSource) {
@@ -196 +157 @@
         updateSizeCheck();
     }
-
-    /*
-     * Returns currently selected tab.
-     */
-    public int getSelectedTab() {
-        return tabpane.getSelectedIndex();
-    }
+    
+    /**
+     * Replies true if the user selected to download OSM data
+     * 
+     * @return true if the user selected to download OSM data
+     */
+    public boolean isDownloadOsmData() {
+        return cbDownloadOsmData.isSelected();
+    }
+    
+    /**
+     * Replies true if the user selected to download GPX data
+     * 
+     * @return true if the user selected to download GPX data
+     */
+    public boolean isDownloadGpxData() {
+        return cbDownloadGpxData.isSelected();
+    }
+    
+    /**
+     * Replies true if the user requires to download into a new layer 
+     * 
+     * @return true if the user requires to download into a new layer 
+     */
+    public boolean isNewLayerRequired() {
+        return cbNewLayer.isSelected();
+    }
+    
+    /**
+     * Adds a new download area selector to the download dialog
+     * 
+     * @param selector the download are selector 
+     * @param displayName the display name of the selector
+     */
+    public void addDownloadAreaSelector(JPanel selector, String displayName) {
+        tpDownloadAreaSelectors.add(displayName, selector);
+    }
+    
+    /**
+     * Remembers the current settings in the download dialog 
+     * 
+     */
+    public void rememberSettings() {
+        Main.pref.put("download.tab", Integer.toString(tpDownloadAreaSelectors.getSelectedIndex()));
+        Main.pref.put("download.osm", cbDownloadOsmData.isSelected());
+        Main.pref.put("download.gps", cbDownloadGpxData.isSelected());
+        Main.pref.put("download.newlayer", cbNewLayer.isSelected());
+        if (currentBounds != null) {
+            Main.pref.put("osm-download.bounds", currentBounds.encodeAsString(";"));
+        }
+    }
+    
+    public void restoreSettings() {
+        cbDownloadOsmData.setSelected(Main.pref.getBoolean("download.osm", true));
+        cbDownloadGpxData.setSelected(Main.pref.getBoolean("download.gps", false));
+        cbNewLayer.setSelected(Main.pref.getBoolean("download.newlayer", false));
+        int idx = Main.pref.getInteger("download.tab", 0);
+        if (idx < 0 || idx > tpDownloadAreaSelectors.getTabCount()) {
+            idx = 0;
+        }
+        tpDownloadAreaSelectors.setSelectedIndex(idx);
+        
+        if (Main.map != null) {
+            MapView mv = Main.map.mapView;
+            currentBounds = new Bounds(
+                    mv.getLatLon(0, mv.getHeight()),
+                    mv.getLatLon(mv.getWidth(), 0)                    
+                    );
+            boundingBoxChanged(currentBounds,null);
+        }
+        else if (Main.pref.hasKey("osm-download.bounds")) {
+            // read the bounding box from the preferences
+            try {
+                currentBounds = new Bounds(Main.pref.get("osm-download.bounds"), ";");
+                boundingBoxChanged(currentBounds,null);
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    
+    /**
+     * Replies the currently selected download area. May be null, if no download area is selected
+     * yet.
+     */
+    public Bounds getSelectedDownloadArea() {
+        return currentBounds;
+    }
+    
 }

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

@@ -32 +32 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.GBC;
 import org.xml.sax.Attributes;
@@ -224 +226 @@
         scrollPane.setPreferredSize(new Dimension(200,200));
         panel.add(scrollPane, c);
-        gui.tabpane.add(panel, tr("Places"));
+        gui.addDownloadAreaSelector(panel, tr("Places"));
 
         scrollPane.setPreferredSize(scrollPane.getPreferredSize());
@@ -298 +300 @@
                 {
                     double size = 180.0 / Math.pow(2, r.zoom);
-                    gui.minlat = r.lat - size / 2;
-                    gui.maxlat = r.lat + size / 2;
-                    gui.minlon = r.lon - size;
-                    gui.maxlon = r.lon + size;
+                    Bounds b = new Bounds(
+                        new LatLon(
+                            r.lat - size / 2,
+                            r.lat + size / 2
+                         ),
+                         new LatLon(
+                            r.lon - size,
+                            r.lon + size
+                         )
+                    );
                     updatingSelf = true;
-                    gui.boundingBoxChanged(null);
+                    gui.boundingBoxChanged(b,null);
                     updatingSelf = false;
                 }

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

@@ -30 +30 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
@@ -120 +122 @@
         String labelText = tr("<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down "
                 + "<b>Move map:</b> Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> Hold left mousebutton and draw a frame.");
-        slipyyMapTabPanel.add(new JLabel("<html>" + labelText + "</html>"), BorderLayout.SOUTH);
-        iGui.tabpane.add(slipyyMapTabPanel, tr("Slippy map"));
+        slipyyMapTabPanel.add(new JLabel("<html>" + labelText + "</html>"), BorderLayout.SOUTH);        
+        iGui.addDownloadAreaSelector(slipyyMapTabPanel, tr("Slippy map"));
         new OsmMapControl(this, slipyyMapTabPanel, iSizeButton, iSourceButton);
     }
@@ -165 +167 @@
 
     public void boundingBoxChanged(DownloadDialog gui) {
-
+        Bounds b = gui.getSelectedDownloadArea();
+        if (b == null)
+            return;
+        
         // test if a bounding box has been set set
-        if (gui.minlat == 0.0 && gui.minlon == 0.0 && gui.maxlat == 0.0 && gui.maxlon == 0.0)
+        if (b.getMin().lat() == 0.0 && b.getMin().lon() == 0.0 && b.getMax().lat() == 0.0 && b.getMax().lon() == 0.0)
             return;
 
-        int y1 = OsmMercator.LatToY(gui.minlat, MAX_ZOOM);
-        int y2 = OsmMercator.LatToY(gui.maxlat, MAX_ZOOM);
-        int x1 = OsmMercator.LonToX(gui.minlon, MAX_ZOOM);
-        int x2 = OsmMercator.LonToX(gui.maxlon, MAX_ZOOM);
+        int y1 = OsmMercator.LatToY(b.getMin().lat(), MAX_ZOOM);
+        int y2 = OsmMercator.LatToY(b.getMax().lat(), MAX_ZOOM);
+        int x1 = OsmMercator.LonToX(b.getMin().lon(), MAX_ZOOM);
+        int x2 = OsmMercator.LonToX(b.getMax().lon(), MAX_ZOOM);
 
         iSelectionRectStart = new Point(Math.min(x1, x2), Math.min(y1, y2));
@@ -179 +184 @@
 
         // calc the screen coordinates for the new selection rectangle
-        MapMarkerDot xmin_ymin = new MapMarkerDot(gui.minlat, gui.minlon);
-        MapMarkerDot xmax_ymax = new MapMarkerDot(gui.maxlat, gui.maxlon);
+        MapMarkerDot xmin_ymin = new MapMarkerDot(b.getMin());
+        MapMarkerDot xmax_ymax = new MapMarkerDot(b.getMax());
 
         Vector<MapMarker> marker = new Vector<MapMarker>(2);
@@ -218 +223 @@
         Coordinate l1 = getPosition(p_max);
         Coordinate l2 = getPosition(p_min);
-        iGui.minlon = Math.min(l2.getLon(), l1.getLon());
-        iGui.minlat = Math.min(l1.getLat(), l2.getLat());
-        iGui.maxlon = Math.max(l2.getLon(), l1.getLon());
-        iGui.maxlat = Math.max(l1.getLat(), l2.getLat());
-
-        iGui.boundingBoxChanged(this);
+        Bounds b = new Bounds(
+                new LatLon(
+                        Math.min(l2.getLat(), l1.getLat()), 
+                        Math.min(l1.getLon(), l2.getLon())
+                        ),
+                new LatLon(
+                        Math.max(l2.getLat(), l1.getLat()), 
+                        Math.max(l1.getLon(), l2.getLon()))
+                );
+        iGui.boundingBoxChanged(b, this);
         repaint();
     }

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

@@ -16 +16 @@
 import javax.swing.SpinnerNumberModel;
 
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.GBC;
 /**
@@ -65 +67 @@
                     if (toy<fromy) { int i = fromy; fromy=toy; toy=i; }
 
-                    gui.minlat = tileYToLat(zoomlvl, toy+1);
-                    gui.minlon = tileXToLon(zoomlvl, fromx);
-                    gui.maxlat = tileYToLat(zoomlvl, fromy);
-                    gui.maxlon = tileXToLon(zoomlvl, tox+1);
-                    gui.boundingBoxChanged(TileSelection.this);
+                    Bounds b = new Bounds(
+                            new LatLon(tileYToLat(zoomlvl, toy + 1), tileXToLon(zoomlvl, fromx)),
+                            new LatLon(tileYToLat(zoomlvl, fromy), tileXToLon(zoomlvl, tox + 1))
+                            );
+                    gui.boundingBoxChanged(b, TileSelection.this);
                     //repaint();
                 } catch (NumberFormatException x) {
@@ -82 +84 @@
         }
 
-        gui.tabpane.addTab(tr("Tile Numbers"), smpanel);
+        gui.addDownloadAreaSelector(smpanel, tr("Tile Numbers"));
     }
 
@@ -94 +96 @@
     private void updateBboxFields(DownloadDialog gui) {
         int z = ((Integer) tileZ.getValue()).intValue();
-        tileX0.setText(Integer.toString(lonToTileX(z, gui.minlon)));
-        tileX1.setText(Integer.toString(lonToTileX(z, gui.maxlon-.00001)));
-        tileY0.setText(Integer.toString(latToTileY(z, gui.maxlat-.00001)));
-        tileY1.setText(Integer.toString(latToTileY(z, gui.minlat)));
+        Bounds b = gui.getSelectedDownloadArea();
+        if (b == null)
+            return;
+        tileX0.setText(Integer.toString(lonToTileX(z, b.getMin().lon())));
+        tileX1.setText(Integer.toString(lonToTileX(z, b.getMax().lon()-.00001)));
+        tileY0.setText(Integer.toString(latToTileY(z, b.getMax().lat()-.00001)));
+        tileY1.setText(Integer.toString(latToTileY(z, b.getMin().lat())));
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -226 +226 @@
             // now succesively subtract downloaded areas
             for (DataSource src : data.dataSources) {
-                if (src.bounds != null && !src.bounds.min.equals(src.bounds.max)) {
-                    EastNorth en1 = mv.getProjection().latlon2eastNorth(src.bounds.min);
-                    EastNorth en2 = mv.getProjection().latlon2eastNorth(src.bounds.max);
+                if (src.bounds != null && !src.bounds.getMin().equals(src.bounds.getMax())) {
+                    EastNorth en1 = mv.getProjection().latlon2eastNorth(src.bounds.getMin());
+                    EastNorth en2 = mv.getProjection().latlon2eastNorth(src.bounds.getMax());
                     Point p1 = mv.getPoint(en1);
                     Point p2 = mv.getPoint(en2);

trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java

@@ -97 +97 @@
         Bounds b = Main.proj.getWorldBoundsLatLon();
         CoordinateFormat cf = CoordinateFormat.getDefaultFormat();
-        bounds.setText(b.min.latToString(cf)+"; "+b.min.lonToString(cf)+" : "+b.max.latToString(cf)+"; "+b.max.lonToString(cf));
+        bounds.setText(b.getMin().latToString(cf)+"; "+b.getMin().lonToString(cf)+" : "+b.getMax().latToString(cf)+"; "+b.getMax().lonToString(cf));
         /* TODO: Fix bugs, refresh code line and world bounds, fix design (e.g. add border around sub-prefs-stuff */
     }