X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIMapPreloadNew.java;h=b16659da5b79f6fb1854dde89cef1d50cec503ab;hb=97adfff4cfb67c17a96f3ff46606b4e439422b01;hp=3e4a604fa80cd6356bb25a0b37cb6a25831aebaf;hpb=c5f49d0ac254047f13c6c1ecfb5520eff72109ac;p=fw%2Faltos diff --git a/altosuilib/AltosUIMapPreloadNew.java b/altosuilib/AltosUIMapPreloadNew.java index 3e4a604f..b16659da 100644 --- a/altosuilib/AltosUIMapPreloadNew.java +++ b/altosuilib/AltosUIMapPreloadNew.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altosuilib_10; +package org.altusmetrum.altosuilib_11; import java.awt.*; import java.awt.event.*; @@ -26,7 +26,7 @@ import java.text.*; import java.lang.Math; import java.net.URL; import java.net.URLConnection; -import org.altusmetrum.altoslib_10.*; +import org.altusmetrum.altoslib_11.*; class AltosUIMapPos extends Box { AltosUIFrame owner; @@ -138,6 +138,7 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener JComboBox min_zoom; JComboBox max_zoom; JComboBox 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);