timob-12787: Added support for showInfoWindow

android/documentation/changelog.md

@@ -2,6 +2,7 @@
 <pre>
 v2.1.3    Fixed memory leak when removing map instance from window [TIMOB-14772]
           Added longClick event support [TIMOB-13989]
+          Added support for showInfoWindow property for annotations [TIMOB-12787]
 
 v2.1.2    Clicking on an annotation should center it in map view [TIMOB-13778].
           Fixed a bug where removing an annotation using its title crashed the app [TIMOB-14502].

android/src/ti/map/AnnotationProxy.java

@@ -44,7 +44,8 @@
 	TiC.PROPERTY_LEFT_BUTTON,
 	TiC.PROPERTY_LEFT_VIEW,
 	TiC.PROPERTY_RIGHT_BUTTON,
-	TiC.PROPERTY_RIGHT_VIEW
+	TiC.PROPERTY_RIGHT_VIEW,
+	MapModule.PROPERTY_SHOW_INFO_WINDOW
 })
 public class AnnotationProxy extends KrollProxy
 {
@@ -71,6 +72,7 @@ public AnnotationProxy()
 		super();
 		markerOptions = new MarkerOptions();
 		annoTitle = "";
+		defaultValues.put(MapModule.PROPERTY_SHOW_INFO_WINDOW, true);
 	}
 
 	public AnnotationProxy(TiContext tiContext)
@@ -139,6 +141,7 @@ public void processOptions()
 	{
 		double longitude = 0;
 		double latitude = 0;
+
 		if (hasProperty(TiC.PROPERTY_LONGITUDE)) {
 			longitude = TiConvert.toDouble(getProperty(TiC.PROPERTY_LONGITUDE));
 		}

android/src/ti/map/MapModule.java

@@ -30,6 +30,7 @@ public class MapModule extends KrollModule
 	public static final String PROPERTY_INFO_WINDOW = "infoWindow";
 	public static final String PROPERTY_LEFT_PANE = "leftPane";
 	public static final String PROPERTY_RIGHT_PANE = "rightPane";
+	public static final String PROPERTY_SHOW_INFO_WINDOW = "showInfoWindow";
 	public static final String PROPERTY_USER_LOCATION_BUTTON = "userLocationButton";
 	public static final String EVENT_PIN_CHANGE_DRAG_STATE = "pinchangedragstate";
 

android/src/ti/map/TiUIMapView.java

@@ -460,10 +460,15 @@ public boolean onMarkerClick(Marker marker)
 			fireClickEvent(marker, annoProxy, MapModule.PROPERTY_PIN);
 			return true;
 		}
-
-		selectedAnnotation = annoProxy;
 		fireClickEvent(marker, annoProxy, MapModule.PROPERTY_PIN);
-		return false;
+		selectedAnnotation = annoProxy;
+		boolean showInfoWindow = TiConvert.toBoolean(annoProxy.getProperty(MapModule.PROPERTY_SHOW_INFO_WINDOW), true);
+		//Returning false here will enable native behavior, which shows the info window.
+		if (showInfoWindow) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	@Override

apidoc/Annotation.yml

@@ -102,4 +102,16 @@ properties:
     description: |
         This is ignored if the `rightButton` property is set.
     type: Titanium.UI.View
-    since: "3.1.0"
+    since: "3.1.0"
+
+  - name: showInfoWindow
+    summary: Show or hide the view that is displayed on the annotation when clicked.
+    description: |
+        When this is false, clicking on the annotation will not center it on the map, but the
+        annotation will still be selected, thus triggering the click event.
+        If the annotation is selected, and the info window is hidden, then the next click
+        will deselect the annotation, thus will NOT show the info window, regardless of the current state of this property.
+    type: Boolean
+    default: true
+    since: "3.2.0"
+

apidoc/View.yml

@@ -163,13 +163,15 @@ events:
 
   - name: click
     summary: |
-        Fired when the user selects, deselects, or clicks on an annotation.
+        Fired when the user selects or deselects an annotation.
     description: |
         Note that the `click` event is not fired every time the user clicks on the map.
         It is fired in two circumstances:
 
-        - If the user clicks on an annotation to select it.
-        - The user deselects an annotation.
+        - The user clicks on the annotation. This will select the annotation.
+        - The user deselects an annotation either by clicking on the map or another annotation.
+
+        Note that only one annotation can be selected at any given time.
 
         The `click` event includes a value, `clicksource`, which describes the part of the 
         annotation that was clicked. The `clicksource` can be one of `pin`, `title`,