altosdroid: Save selected map type in AltosDroid object

The map tabs may not have been created when the map type was selected,
so save the desired type in the main application object.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 6c6566ba63573f07bdd33122c602439c95a63441..5be9ba84429f38190e9d5038648fa85eab453600 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -76,6 +76,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
        public static final int REQUEST_PRELOAD_MAPS   = 3;
        public static final int REQUEST_MAP_TYPE       = 4;
 
+       public int map_type = AltosMap.maptype_hybrid;
+
        public static FragmentManager   fm;
 
        private BluetoothAdapter mBluetoothAdapter = null;
@@ -677,12 +679,13 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
        }
 
        private void set_map_type(Intent data) {
-               int     mode = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1);
+               int type = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1);
 
-               AltosDebug.debug("intent set_map_type %d\n", mode);
-               if (mode != -1) {
+               AltosDebug.debug("intent set_map_type %d\n", type);
+               if (type != -1) {
+                       map_type = type;
                        for (AltosDroidTab mTab : mTabs)
-                               mTab.set_map_type(mode);
+                               mTab.set_map_type(map_type);
                }
        }
 

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 5376d423ec341c064795c4a6d482d7adcdba5d48..cea3cac60b28dd5021b155d31b5bb9e3bba34cb6 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -118,6 +118,7 @@ public class TabMap extends AltosDroidTab {
        private void setupMap() {
                mMap = mMapFragment.getMap();
                if (mMap != null) {
+                       set_map_type(mAltosDroid.map_type);
                        mMap.setMyLocationEnabled(true);
                        mMap.getUiSettings().setTiltGesturesEnabled(false);
                        mMap.getUiSettings().setZoomControlsEnabled(false);

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
index 31acda75a8bc613690d01ef2694b284ecc750a7a..cbf500187c1fbfbe0063a44898b57add7cdfff38 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
@@ -389,6 +389,10 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
                super.onAttach(activity);
                mAltosDroid = (AltosDroid) activity;
                mAltosDroid.registerTab(this);
+
+               map = new AltosMap(this);
+               map.set_maptype(mAltosDroid.map_type);
+
                pad_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.pad);
                /* arrow at the bottom of the launchpad image */
                pad_off_x = pad_bitmap.getWidth() / 2;