X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIMapPreloadNew.java;h=b16659da5b79f6fb1854dde89cef1d50cec503ab;hb=97adfff4cfb67c17a96f3ff46606b4e439422b01;hp=cce07ab41a9a266a9ed79359514ede9e536f0bd5;hpb=60f4d69592c440ab7bb67a04f4c07fc7279d2c20;p=fw%2Faltos

diff --git a/altosuilib/AltosUIMapPreloadNew.java b/altosuilib/AltosUIMapPreloadNew.java
index cce07ab4..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;
@@ -131,7 +131,6 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 	JComboBox<AltosLaunchSite>	site_list;
 
 	JToggleButton	load_button;
-	boolean		loading;
 	JButton		close_button;
 
 	JCheckBox[]	maptypes = new JCheckBox[AltosMap.maptype_terrain - AltosMap.maptype_hybrid + 1];
@@ -139,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 };
 
@@ -147,14 +147,19 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 	Double[]	radius_km = { 2.0, 5.0, 10.0, 20.0, 30.0 };
 	Double		radius_def_km = 10.0;
 
+	AltosMapLoader	loader;
 
 	static final String[]	lat_hemi_names = { "N", "S" };
 	static final String[]	lon_hemi_names = { "E", "W" };
 
 	double	latitude, longitude;
 
+	long	loader_notify_time;
+
 	/* AltosMapLoaderListener interfaces */
 	public void loader_start(final int max) {
+		loader_notify_time = System.currentTimeMillis();
+
 		SwingUtilities.invokeLater(new Runnable() {
 				public void run() {
 					pbar.setMaximum(max);
@@ -167,6 +172,13 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 	}
 
 	public void loader_notify(final int cur, final int max, final String name) {
+		long	now = System.currentTimeMillis();
+
+		if (now - loader_notify_time < 100)
+			return;
+
+		loader_notify_time = now;
+
 		SwingUtilities.invokeLater(new Runnable() {
 				public void run() {
 					pbar.setValue(cur);
@@ -176,12 +188,12 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 	}
 
 	public void loader_done(int max) {
+		loader = null;
 		SwingUtilities.invokeLater(new Runnable() {
 				public void run() {
 					pbar.setValue(0);
 					pbar.setString("");
 					load_button.setSelected(false);
-					loading = false;
 				}
 			});
 	}
@@ -216,11 +228,14 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 	public void actionPerformed(ActionEvent e) {
 		String	cmd = e.getActionCommand();
 
-		if (cmd.equals("close"))
+		if (cmd.equals("close")) {
+			if (loader != null)
+				loader.abort();
 			setVisible(false);
+		}
 
 		if (cmd.equals("load")) {
-			if (!loading) {
+			if (loader == null) {
 				try {
 					latitude = lat.get_value();
 					longitude = lon.get_value();
@@ -234,11 +249,13 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 						r = AltosConvert.miles_to_meters(r);
 					else
 						r = r * 1000;
-					loading = true;
 
-					new AltosMapLoader(map.map, this,
-							   latitude, longitude,
-							   min_z, max_z, r, all_types());
+					map.map.centre(new AltosLatLon(latitude, longitude));
+
+					loader = new AltosMapLoader(this,
+								    latitude, longitude,
+								    min_z, max_z, r,
+								    all_types(), scale);
 
 				} catch (ParseException pe) {
 					load_button.setSelected(false);