X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=5be9ba84429f38190e9d5038648fa85eab453600;hp=97373ab8da30e70b9890438022e7c5c9a1b501c1;hb=4315b91d7afc2391e3f7444906ac226500bf1345;hpb=85013045ca505096064aaf45c312b158d0263d2a

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 97373ab8..5be9ba84 100644
--- 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;
@@ -419,6 +421,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		AltosDebug.init(this);
 		AltosDebug.debug("+++ ON CREATE +++");
 
 		fm = getSupportFragmentManager();
@@ -676,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);
 		}
 	}