X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosMapOffline.java;h=1aebcd3656fbfd62fc837354b1655fecc1d1a08f;hb=4a257455b2dc57069c41e1845daf66239c5cbe1d;hp=ff9d0a77d5a4b552a348e0ddb2190955b7c6c461;hpb=21d176f161b90f18f236ef887cef9676d712eee3;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index ff9d0a77..1aebcd36 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +21,7 @@ package org.altusmetrum.AltosDroid;
 import java.util.*;
 import java.io.*;
 
-import org.altusmetrum.altoslib_10.*;
+import org.altusmetrum.altoslib_13.*;
 
 import android.app.Activity;
 import android.graphics.*;
@@ -79,12 +80,14 @@ class Rocket implements Comparable {
 	}
 }
 
-public class AltosMapOffline extends View implements ScaleGestureDetector.OnScaleGestureListener, AltosMapInterface, AltosDroidMapInterface {
+public class AltosMapOffline extends View implements ScaleGestureDetector.OnScaleGestureListener, AltosMapInterface, AltosDroidMapInterface, AltosMapTypeListener {
 	ScaleGestureDetector	scale_detector;
 	boolean			scaling;
 	AltosMap		map;
 	AltosDroid		altos_droid;
 
+	static int scale = 1;
+
 	AltosLatLon	here;
 	AltosLatLon	there;
 	AltosLatLon	pad;
@@ -133,7 +136,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,17 +153,17 @@ 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";
 						break;
 					case AltosMapTile.failed:
-						message = "Network error, check connection";
+						message = "Network error";
 						break;
 					case AltosMapTile.forbidden:
-						message = "Too many requests, try later";
+						message = "Outside of known launch areas";
 						break;
 					}
 					if (message != null) {
@@ -181,14 +184,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() {
@@ -441,6 +444,8 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 	}
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+		boolean	changed = false;
+
 		if (state != null) {
 			map.show(state, null);
 			if (state.pad_lat != AltosLib.MISSING && pad == null)
@@ -471,22 +476,28 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 				if (t_state.gps != null) {
 					AltosLatLon	latlon = new AltosLatLon(t_state.gps.lat, t_state.gps.lon);
 					rocket.set_position(latlon, t_state.received_time);
-					if (state.serial == serial)
+					if (state.cal_data().serial == serial)
 						there = latlon;
 				}
 				if (state != null)
-					rocket.set_active(state.serial == serial);
+					rocket.set_active(state.cal_data().serial == serial);
 			}
 		}
 		if (receiver != null) {
-			here = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
+			AltosLatLon new_here = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
+			if (!new_here.equals(here)) {
+				here = new_here;
+				AltosDebug.debug("Location changed, redraw");
+				repaint();
+			}
 		}
 	}
 
 	public void onCreateView(AltosDroid altos_droid) {
 		this.altos_droid = altos_droid;
-		map = new AltosMap(this);
-		map.set_maptype(altos_droid.map_type);
+		map = new AltosMap(this, scale);
+		AltosPreferences.register_map_type_listener(this);
+		map.set_maptype(AltosPreferences.map_type());
 
 		pad_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.pad);
 		/* arrow at the bottom of the launchpad image */
@@ -504,7 +515,11 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 		here_off_y = here_bitmap.getHeight() / 2;
 	}
 
-	public void set_map_type(int map_type) {
+	public void onDestroyView() {
+		AltosPreferences.unregister_map_type_listener(this);
+	}
+
+	public void map_type_changed(int map_type) {
 		if (map != null)
 			map.set_maptype(map_type);
 	}