rhodes 2.0.0.beta11 → 2.0.0.rc1

data/platform/android/Rhodes/jni/src/nativebar.cpp

@@ -10,11 +10,11 @@ RHO_GLOBAL void create_nativebar(int bar_type, rho_param *p)
     JNIEnv *env = jnienv();
     jclass clsNativeBar = getJNIClass(RHODES_JAVA_CLASS_NATIVEBAR);
     if (!clsNativeBar) return;
-    jmethodID midCreate = getJNIClassStaticMethod(env, clsNativeBar, "create", "(ILjava/util/Vector;)V");
+    jmethodID midCreate = getJNIClassStaticMethod(env, clsNativeBar, "create", "(ILjava/lang/Object;)V");
     if (!midCreate) return;
 
-    if (p->type != RHO_PARAM_ARRAY) {
-        RAWLOG_ERROR("Unexpected parameter type, should be Array");
+    if (p->type != RHO_PARAM_ARRAY && p->type != RHO_PARAM_HASH) {
+        RAWLOG_ERROR("Unexpected parameter type, should be Array or Hash");
         return;
     }
 
@@ -44,3 +44,15 @@ RHO_GLOBAL void nativebar_switch_tab(int index)
 
     env->CallStaticVoidMethod(cls, mid, index);
 }
+
+RHO_GLOBAL VALUE nativebar_started()
+{
+    JNIEnv *env = jnienv();
+    VALUE nil = rho_ruby_get_NIL();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_NATIVEBAR);
+    if (!cls) return nil;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "isStarted", "()Z");
+    if (!mid) return nil;
+
+    return rho_ruby_create_boolean(env->CallStaticBooleanMethod(cls, mid));
+}

data/platform/android/Rhodes/jni/src/navbar.cpp

@@ -28,3 +28,15 @@ RHO_GLOBAL void remove_navbar()
 
     env->CallStaticVoidMethod(cls, mid);
 }
+
+RHO_GLOBAL VALUE navbar_started()
+{
+    JNIEnv *env = jnienv();
+    VALUE nil = rho_ruby_get_NIL();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_NAVBAR);
+    if (!cls) return nil;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "isStarted", "()Z");
+    if (!mid) return nil;
+
+    return rho_ruby_create_boolean(env->CallStaticBooleanMethod(cls, mid));
+}

data/platform/android/Rhodes/jni/src/phonebook.cpp

@@ -49,8 +49,7 @@ static VALUE createHashFromContact(jobject contactObj)
     jmethodID getValueMID = getJNIClassMethod(env, fieldCls, "getValue", "()Ljava/lang/String;");
     if (!getValueMID) return Qnil;
 
-    VALUE contactHash = createHash();
-
+    CHoldRubyValue contactHash(rho_ruby_createHash());
     // contact.moveToBegin();
     env->CallVoidMethod(contactObj, contactMoveToBeginMID);
 
@@ -100,7 +99,7 @@ RHO_GLOBAL VALUE getallPhonebookRecords(void* pb)
     // pb.moveToBegin();
     env->CallVoidMethod(phonebookObj, phonebookMoveToBeginMID);
 
-    VALUE hash = createHash();
+    CHoldRubyValue hash(rho_ruby_createHash());
     // while(pb.hasNext())
     while(env->CallBooleanMethod(phonebookObj, hasNextMID))
     {

data/platform/android/Rhodes/jni/src/rhodes.cpp

@@ -232,8 +232,8 @@ VALUE convertJavaMapToRubyHash(jobject objMap)
     if (!objSet) return Qnil;
     jobject objIterator = env->CallObjectMethod(objSet, midIterator);
     if (!objIterator) return Qnil;
-
-    VALUE retval = createHash();
+                                  
+    CHoldRubyValue retval(rho_ruby_createHash());
     while(env->CallBooleanMethod(objIterator, midHasNext))
     {
         jstring objKey = (jstring)env->CallObjectMethod(objIterator, midNext);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java

@@ -20,8 +20,6 @@
  */
 package com.rhomobile.rhodes;
 
-import java.util.Vector;
-
 import com.rhomobile.rhodes.mainview.MainView;
 import com.rhomobile.rhodes.mainview.SimpleMainView;
 import com.rhomobile.rhodes.mainview.TabbedMainView;
@@ -34,12 +32,14 @@ public class NativeBar {
 	public static final int TABBAR_TYPE = 1;
 	public static final int NOBAR_TYPE = 2;
 	
+	private static boolean started = false;
+	
 	private static class CreateTask implements Runnable {
 		
 		private int type;
-		private Vector<Object> params;
+		private Object params;
 		
-		public CreateTask(int t, Vector<Object> p) {
+		public CreateTask(int t, Object p) {
 			type = t;
 			params = p;
 		}
@@ -53,12 +53,15 @@ public class NativeBar {
 				switch (type) {
 				case NOBAR_TYPE:
 					v = new SimpleMainView(mainView);
+					started = false;
 					break;
 				case TOOLBAR_TYPE:
 					v = new SimpleMainView(mainView, params);
+					started = true;
 					break;
 				case TABBAR_TYPE:
 					v = new TabbedMainView(params);
+					started = true;
 					break;
 				default:
 					Logger.E(TAG, "Unknown bar type passed: " + type);
@@ -91,7 +94,7 @@ public class NativeBar {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
 	}
 
-	public static void create(int type, Vector<Object> params) {
+	public static void create(int type, Object params) {
 		try {
 			Rhodes.performOnUiThread(new CreateTask(type, params), false);
 		}
@@ -118,4 +121,7 @@ public class NativeBar {
 		}
 	}
 	
+	public static boolean isStarted() {
+		return started;
+	}
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java

@@ -6,6 +6,8 @@ public class NavBar {
 
 	private static final String TAG = "NavBar";
 	
+	private static boolean started = false;
+	
 	private static class CreateTask implements Runnable {
 		
 		private String title;
@@ -33,6 +35,7 @@ public class NavBar {
 		public void run() {
 			Rhodes r = RhodesInstance.getInstance();
 			r.getMainView().addNavBar(title, left, right);
+			started = true;
 		}
 	};
 	
@@ -40,6 +43,7 @@ public class NavBar {
 		public void run() {
 			Rhodes r = RhodesInstance.getInstance();
 			r.getMainView().removeNavBar();
+			started = false;
 		}
 	};
 	
@@ -65,4 +69,7 @@ public class NavBar {
 		}
 	}
 	
+	public static boolean isStarted() {
+		return started;
+	}
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java

@@ -28,6 +28,7 @@ import java.util.Vector;
 
 import com.rhomobile.rhodes.Utils.AssetsSource;
 import com.rhomobile.rhodes.Utils.FileSource;
+import com.rhomobile.rhodes.geolocation.GeoLocation;
 import com.rhomobile.rhodes.mainview.MainView;
 import com.rhomobile.rhodes.ui.AboutDialog;
 import com.rhomobile.rhodes.ui.LogOptionsDialog;
@@ -87,6 +88,8 @@ public class Rhodes extends Activity {
 	
 	private static boolean ENABLE_LOADING_INDICATION = true;
 	
+	private boolean needGeoLocationRestart = false;
+	
 	private long uiThreadId;
 	public long getUiThreadId() {
 		return uiThreadId;
@@ -320,6 +323,7 @@ public class Rhodes extends Activity {
 		w.setHorizontalScrollBarEnabled(true);
 		w.setVerticalScrollbarOverlay(true);
 		w.setHorizontalScrollbarOverlay(true);
+		w.setFocusableInTouchMode(true);
 
 		w.setWebViewClient(new WebViewClient() {
 			
@@ -559,6 +563,8 @@ public class Rhodes extends Activity {
 	@Override
 	protected void onResume() {
 		super.onResume();
+		if (needGeoLocationRestart)
+			GeoLocation.isKnownPosition();
 		Logger.T(TAG, "+++ onResume");
 	}
 	
@@ -571,6 +577,8 @@ public class Rhodes extends Activity {
 	@Override
 	protected void onStop() {
 		Logger.T(TAG, "+++ onStop");
+		needGeoLocationRestart = GeoLocation.isAvailable();
+		GeoLocation.stop();
 		super.onStop();
 	}
 		

data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java

@@ -47,14 +47,34 @@ public class GeoLocation {
 		}
 	}
 	
-	public static boolean isAvailable() {
+	public static void stop() {
 		try {
-			Logger.T(TAG, "isAvailable");
+			Logger.T(TAG, "stop");
 			if (locImpl == null)
-				return false;
-			checkState();
-			init();
-			return locImpl.isAvailable();
+				return;
+			synchronized (TAG) {
+				if (locImpl == null)
+					return;
+				locImpl.stop();
+				locImpl = null;
+			}
+		}
+		catch (Exception e) {
+			reportFail("stop", e);
+		}
+	}
+	
+	public static boolean isAvailable() {
+		try {
+			Logger.T(TAG, "isAvailable...");
+			boolean result = false;
+			if (locImpl != null) {
+				checkState();
+				init();
+				result = locImpl.isAvailable();
+			}
+			Logger.T(TAG, "Geo location service is " + (result ? "" : "not ") + "available");
+			return result;
 		}
 		catch (Exception e) {
 			reportFail("isAvailable", e);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java

@@ -109,6 +109,13 @@ public class GeoLocationImpl implements LocationListener {
 		Logger.T(TAG, "onStatusChanged");
 		setCurrentGpsLocation(null);
 	}
+	
+	public synchronized void stop() {
+		if (locationManager == null)
+			return;
+		locationManager.removeUpdates(this);
+		locationManager = null;
+	}
 
 	public synchronized boolean isAvailable() {
 		return available;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java

@@ -210,7 +210,7 @@ public class SimpleMainView implements MainView {
 	}
 	
 	@SuppressWarnings("unchecked")
-	private void init(MainView v, Vector<Object> params) {
+	private void init(MainView v, Object params) {
 		Rhodes r = RhodesInstance.getInstance();
 		
 		view = new LinearLayout(r);
@@ -232,12 +232,49 @@ public class SimpleMainView implements MainView {
 		bottom.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0));
 		view.addView(bottom);
 		
+		Vector<Object> buttons = null;
+		if (params != null) {
+			if (params instanceof Vector<?>) {
+				buttons = (Vector<Object>)params;
+			}
+			else if (params instanceof Map<?,?>) {
+				Map<Object,Object> settings = (Map<Object,Object>)params;
+				
+				Object colorObj = settings.get("color");
+				if (colorObj != null && (colorObj instanceof Map<?,?>)) {
+					Map<Object,Object> color = (Map<Object,Object>)colorObj;
+					
+					Object redObj = color.get("red");
+					Object greenObj = color.get("green");
+					Object blueObj = color.get("blue");
+					
+					if (redObj != null && greenObj != null && blueObj != null &&
+							(redObj instanceof String) && (greenObj instanceof String) && (blueObj instanceof String)) {
+						try {
+							int red = Integer.parseInt((String)redObj);
+							int green = Integer.parseInt((String)greenObj);
+							int blue = Integer.parseInt((String)blueObj);
+							
+							bottom.setBackgroundColor(Color.rgb(red, green, blue));
+						}
+						catch (NumberFormatException e) {
+							// Do nothing here
+						}
+					}
+				}
+				
+				Object buttonsObj = settings.get("buttons");
+				if (buttonsObj != null && (buttonsObj instanceof Vector<?>))
+					buttons = (Vector<Object>)buttonsObj;
+			}
+		}
+		
 		if (params != null) {
 			LinearLayout group = null;
 			// First group should have gravity LEFT
 			int gravity = Gravity.LEFT;
-			for (int i = 0, lim = params.size(); i < lim; ++i) {
-				Object param = params.elementAt(i);
+			for (int i = 0, lim = buttons.size(); i < lim; ++i) {
+				Object param = buttons.elementAt(i);
 				if (!(param instanceof Map<?,?>))
 					throw new IllegalArgumentException("Hash expected");
 				
@@ -265,6 +302,8 @@ public class SimpleMainView implements MainView {
 			if (group != null)
 				group.setGravity(Gravity.RIGHT);
 		}
+		
+		webView.requestFocus();
 	}
 	
 	public SimpleMainView() {
@@ -275,7 +314,7 @@ public class SimpleMainView implements MainView {
 		init(v, null);
 	}
 	
-	public SimpleMainView(MainView v, Vector<Object> params) {
+	public SimpleMainView(MainView v, Object params) {
 		init(v, params);
 	}
 	

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java

@@ -43,7 +43,7 @@ public class TabbedMainView implements MainView {
 	private static final String TAG = "TabbedMainView";
 	
 	private TabHost host;
-	private Vector<TabData> tabs;
+	private Vector<TabData> tabData;
 	
 	private static class TabData {
 		public MainView view;
@@ -71,20 +71,34 @@ public class TabbedMainView implements MainView {
 	};
 	
 	private MainView getView(int index) {
-		TabData data = tabs.elementAt(index);
+		TabData data = tabData.elementAt(index);
 		return data.view;
 	}
 	
 	@SuppressWarnings("unchecked")
-	public TabbedMainView(Vector<Object> params) {
+	public TabbedMainView(Object params) {
 		Rhodes r = RhodesInstance.getInstance();
 		
-		int size = params.size();
+		Vector<Object> tabs = null;
+		if (params instanceof Vector<?>)
+			tabs = (Vector<Object>)params;
+		else if (params instanceof Map<?,?>) {
+			Map<Object,Object> settings = (Map<Object,Object>)params;
+			
+			Object tabsObj = settings.get("tabs");
+			if (tabsObj != null && (tabsObj instanceof Vector<?>))
+				tabs = (Vector<Object>)tabsObj;
+		}
+		
+		if (tabs == null)
+			throw new IllegalArgumentException("No tabs specified");
+		
+		int size = tabs.size();
 		
 		host = new TabHost(r);
 		host.setId(Rhodes.RHO_MAIN_VIEW);
 		
-		tabs = new Vector<TabData>(size);
+		tabData = new Vector<TabData>(size);
 		
 		TabWidget tabWidget = new TabWidget(r);
 		tabWidget.setId(android.R.id.tabs);
@@ -107,7 +121,7 @@ public class TabbedMainView implements MainView {
 			public void onTabChanged(String tabId) {
 				try {
 					int index = Integer.parseInt(tabId);
-					TabData data = tabs.elementAt(index);
+					TabData data = tabData.elementAt(index);
 					if (data.reload || !data.loaded) {
 						getView(index).navigate(data.url, index);
 						data.loaded = true;
@@ -124,7 +138,7 @@ public class TabbedMainView implements MainView {
 		String rootPath = RhodesInstance.getInstance().getRootPath() + "/apps/";
 
 		for (int i = 0; i < size; ++i) {
-			Object param = params.elementAt(i);
+			Object param = tabs.elementAt(i);
 			if (!(param instanceof Map<?,?>))
 				throw new IllegalArgumentException("Hash expected");
 			
@@ -175,7 +189,7 @@ public class TabbedMainView implements MainView {
 			TabViewFactory factory = new TabViewFactory(data);
 			spec.setContent(factory);
 			
-			tabs.addElement(data);
+			tabData.addElement(data);
 			host.addTab(spec);
 		}
 	}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java

@@ -28,6 +28,8 @@ public class MapView extends MapActivity {
 	private static final String SETTINGS_PREFIX = Rhodes.INTENT_EXTRA_PREFIX + "settings.";
 	private static final String ANNOTATIONS_PREFIX = Rhodes.INTENT_EXTRA_PREFIX + "annotations.";
 	
+	private static MapView mc = null;
+	
 	private com.google.android.maps.MapView view;
 	private AnnotationsOverlay annOverlay;
 	
@@ -38,121 +40,28 @@ public class MapView extends MapActivity {
 	
 	private Vector<Annotation> annotations;
 	
+	private static class Coordinates {
+		public double latitude;
+		public double longitude;
+		
+		public Coordinates() {
+			latitude = 0;
+			longitude = 0;
+		}
+	};
+	
+	private Coordinates center = new Coordinates();
+	
 	private static void reportFail(String name, Exception e) {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
 	}
 	
-	@SuppressWarnings("unchecked")
-	public static void create(String gapiKey, Map<String, Object> params) {
-		try {
-			Intent intent = new Intent(RhodesInstance.getInstance(), MapView.class);
-			intent.putExtra(SETTINGS_PREFIX + "api_key", gapiKey);
-			
-			Object settings = params.get("settings");
-			if (settings != null && (settings instanceof Map<?,?>)) {
-				Map<Object, Object> hash = (Map<Object, Object>)settings;
-				Object map_type = hash.get("map_type");
-				if (map_type != null && (map_type instanceof String))
-					intent.putExtra(SETTINGS_PREFIX + "map_type", (String)map_type);
-				
-				Object zoom_enabled = hash.get("zoom_enabled");
-				if (zoom_enabled != null && (zoom_enabled instanceof String))
-					intent.putExtra(SETTINGS_PREFIX + "zoom_enabled", ((String)zoom_enabled).equalsIgnoreCase("true"));
-				
-				Object scroll_enabled = hash.get("scroll_enabled");
-				if (scroll_enabled != null && (scroll_enabled instanceof String))
-					intent.putExtra(SETTINGS_PREFIX + "scroll_enabled", ((String)scroll_enabled).equalsIgnoreCase("true"));
-				
-				Object shows_user_location = hash.get("shows_user_location");
-				if (shows_user_location != null && (shows_user_location instanceof String))
-					intent.putExtra(SETTINGS_PREFIX + "shows_user_location", ((String)shows_user_location).equalsIgnoreCase("true"));
-				
-				Object region = hash.get("region");
-				if (region != null) {
-					if (region instanceof Vector<?>) {
-						Vector<String> reg = (Vector<String>)region;
-						if (reg.size() == 4) {
-							intent.putExtra(SETTINGS_PREFIX + "region", "square");
-							intent.putExtra(SETTINGS_PREFIX + "region.latitude", reg.elementAt(0));
-							intent.putExtra(SETTINGS_PREFIX + "region.longitude", reg.elementAt(1));
-							intent.putExtra(SETTINGS_PREFIX + "region.latSpan", reg.elementAt(2));
-							intent.putExtra(SETTINGS_PREFIX + "region.lonSpan", reg.elementAt(3));
-						}
-					}
-					else if (region instanceof Map<?,?>) {
-						Map<Object, Object> reg = (Map<Object,Object>)region;
-						String center = null;
-						String radius = null;
-						
-						Object centerObj = reg.get("center");
-						if (centerObj != null && (centerObj instanceof String))
-							center = (String)centerObj;
-						
-						Object radiusObj = reg.get("radius");
-						if (radiusObj != null && (radiusObj instanceof String))
-							radius = (String)radiusObj;
-						
-						if (center != null && radius != null) {
-							intent.putExtra(SETTINGS_PREFIX + "region", "circle");
-							intent.putExtra(SETTINGS_PREFIX + "region.center", center);
-							intent.putExtra(SETTINGS_PREFIX + "region.radius", radius);
-						}
-					}
-				}
-			}
-			
-			Object annotations = params.get("annotations");
-			if (annotations != null && (annotations instanceof Vector<?>)) {
-				Vector<Object> arr = (Vector<Object>)annotations;
-				
-				intent.putExtra(ANNOTATIONS_PREFIX + "size", arr.size());
-				
-				for (int i = 0, lim = arr.size(); i < lim; ++i) {
-					Object annObj = arr.elementAt(i);
-					if (annObj == null || !(annObj instanceof Map<?, ?>))
-						continue;
-					
-					Map<Object, Object> ann = (Map<Object, Object>)annObj;
-					
-					String prefix = ANNOTATIONS_PREFIX + Integer.toString(i) + ".";
-					
-					Object latitude = ann.get("latitude");
-					if (latitude != null && (latitude instanceof String))
-						intent.putExtra(prefix + "latitude", (String)latitude);
-					
-					Object longitude = ann.get("longitude");
-					if (longitude != null && (longitude instanceof String))
-						intent.putExtra(prefix + "longitude", (String)longitude);
-					
-					Object address = ann.get("street_address");
-					if (address != null && (address instanceof String))
-						intent.putExtra(prefix + "address", (String)address);
-					
-					Object title = ann.get("title");
-					if (title != null && (title instanceof String))
-						intent.putExtra(prefix + "title", (String)title);
-					
-					Object subtitle = ann.get("subtitle");
-					if (subtitle != null && (subtitle instanceof String))
-						intent.putExtra(prefix + "subtitle", (String)subtitle);
-					
-					Object url = ann.get("url");
-					if (url != null && (url instanceof String))
-						intent.putExtra(prefix + "url", (String)url);
-				}
-			}
-			
-			RhodesInstance.getInstance().startActivity(intent);
-		}
-		catch (Exception e) {
-			reportFail("create", e);
-		}
-	}
-	
 	@Override
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
 		
+		mc = this;
+		
 		getWindow().setFlags(Rhodes.WINDOW_FLAGS, Rhodes.WINDOW_MASK);
 		
 		RelativeLayout layout = new RelativeLayout(this);
@@ -232,6 +141,8 @@ public class MapView extends MapActivity {
 				try {
 					double lat = Double.parseDouble(latitude);
 					double lon = Double.parseDouble(longitude);
+					center.latitude = lat;
+					center.longitude = lon;
 					controller.setCenter(new GeoPoint((int)(lat*1000000), (int)(lon*1000000)));
 				}
 				catch (NumberFormatException e) {
@@ -308,6 +219,8 @@ public class MapView extends MapActivity {
 				ann.longitude = addr.getLongitude();
 				if (ann.type.equals("center")) {
 					MapController controller = view.getController();
+					center.latitude = ann.latitude;
+					center.longitude = ann.longitude;
 					controller.setCenter(new GeoPoint((int)(ann.latitude*1000000), (int)(ann.longitude*1000000)));
 					controller.zoomToSpan((int)(spanLat*1000000), (int)(spanLon*1000000));
 				}
@@ -330,4 +243,154 @@ public class MapView extends MapActivity {
 		return false;
 	}
 	
+	@SuppressWarnings("unchecked")
+	public static void create(String gapiKey, Map<String, Object> params) {
+		try {
+			Intent intent = new Intent(RhodesInstance.getInstance(), MapView.class);
+			intent.putExtra(SETTINGS_PREFIX + "api_key", gapiKey);
+			
+			Object settings = params.get("settings");
+			if (settings != null && (settings instanceof Map<?,?>)) {
+				Map<Object, Object> hash = (Map<Object, Object>)settings;
+				Object map_type = hash.get("map_type");
+				if (map_type != null && (map_type instanceof String))
+					intent.putExtra(SETTINGS_PREFIX + "map_type", (String)map_type);
+				
+				Object zoom_enabled = hash.get("zoom_enabled");
+				if (zoom_enabled != null && (zoom_enabled instanceof String))
+					intent.putExtra(SETTINGS_PREFIX + "zoom_enabled", ((String)zoom_enabled).equalsIgnoreCase("true"));
+				
+				Object scroll_enabled = hash.get("scroll_enabled");
+				if (scroll_enabled != null && (scroll_enabled instanceof String))
+					intent.putExtra(SETTINGS_PREFIX + "scroll_enabled", ((String)scroll_enabled).equalsIgnoreCase("true"));
+				
+				Object shows_user_location = hash.get("shows_user_location");
+				if (shows_user_location != null && (shows_user_location instanceof String))
+					intent.putExtra(SETTINGS_PREFIX + "shows_user_location", ((String)shows_user_location).equalsIgnoreCase("true"));
+				
+				Object region = hash.get("region");
+				if (region != null) {
+					if (region instanceof Vector<?>) {
+						Vector<String> reg = (Vector<String>)region;
+						if (reg.size() == 4) {
+							intent.putExtra(SETTINGS_PREFIX + "region", "square");
+							intent.putExtra(SETTINGS_PREFIX + "region.latitude", reg.elementAt(0));
+							intent.putExtra(SETTINGS_PREFIX + "region.longitude", reg.elementAt(1));
+							intent.putExtra(SETTINGS_PREFIX + "region.latSpan", reg.elementAt(2));
+							intent.putExtra(SETTINGS_PREFIX + "region.lonSpan", reg.elementAt(3));
+						}
+					}
+					else if (region instanceof Map<?,?>) {
+						Map<Object, Object> reg = (Map<Object,Object>)region;
+						String center = null;
+						String radius = null;
+						
+						Object centerObj = reg.get("center");
+						if (centerObj != null && (centerObj instanceof String))
+							center = (String)centerObj;
+						
+						Object radiusObj = reg.get("radius");
+						if (radiusObj != null && (radiusObj instanceof String))
+							radius = (String)radiusObj;
+						
+						if (center != null && radius != null) {
+							intent.putExtra(SETTINGS_PREFIX + "region", "circle");
+							intent.putExtra(SETTINGS_PREFIX + "region.center", center);
+							intent.putExtra(SETTINGS_PREFIX + "region.radius", radius);
+						}
+					}
+				}
+			}
+			
+			Object annotations = params.get("annotations");
+			if (annotations != null && (annotations instanceof Vector<?>)) {
+				Vector<Object> arr = (Vector<Object>)annotations;
+				
+				intent.putExtra(ANNOTATIONS_PREFIX + "size", arr.size());
+				
+				for (int i = 0, lim = arr.size(); i < lim; ++i) {
+					Object annObj = arr.elementAt(i);
+					if (annObj == null || !(annObj instanceof Map<?, ?>))
+						continue;
+					
+					Map<Object, Object> ann = (Map<Object, Object>)annObj;
+					
+					String prefix = ANNOTATIONS_PREFIX + Integer.toString(i) + ".";
+					
+					Object latitude = ann.get("latitude");
+					if (latitude != null && (latitude instanceof String))
+						intent.putExtra(prefix + "latitude", (String)latitude);
+					
+					Object longitude = ann.get("longitude");
+					if (longitude != null && (longitude instanceof String))
+						intent.putExtra(prefix + "longitude", (String)longitude);
+					
+					Object address = ann.get("street_address");
+					if (address != null && (address instanceof String))
+						intent.putExtra(prefix + "address", (String)address);
+					
+					Object title = ann.get("title");
+					if (title != null && (title instanceof String))
+						intent.putExtra(prefix + "title", (String)title);
+					
+					Object subtitle = ann.get("subtitle");
+					if (subtitle != null && (subtitle instanceof String))
+						intent.putExtra(prefix + "subtitle", (String)subtitle);
+					
+					Object url = ann.get("url");
+					if (url != null && (url instanceof String))
+						intent.putExtra(prefix + "url", (String)url);
+				}
+			}
+			
+			RhodesInstance.getInstance().startActivity(intent);
+		}
+		catch (Exception e) {
+			reportFail("create", e);
+		}
+	}
+	
+	public static void close() {
+		try {
+			Rhodes.performOnUiThread(new Runnable() {
+				public void run() {
+					if (mc != null) {
+						mc.finish();
+						mc = null;
+					}
+				}
+			}, false);
+		}
+		catch (Exception e) {
+			reportFail("close", e);
+		}
+	}
+	
+	public static boolean isStarted() {
+		return mc != null;
+	}
+	
+	public static double getCenterLatitude() {
+		try {
+			if (mc == null)
+				return 0;
+			return mc.center.latitude;
+		}
+		catch (Exception e) {
+			reportFail("getCenterLatitude", e);
+			return 0;
+		}
+	}
+	
+	public static double getCenterLongitude() {
+		try {
+			if (mc == null)
+				return 0;
+			return mc.center.longitude;
+		}
+		catch (Exception e) {
+			reportFail("getCenterLongitude", e);
+			return 0;
+		}
+	}
 }