From: Anthony Towns <aj@erisian.com.au>
Date: Sun, 21 Nov 2010 06:08:37 +0000 (+1000)
Subject: Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
X-Git-Tag: debian/0.7.1+168+gcb08bc2~15^2~25
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ec47bc93a487614714a752cb30ec9fe3d8f72929;hp=e7954c820763f80e993f9f822e837725cf36af84

Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
---

diff --git a/ao-tools/altosui/AltosSiteMap.java b/ao-tools/altosui/AltosSiteMap.java
index 5e34dd49..b2d79043 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,9 +230,9 @@ 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)
+			return;
 		if (!state.gps.locked) {
-			if (state.pad_lat == 0 && state.pad_lon == 0)
-				return;
 			if (state.gps.nsat < 4)
 				return;
 		}
@@ -282,15 +284,22 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 	}
 
 	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;
+		}
+
 		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);
 	}