X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosMapOffline.java;h=e7edf3c043d0e1f7c33cc11ed2bb8717e0f5d0f0;hb=2ec7e14f0104e3a227ff566fa2fc1f6286ddd9d0;hp=bde80cfc99146b35c011b744282ffc35886bdd14;hpb=d81f94fd5339d513de9bde5a2e19f8eca526344f;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index bde80cfc..e7edf3c0 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -85,6 +85,8 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 	AltosMap		map;
 	AltosDroid		altos_droid;
 
+	static int scale = 2;
+
 	AltosLatLon	here;
 	AltosLatLon	there;
 	AltosLatLon	pad;
@@ -133,7 +135,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 			if (canvas.quickReject(pt.x, pt.y, pt.x + px_size, pt.y + px_size, Canvas.EdgeType.AA))
 				return;
 
-			AltosImage		altos_image = cache.get(this, store, px_size, px_size);
+			AltosImage		altos_image = this.get_image();
 
 			MapImage 		map_image = (MapImage) altos_image;
 
@@ -150,8 +152,8 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 				if (t.has_location()) {
 					String	message = null;
 					switch (status) {
-					case AltosMapTile.loading:
-						message = "Loading...";
+					case AltosMapTile.fetching:
+						message = "Fetching...";
 						break;
 					case AltosMapTile.bad_request:
 						message = "Internal error";
@@ -181,14 +183,14 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 			}
 		}
 
-		public MapTile(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 MapTile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size, int scale) {
+			super(cache, upper_left, center, zoom, maptype, px_size, scale);
 		}
 
 	}
 
-	public AltosMapTile new_tile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
-		return new MapTile(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, int scale) {
+		return new MapTile(cache, upper_left, center, zoom, maptype, px_size, scale);
 	}
 
 	public AltosMapPath new_path() {
@@ -492,7 +494,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 
 	public void onCreateView(AltosDroid altos_droid) {
 		this.altos_droid = altos_droid;
-		map = new AltosMap(this);
+		map = new AltosMap(this, scale);
 		AltosPreferences.register_map_type_listener(this);
 		map.set_maptype(AltosPreferences.map_type());