altosui: Add map preloading GUI

[fw/altos] / altosui / AltosSiteMap.java

diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index d4a4cbf43dbaa66b7c0c69ca6da2be09bef08e5c..7306813806e0e6034719c7d202dd5748d3005892 100644 (file)
--- a/altosui/AltosSiteMap.java
+++ b/altosui/AltosSiteMap.java
@@ -150,10 +150,13 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
                //System.out.printf("Loading/fetching map %s\n", pngfile);
                Thread thread = new Thread() {
                        public void run() {
-                               ImageIcon res;
-                               res = AltosSiteMapCache.fetchAndLoadMap(pngfile, pngurl);
+                               final ImageIcon res = AltosSiteMapCache.fetchAndLoadMap(pngfile, pngurl);
                                if (res != null) {
-                                       tile.loadMap(res);
+                                       SwingUtilities.invokeLater(new Runnable() {
+                                                       public void run() {
+                                                               tile.loadMap(res);
+                                                       }
+                                               });
                                } else {
                                        System.out.printf("# Failed to fetch file %s\n", pngfile);
                                        System.out.printf(" wget -O '%s' ''\n", pngfile, pngurl);
@@ -163,9 +166,25 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
                thread.start();
        }
 
-       public static void prefetchMaps(double lat, double lng, int w, int h) {
-               AltosPreferences.init(null);
+       File    pngfile;
+       String  pngurl;
+
+       public int prefetchMap(int x, int y) {
+               LatLng map_latlng = latlng(
+                       -centre.x + x*px_size + px_size/2,
+                       -centre.y + y*px_size + px_size/2);
+               pngfile = MapFile(map_latlng.lat, map_latlng.lng);
+               pngurl = MapURL(map_latlng.lat, map_latlng.lng);
+               if (pngfile.exists()) {
+                       return 1;
+               } else if (AltosSiteMapCache.fetchMap(pngfile, pngurl)) {
+                       return 0;
+               } else {
+                       return -1;
+               }
+       }
 
+       public static void prefetchMaps(double lat, double lng, int w, int h) {
                AltosSiteMap asm = new AltosSiteMap(true);
                asm.centre = asm.getBaseLocation(lat, lng);
 
@@ -174,18 +193,18 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
                int dx = -w/2, dy = -h/2;
                for (int y = dy; y < h+dy; y++) {
                        for (int x = dx; x < w+dx; x++) {
-                               LatLng map_latlng = asm.latlng(
-                                                           -asm.centre.x + x*px_size + px_size/2,
-                                                           -asm.centre.y + y*px_size + px_size/2);
-                               File pngfile = asm.MapFile(map_latlng.lat, map_latlng.lng);
-                               String pngurl = asm.MapURL(map_latlng.lat, map_latlng.lng);
-                               if (pngfile.exists()) {
-                                       System.out.printf("Already have %s\n", pngfile);
-                               } else if (AltosSiteMapCache.fetchMap(pngfile, pngurl)) {
-                                       System.out.printf("Fetched map %s\n", pngfile);
-                               } else {
-                                       System.out.printf("# Failed to fetch file %s\n", pngfile);
-                                       System.out.printf(" wget -O '%s' ''\n", pngfile, pngurl);
+                               int r = asm.prefetchMap(x, y);
+                               switch (r) {
+                               case 1:
+                                       System.out.printf("Already have %s\n", asm.pngfile);
+                                       break;
+                               case 0:
+                                       System.out.printf("Fetched map %s\n", asm.pngfile);
+                                       break;
+                               case -1:
+                                       System.out.printf("# Failed to fetch file %s\n", asm.pngfile);
+                                       System.out.printf(" wget -O '%s' ''\n", asm.pngfile, asm.pngurl);
+                                       break;
                                }
                        }
                }
@@ -211,10 +230,10 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 
        private File MapFile(double lat, double lng) {
                char chlat = lat < 0 ? 'S' : 'N';
-               char chlng = lng < 0 ? 'E' : 'W';
+               char chlng = lng < 0 ? 'W' : 'E';
                if (lat < 0) lat = -lat;
                if (lng < 0) lng = -lng;
-               return new File(AltosPreferences.logdir(),
+               return new File(AltosPreferences.mapdir(),
                                String.format("map-%c%.6f,%c%.6f-%d.png",
                                              chlat, lat, chlng, lng, zoom));
        }
@@ -226,10 +245,14 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
        boolean initialised = false;
        Point2D.Double last_pt = null;
        int last_state = -1;
+
+       public void show(double lat, double lon) {
+               initMaps(lat, lon);
+               initialised = true;
+               scrollRocketToVisible(pt(lat, lon));
+       }
        public void show(final AltosState state, final int crc_errors) {
                // if insufficient gps data, nothing to update
-               if (state.gps == null)
-                       return;
                if (!state.gps.locked && state.gps.nsat < 4)
                        return;
 
@@ -386,6 +409,6 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
                        }
                }
                setViewportView(comp);
-               setPreferredSize(new Dimension(500,200));
+               setPreferredSize(new Dimension(500,500));
        }
 }