AltosSiteMap: ensure buffer around active tile

[fw/altos] / ao-tools / altosui / AltosSiteMap.java

diff --git a/ao-tools/altosui/AltosSiteMap.java b/ao-tools/altosui/AltosSiteMap.java
index 0375128e1bfec7b014dcca63fea1b0f0395ede93..802eb68ce6c5f5d4a5a524c998aaedafc30d09d6 100644 (file)
--- 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)
        {
@@ -258,39 +260,74 @@ 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);
-                               }
-                       } );
+               if (offset != tileOffset(last_pt)) {
+                       ensureTilesAround(offset);
                }
+
                last_pt = pt;
                last_state = state.state;
        }
 
+       private AltosSiteMapTile createTile(final Point offset) {
+               final 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);
+                               tile.setScrollable();
+                       }
+               } );
+       }
+
+       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 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);
        }
@@ -319,10 +356,11 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 
                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);
+                               AltosSiteMapTile t = new AltosSiteMapTile(px_size);
                                mapTiles.put(offset, t);
                                addTileAt(t, offset);
+                               t.setScrollable();
                        }
                }
                setViewportView(comp);