X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosMapOffline.java;h=5240d61ce75476ce4942889f1dcf3aed35d064b4;hp=12dd2f252c74e9130f6224006511fe762c52e1cd;hb=06908e377b7b932bfe3f6dfc840a0a13340f32ce;hpb=0f56903774d9e8bb033dfc0af6945e8ddc1d3065

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index 12dd2f25..5240d61c 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -86,6 +86,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 	AltosDroid		altos_droid;
 
 	AltosLatLon	here;
+	AltosLatLon	there;
 	AltosLatLon	pad;
 
 	Canvas	canvas;
@@ -334,7 +335,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 	}
 
 	private void draw_positions() {
-		line.set_a(map.last_position);
+		line.set_a(there);
 		line.set_b(here);
 		line.paint();
 		draw_bitmap(pad, pad_bitmap, pad_off_x, pad_off_y);
@@ -423,7 +424,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 	double	mapAccuracy;
 
 	public void center(double lat, double lon, double accuracy) {
-		if (mapAccuracy < 0 || accuracy < mapAccuracy/10) {
+		if (mapAccuracy <= 0 || accuracy < mapAccuracy/10 || (map != null && !map.has_centre())) {
 			if (map != null)
 				map.maybe_centre(lat, lon);
 			mapAccuracy = accuracy;
@@ -465,8 +466,12 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 					rocket = new Rocket(serial, this);
 					rockets.put(serial, rocket);
 				}
-				if (t_state.gps != null)
-					rocket.set_position(new AltosLatLon(t_state.gps.lat, t_state.gps.lon), t_state.received_time);
+				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)
+						there = latlon;
+				}
 				if (state != null)
 					rocket.set_active(state.serial == serial);
 			}