altosuilib: Rewrite map GUI bits

[fw/altos] / telegps / TeleGPS.java

diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index 7117443632dcfa9553a706be58dba74fefaef2a2..2503d53e4d92b47d658868976c6fbb27f6156196 100644 (file)
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -51,7 +51,7 @@ public class TeleGPS
        }
 
        AltosFlightReader       reader;
-       AltosDisplayThread      thread;
+       TeleGPSDisplayThread    thread;
 
        JMenuBar                menu_bar;
 
@@ -67,7 +67,7 @@ public class TeleGPS
 
        JTabbedPane             pane;
 
-       AltosSiteMap            sitemap;
+       AltosUIMap              map;
        TeleGPSInfo             gps_info;
        AltosInfoTable          info_table;
 
@@ -167,7 +167,7 @@ public class TeleGPS
        }
 
        void load_maps() {
-               new AltosSiteMapPreload(this);
+               new AltosUIMapPreload(this);
        }
 
        void disconnect() {
@@ -349,7 +349,7 @@ public class TeleGPS
 
        public void set_reader(AltosFlightReader reader) {
                setTitle(String.format("TeleGPS %s", reader.name));
-               thread = new AltosDisplayThread(this, voice(), this, reader);
+               thread = new TeleGPSDisplayThread(this, voice(), this, reader);
                thread.start();
        }
 
@@ -438,9 +438,9 @@ public class TeleGPS
                c.gridwidth = 2;
                bag.add(pane, c);
 
-               sitemap = new AltosSiteMap();
-               pane.add("Site Map", sitemap);
-               displays.add(sitemap);
+               map = new AltosUIMap();
+               pane.add("Map", map);
+               displays.add(map);
 
                gps_info = new TeleGPSInfo();
                pane.add("Info", gps_info);
@@ -578,7 +578,7 @@ public class TeleGPS
                                } else {
                                        double lat = Double.parseDouble(args[i+1]);
                                        double lon = Double.parseDouble(args[i+2]);
-                                       AltosSiteMap.prefetchMaps(lat, lon);
+                                       AltosUIMap.prefetch_maps(lat, lon);
                                        i += 2;
                                }
                        } else if (args[i].equals("--replay"))