X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosSiteMap.java;h=105afade192ed206b3fcde8f3c688231b4da3ba8;hp=4e939b885d5bf446352cb9688de5ae6273736652;hb=13cf4000bd53ac4af66231d56e24c9eb11178a5f;hpb=7f664da148ae15d46d179d8ecede6fc0bc710ffb

diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index 4e939b88..105afade 100644
--- a/altosui/AltosSiteMap.java
+++ b/altosui/AltosSiteMap.java
@@ -23,7 +23,8 @@ import java.io.*;
 import java.lang.Math;
 import java.awt.geom.Point2D;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 	// preferred vertical step in a tile in naut. miles
@@ -181,7 +182,9 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 		}
 	}
 
-	public static void prefetchMaps(double lat, double lng, int w, int h) {
+	public static void prefetchMaps(double lat, double lng) {
+		int w = AltosSiteMapPreload.width;
+		int h = AltosSiteMapPreload.height;
 		AltosSiteMap asm = new AltosSiteMap(true);
 		asm.centre = asm.getBaseLocation(lat, lng);
 
@@ -219,6 +222,16 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 		return pngfile.toString();
 	}
 
+	public void initAndFinishMapAsync (final AltosSiteMapTile tile, final Point offset) {
+		Thread thread = new Thread() {
+				public void run() {
+					initMap(offset);
+					finishTileLater(tile, offset);
+				}
+			};
+		thread.start();
+	}
+
 	public void setBaseLocation(double lat, double lng) {
 		for (Point k : mapTiles.keySet()) {
 			AltosSiteMapTile tile = mapTiles.get(k);
@@ -260,27 +273,34 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 	int last_state = -1;
 
 	public void show(double lat, double lon) {
-		initMaps(lat, lon);
-		scrollRocketToVisible(pt(lat, lon));
+		System.out.printf ("show %g %g\n", lat, lon);
+		return;
+//		initMaps(lat, lon);
+//		scrollRocketToVisible(pt(lat, lon));
 	}
-	public void show(final AltosState state, final int crc_errors) {
+	public void show(final AltosState state, final AltosListenerState listener_state) {
 		// if insufficient gps data, nothing to update
-		if (!state.gps.locked && state.gps.nsat < 4)
+		AltosGPS	gps = state.gps;
+
+		if (gps == null)
+			return;
+
+		if (!gps.locked && gps.nsat < 4)
 			return;
 
 		if (!initialised) {
-			if (state.pad_lat != 0 || state.pad_lon != 0) {
+			if (state.pad_lat != AltosLib.MISSING && state.pad_lon != AltosLib.MISSING) {
 				initMaps(state.pad_lat, state.pad_lon);
 				initialised = true;
-			} else if (state.gps.lat != 0 || state.gps.lon != 0) {
-				initMaps(state.gps.lat, state.gps.lon);
+			} else if (gps.lat != AltosLib.MISSING && gps.lon != AltosLib.MISSING) {
+				initMaps(gps.lat, gps.lon);
 				initialised = true;
 			} else {
 				return;
 			}
 		}
 
-		final Point2D.Double pt = pt(state.gps.lat, state.gps.lon);
+		final Point2D.Double pt = pt(gps.lat, gps.lon);
 		if (last_pt == pt && last_state == state.state)
 			return;
 
@@ -293,7 +313,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 			Point2D.Double ref, lref;
 			ref = translatePoint(pt, tileCoordOffset(offset));
 			lref = translatePoint(last_pt, tileCoordOffset(offset));
-			tile.show(state, crc_errors, lref, ref);
+			tile.show(state, listener_state, lref, ref);
 			if (0 <= ref.x && ref.x < px_size)
 				if (0 <= ref.y && ref.y < px_size)
 					in_any = true;
@@ -306,9 +326,8 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 			lref = translatePoint(last_pt, tileCoordOffset(offset));
 
 			AltosSiteMapTile tile = createTile(offset);
-			tile.show(state, crc_errors, lref, ref);
-			initMap(offset);
-			finishTileLater(tile, offset);
+			tile.show(state, listener_state, lref, ref);
+			initAndFinishMapAsync(tile, offset);
 		}
 
 		scrollRocketToVisible(pt);
@@ -321,6 +340,22 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 		last_state = state.state;
 	}
 
+	public void centre(Point2D.Double pt) {
+		Rectangle r = comp.getVisibleRect();
+		Point2D.Double copt = translatePoint(pt, tileCoordOffset(topleft));
+		int dx = (int)copt.x - r.width/2 - r.x;
+		int dy = (int)copt.y - r.height/2 - r.y;
+		r.x += dx;
+		r.y += dy;
+		comp.scrollRectToVisible(r);
+	}
+
+	public void centre(AltosState state) {
+		if (!state.gps.locked && state.gps.nsat < 4)
+			return;
+		centre(pt(state.gps.lat, state.gps.lon));
+	}
+
 	public void draw_circle(double lat, double lon) {
 		final Point2D.Double pt = pt(lat, lon);
 
@@ -353,8 +388,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 				if (mapTiles.containsKey(offset))
 					continue;
 				AltosSiteMapTile tile = createTile(offset);
-				initMap(offset);
-				finishTileLater(tile, offset);
+				initAndFinishMapAsync(tile, offset);
 			}
 		}
 	}