X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosSiteMap.java;h=d4a4cbf43dbaa66b7c0c69ca6da2be09bef08e5c;hp=0375128e1bfec7b014dcca63fea1b0f0395ede93;hb=84cd5d42d8b5659463544fe2a400758b56478609;hpb=a08b2a6363c194195db92029743f6612676373ce

diff --git a/ao-tools/altosui/AltosSiteMap.java b/ao-tools/altosui/AltosSiteMap.java
index 0375128e..d4a4cbf4 100644
--- a/ao-tools/altosui/AltosSiteMap.java
+++ b/ao-tools/altosui/AltosSiteMap.java
@@ -40,6 +40,8 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 
 	static final int px_size = 512;
 
+	static final int MAX_TILE_DELTA = 100;
+
 	private static Point2D.Double translatePoint(Point2D.Double p,
 			Point2D.Double d)
 	{
@@ -228,16 +230,19 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 		// if insufficient gps data, nothing to update
 		if (state.gps == null)
 			return;
-		if (state.pad_lat == 0 && state.pad_lon == 0)
+		if (!state.gps.locked && state.gps.nsat < 4)
 			return;
-		if (!state.gps.locked) {
-			if (state.gps.nsat < 4)
-				return;
-		}
 
 		if (!initialised) {
-			initMaps(state.pad_lat, state.pad_lon);
-			initialised = true;
+			if (state.pad_lat != 0 || state.pad_lon != 0) {
+				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);
+				initialised = true;
+			} else {
+				return;
+			}
 		}
 
 		final Point2D.Double pt = pt(state.gps.lat, state.gps.lon);
@@ -258,41 +263,105 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 				if (0 <= ref.y && ref.y < px_size)
 					in_any = true;
 		}
-		if (!in_any) {
-			final AltosSiteMapTile tile = new AltosSiteMapTile(px_size);
-			final Point offset = tileOffset(pt);
-			mapTiles.put(offset, tile);
 
+		Point offset = tileOffset(pt);
+		if (!in_any) {
 			Point2D.Double ref, lref;
 			ref = translatePoint(pt, tileCoordOffset(offset));
 			lref = translatePoint(last_pt, tileCoordOffset(offset));
-			tile.show(state, crc_errors, lref, ref);
 
+			AltosSiteMapTile tile = createTile(offset);
+			tile.show(state, crc_errors, lref, ref);
 			initMap(tile, offset);
+			finishTileLater(tile, offset);
+		}
 
-			SwingUtilities.invokeLater( new Runnable() {
-				public void run() {
-					addTileAt(tile, offset);
-					setViewportView(comp);
-				}
-			} );
+		scrollRocketToVisible(pt);
+
+		if (offset != tileOffset(last_pt)) {
+			ensureTilesAround(offset);
 		}
+
 		last_pt = pt;
 		last_state = state.state;
 	}
 
+	private AltosSiteMapTile createTile(Point offset) {
+		AltosSiteMapTile tile = new AltosSiteMapTile(px_size);
+		mapTiles.put(offset, tile);
+		return tile;
+	}
+	private void finishTileLater(final AltosSiteMapTile tile,
+				     final Point offset)
+	{
+		SwingUtilities.invokeLater( new Runnable() {
+			public void run() {
+				addTileAt(tile, offset);
+			}
+		} );
+	}
+
+	private void ensureTilesAround(Point base_offset) {
+		for (int x = -1; x <= 1; x++) {
+			for (int y = -1; y <= 1; y++) {
+				Point offset = new Point(base_offset.x + x, base_offset.y + y);
+				if (mapTiles.containsKey(offset))
+					continue;
+				AltosSiteMapTile tile = createTile(offset);
+				initMap(tile, offset);
+				finishTileLater(tile, offset);
+			}
+		}
+	}
+
+	private Point topleft = new Point(0,0);
+	private void scrollRocketToVisible(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;
+		if (Math.abs(dx) > r.width/4 || Math.abs(dy) > r.height/4) {
+			r.x += dx;
+			r.y += dy;
+			comp.scrollRectToVisible(r);
+		}
+	}
+
 	private void addTileAt(AltosSiteMapTile tile, Point offset) {
+		if (Math.abs(offset.x) >= MAX_TILE_DELTA ||
+				Math.abs(offset.y) >= MAX_TILE_DELTA)
+		{
+			System.out.printf("Rocket too far away from pad (tile %d,%d)\n",
+					  offset.x, offset.y);
+			return;
+		}
+
+		boolean review = false;
+		Rectangle r = comp.getVisibleRect();
+		if (offset.x < topleft.x) {
+			r.x += (topleft.x - offset.x) * px_size;
+			topleft.x = offset.x;
+			review = true;
+		}
+		if (offset.y < topleft.y) {
+			r.y += (topleft.y - offset.y) * px_size;
+			topleft.y = offset.y;
+			review = true;
+		}
 		GridBagConstraints c = new GridBagConstraints();
 		c.anchor = GridBagConstraints.CENTER;
 		c.fill = GridBagConstraints.BOTH;
-
 		// put some space between the map tiles, debugging only
 		// c.insets = new Insets(5, 5, 5, 5);
-		//
-		c.gridx = offset.x + 100;
-		c.gridy = offset.y + 100;
+
+		c.gridx = offset.x + MAX_TILE_DELTA;
+		c.gridy = offset.y + MAX_TILE_DELTA;
 		layout.setConstraints(tile, c);
+
 		comp.add(tile);
+		if (review) {
+			comp.scrollRectToVisible(r);
+		}
 	}
 
 	private AltosSiteMap(boolean knowWhatYouAreDoing) {
@@ -301,27 +370,18 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 		}
 	}
 
-	JComponent comp;
-	private GridBagLayout layout;
+	JComponent comp = new JComponent() { };
+	private GridBagLayout layout = new GridBagLayout();
 
 	public AltosSiteMap() {
-		comp = new JComponent() {
-			GrabNDrag scroller = new GrabNDrag(this);
-			{
-				addMouseMotionListener(scroller);
-				addMouseListener(scroller);
-				setAutoscrolls(true);
-			}
-		};
+		GrabNDrag scroller = new GrabNDrag(comp);
 
-		layout = new GridBagLayout();
 		comp.setLayout(layout);
 
 		for (int x = -1; x <= 1; x++) {
 			for (int y = -1; y <= 1; y++) {
-				AltosSiteMapTile t = new AltosSiteMapTile(px_size);
 				Point offset = new Point(x, y);
-				mapTiles.put(offset, t);
+				AltosSiteMapTile t = createTile(offset);
 				addTileAt(t, offset);
 			}
 		}