X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosSiteMap.java;h=23085f3ec5e270645b8c44760c34fb9202d61271;hp=144d506df3fc428bf49d556788282905e1fe2e3e;hb=3876b5bfad383119339aea51e2cf301012a1f991;hpb=cf03ab3383b679e6617e8ab7004be91e5a727562

diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index 144d506d..23085f3e 100644
--- a/altosui/AltosSiteMap.java
+++ b/altosui/AltosSiteMap.java
@@ -23,8 +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.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 	// preferred vertical step in a tile in naut. miles
@@ -220,6 +220,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);
@@ -264,7 +274,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 		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)
 			return;
@@ -294,7 +304,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;
@@ -307,9 +317,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);
@@ -322,6 +331,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);
 
@@ -354,8 +379,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);
 			}
 		}
 	}