X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosSiteMap.java;h=5bf02e546179fbf936cdfb05c263617bb4054b84;hb=25c01719f17be8da73a859867c14df0fc29b5441;hp=3ea4d0fd3548eb06bc296f35170739e7c0d22674;hpb=19243ecc9b5bbdcc069ae24acf1ca807322c84d8;p=fw%2Faltos

diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index 3ea4d0fd..5bf02e54 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_1.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 	// preferred vertical step in a tile in naut. miles
@@ -263,7 +264,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;
@@ -293,7 +294,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,7 +307,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 			lref = translatePoint(last_pt, tileCoordOffset(offset));
 
 			AltosSiteMapTile tile = createTile(offset);
-			tile.show(state, crc_errors, lref, ref);
+			tile.show(state, listener_state, lref, ref);
 			initMap(offset);
 			finishTileLater(tile, offset);
 		}
@@ -321,6 +322,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);
 
@@ -421,7 +438,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 	public AltosSiteMap(int in_radius) {
 		radius = in_radius;
 
-		//GrabNDrag scroller = new GrabNDrag(comp);
+		GrabNDrag scroller = new GrabNDrag(comp);
 
 		comp.setLayout(layout);