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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 65618646..5be9ba84 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -73,6 +73,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	// Intent request codes
 	public static final int REQUEST_CONNECT_DEVICE = 1;
 	public static final int REQUEST_ENABLE_BT      = 2;
+	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;
 
@@ -417,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();
@@ -630,6 +635,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 				finish();
 			}
 			break;
+		case REQUEST_MAP_TYPE:
+			if (resultCode == Activity.RESULT_OK)
+				set_map_type(data);
+			break;
 		}
 	}
 
@@ -669,6 +678,17 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		}
 	}
 
+	private void set_map_type(Intent data) {
+		int type = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1);
+
+		AltosDebug.debug("intent set_map_type %d\n", type);
+		if (type != -1) {
+			map_type = type;
+			for (AltosDroidTab mTab : mTabs)
+				mTab.set_map_type(map_type);
+		}
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getMenuInflater();
@@ -789,6 +809,14 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 			boolean	imperial = AltosPreferences.imperial_units();
 			AltosPreferences.set_imperial_units(!imperial);
 			return true;
+		case R.id.preload_maps:
+			serverIntent = new Intent(this, PreloadMapActivity.class);
+			startActivityForResult(serverIntent, REQUEST_PRELOAD_MAPS);
+			return true;
+		case R.id.map_type:
+			serverIntent = new Intent(this, MapTypeActivity.class);
+			startActivityForResult(serverIntent, REQUEST_MAP_TYPE);
+			return true;
 		}
 		return false;
 	}