altoslib: Get rid of AltosMap from AltosMapLoader

[fw/altos] / altosuilib / AltosUIMapPreloadNew.java

diff --git a/altosuilib/AltosUIMapPreloadNew.java b/altosuilib/AltosUIMapPreloadNew.java
index 3e4a604fa80cd6356bb25a0b37cb6a25831aebaf..7cdba3824d6d3ec6889612f8ba95a0a6b947b6e4 100644 (file)
--- a/altosuilib/AltosUIMapPreloadNew.java
+++ b/altosuilib/AltosUIMapPreloadNew.java
@@ -138,6 +138,7 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
        JComboBox<Integer>      min_zoom;
        JComboBox<Integer>      max_zoom;
        JComboBox<Double>       radius;
+       int scale = 1;
 
        Integer[]               zooms = { -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6 };
 
@@ -249,9 +250,12 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
                                        else
                                                r = r * 1000;
 
-                                       loader = new AltosMapLoader(map.map, this,
+                                       map.map.centre(new AltosLatLon(latitude, longitude));
+
+                                       loader = new AltosMapLoader(this,
                                                                    latitude, longitude,
-                                                                   min_z, max_z, r, all_types());
+                                                                   min_z, max_z, r,
+                                                                   all_types(), scale);
 
                                } catch (ParseException pe) {
                                        load_button.setSelected(false);