1 files changed, 45 insertions, 22 deletions

diff --git a/src/net/cbaines/suma/MapActivity.java b/src/net/cbaines/suma/MapActivity.java
index 8ed8e9e..3b8efe5 100644
--- a/src/net/cbaines/suma/MapActivity.java
+++ b/src/net/cbaines/suma/MapActivity.java
@@ -42,6 +42,7 @@ import org.osmdroid.views.util.constants.MapViewConstants;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.SearchManager;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -186,6 +187,19 @@ public class MapActivity extends ToastHelperActivity implements MapViewConstants
 
 		instance = this;
 
+		Intent intent = getIntent();
+		Bundle extras = intent.getExtras();
+
+		if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
+			String query = intent.getStringExtra(SearchManager.QUERY);
+
+			Intent searchIntent = new Intent(instance, SearchActivity.class);
+			searchIntent.setAction(Intent.ACTION_SEARCH);
+			searchIntent.putExtra(SearchManager.QUERY, query);
+			startActivity(searchIntent);
+
+		}
+
 		Log.i(TAG, "Begining loading database " + (System.currentTimeMillis() - startTime));
 
 		DatabaseHelper helper = getHelper();
@@ -263,50 +277,59 @@ public class MapActivity extends ToastHelperActivity implements MapViewConstants
 		mapController = mapView.getController();
 		mResourceProxy = new DefaultResourceProxyImpl(getApplicationContext());
 
-		GeoPoint userLocation = null;
+		GeoPoint startLocation = null;
 
-		Bundle extras = getIntent().getExtras();
 		if (getIntent().getDataString() != null) {
+			String dataString = getIntent().getDataString();
 
-			Log.i(TAG, "getIntent().getDataString() " + getIntent().getDataString());
+			Log.i(TAG, "getIntent().getDataString() " + dataString);
 
-			String str = getIntent().getDataString().substring(4, getIntent().getDataString().length());
-			String[] strParts = str.split(",");
+			if (dataString.startsWith("content")) {
 
-			int lat = Util.doubleToIntE6(Double.valueOf(strParts[0]));
-			int lng;
+				Uri data = intent.getData();
 
-			if (strParts[1].contains("?")) {
-				String zoom = strParts[1].substring(strParts[1].indexOf("?") + 3, strParts[1].length());
-				String strLng = strParts[1].substring(0, strParts[1].indexOf("?") - 1);
-				lng = Util.doubleToIntE6(Double.valueOf(strLng));
+				Log.i("Data: ", data.toString());
 
-				mapController.setZoom(Integer.valueOf(zoom));
+				startLocation = new GeoPoint(50935551, -1393488);
 			} else {
-				lng = Util.doubleToIntE6(Double.valueOf(strParts[1]));
-				mapController.setZoom(15);
-			}
 
-			userLocation = new GeoPoint(lat, lng);
+				String str = getIntent().getDataString().substring(4, getIntent().getDataString().length());
+				String[] strParts = str.split(",");
 
+				int lat = Util.doubleToIntE6(Double.valueOf(strParts[0]));
+				int lng;
+
+				if (strParts[1].contains("?")) {
+					String zoom = strParts[1].substring(strParts[1].indexOf("?") + 3, strParts[1].length());
+					String strLng = strParts[1].substring(0, strParts[1].indexOf("?") - 1);
+					lng = Util.doubleToIntE6(Double.valueOf(strLng));
+
+					mapController.setZoom(Integer.valueOf(zoom));
+				} else {
+					lng = Util.doubleToIntE6(Double.valueOf(strParts[1]));
+					mapController.setZoom(15);
+				}
+
+				startLocation = new GeoPoint(lat, lng);
+			}
 		} else if (extras != null && extras.containsKey("poiPoint")) {
 			String poiPoint = getIntent().getExtras().getString("poiPoint");
 			Log.i(TAG, "poiPoint " + poiPoint);
 
 			String[] bits = poiPoint.split(",");
 
-			userLocation = new GeoPoint(Double.valueOf(bits[0]), Double.valueOf(bits[1]));
+			startLocation = new GeoPoint(Double.valueOf(bits[0]), Double.valueOf(bits[1]));
 			mapController.setZoom(20);
 
 		} else {
-			userLocation = myLocationOverlay.getMyLocation();
-			if (userLocation == null) {
-				userLocation = new GeoPoint(50935551, -1393488); // ECS
+			startLocation = myLocationOverlay.getMyLocation();
+			if (startLocation == null) {
+				startLocation = new GeoPoint(50935551, -1393488); // ECS
 			}
 			mapController.setZoom(15);
 		}
 
-		mapController.setCenter(userLocation);
+		mapController.setCenter(startLocation);
 
 		final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
 		String appVersion = sharedPrefs.getString(APP_VERSION, APP_NOT_INSTALLED);
@@ -857,7 +880,7 @@ public class MapActivity extends ToastHelperActivity implements MapViewConstants
 		// Handle item selection
 		switch (item.getItemId()) {
 		case R.id.menu_find:
-            onSearchRequested();
+			onSearchRequested();
 			return true;
 		case R.id.menu_preferences:
 			Intent settingsActivity = new Intent(getBaseContext(), PreferencesActivity.class);