X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FPreloadMapActivity.java;h=11d712806570ad4b7e0a74dc0f13f701735469f8;hb=895cb58a6cd7424ee63c24d791b5988f41f85d31;hp=87f03a92f30a84c3328d6e7762de56f19d2c93ae;hpb=21d176f161b90f18f236ef887cef9676d712eee3;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
index 87f03a92..11d71280 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
@@ -69,8 +69,14 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 
 	private ProgressBar	progress;
 
+	private AltosMapLoader	loader;
+
+	long	loader_notify_time;
+
 	/* AltosMapLoaderListener interfaces */
 	public void loader_start(final int max) {
+		loader_notify_time = System.currentTimeMillis();
+
 		this.runOnUiThread(new Runnable() {
 				public void run() {
 					progress.setMax(max);
@@ -80,6 +86,13 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 	}
 
 	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;
+
 		this.runOnUiThread(new Runnable() {
 				public void run() {
 					progress.setProgress(cur);
@@ -88,6 +101,7 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 	}
 
 	public void loader_done(int max) {
+		loader = null;
 		this.runOnUiThread(new Runnable() {
 				public void run() {
 					progress.setProgress(0);
@@ -107,7 +121,6 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 	}
 
 	AltosMap	map;
-	AltosMapLoader	loader;
 
 	class PreloadMapImage implements AltosImage {
 		public void flush() {
@@ -137,14 +150,14 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 		public void paint(AltosMapTransform t) {
 		}
 
-		public PreloadMapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
-			super(listener, upper_left, center, zoom, maptype, px_size, 2);
+		public PreloadMapTile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+			super(cache, upper_left, center, zoom, maptype, px_size, 2);
 		}
 
 	}
 
-	public AltosMapTile new_tile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
-		return new PreloadMapTile(listener, upper_left, center, zoom, maptype, px_size);
+	public AltosMapTile new_tile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+		return new PreloadMapTile(cache, upper_left, center, zoom, maptype, px_size);
 	}
 
 	public int width() {
@@ -235,7 +248,7 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 	private double radius() {
 		double r = value_distance(radius);
 		if (AltosPreferences.imperial_units())
-			r = AltosConvert.distance.inverse(r);
+			r = AltosConvert.miles_to_meters(r);
 		else
 			r = r * 1000;
 		return r;
@@ -255,6 +268,9 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 	}
 
 	private void load() {
+		if (loader != null)
+			return;
+
 		try {
 			double	lat = latitude();
 			double	lon = longitude();
@@ -265,7 +281,7 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 
 			AltosDebug.debug("PreloadMap load %f %f %d %d %f %d\n",
 					 lat, lon, min, max, r, t);
-			loader.load(lat, lon, min, max, r, t);
+			loader = new AltosMapLoader(map, this, lat, lon, min, max, r, t);
 		} catch (ParseException e) {
 			AltosDebug.debug("PreloadMap load raised exception %s", e.toString());
 		}
@@ -398,8 +414,6 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 
 		map = new AltosMap(this);
 
-		loader = new AltosMapLoader(map, this);
-
 		// Listen for GPS and Network position updates
 		LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
 
@@ -412,6 +426,9 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 	protected void onDestroy() {
 		super.onDestroy();
 
+		if (loader != null)
+			loader.abort();
+
 		// Stop listening for location updates
 		((LocationManager) getSystemService(Context.LOCATION_SERVICE)).removeUpdates(this);
 	}