altosdroid: Add map types and map preloading UIs

[fw/altos] / altosuilib / AltosUIMapNew.java

diff --git a/altosuilib/AltosUIMapNew.java b/altosuilib/AltosUIMapNew.java
index 4191a562ffef8c7d0230179ff423c3258094c266..05f47b53d552d292b414048d0ab46917356ebf7c 100644 (file)
--- a/altosuilib/AltosUIMapNew.java
+++ b/altosuilib/AltosUIMapNew.java
@@ -283,16 +283,16 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
                                if (t.has_location()) {
                                        String  message = null;
                                        switch (status) {
-                                       case AltosUIMapCache.loading:
+                                       case AltosMapTile.loading:
                                                message = "Loading...";
                                                break;
-                                       case AltosUIMapCache.bad_request:
+                                       case AltosMapTile.bad_request:
                                                message = "Internal error";
                                                break;
-                                       case AltosUIMapCache.failed:
+                                       case AltosMapTile.failed:
                                                message = "Network error, check connection";
                                                break;
-                                       case AltosUIMapCache.forbidden:
+                                       case AltosMapTile.forbidden:
                                                message = "Too many requests, try later";
                                                break;
                                        }
@@ -419,15 +419,16 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
                return "Map";
        }
 
+       /* AltosGraphUI interface */
+       public void centre(AltosState state) {
+               map.centre(state);
+       }
+
        /* internal layout bits */
        private GridBagLayout layout = new GridBagLayout();
 
        JComboBox<String>       maptype_combo;
 
-       public void set_load_params(double lat, double lon, int radius, AltosMapTileListener listener) {
-               map.set_load_params(lat, lon, radius, listener);
-       }
-
        MapView view;
 
        public AltosUIMapNew() {