From b0ece0e6ae9315ae5d4efa11b39a015a2f9dc0aa Mon Sep 17 00:00:00 2001
From: Matt Lanter <matt@opendoor.com>
Date: Mon, 10 Oct 2016 18:58:53 -0700
Subject: [PATCH] [android] Add parameter to disable the moving on marker press

---
 .../airbnb/android/react/maps/AirMapManager.java   |  5 +++++
 .../com/airbnb/android/react/maps/AirMapView.java  | 14 +++++++++++++-
 components/MapView.js                              |  8 ++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java b/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
index b357370212..2f6e30d469 100644
--- a/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
+++ b/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
@@ -165,6 +165,11 @@ public void setLoadingEnabled(AirMapView view, boolean loadingEnabled) {
         view.enableMapLoading(loadingEnabled);
     }
 
+    @ReactProp(name="moveOnMarkerPress", defaultBoolean = true)
+    public void setMoveOnMarkerPress(AirMapView view, boolean moveOnPress) {
+        view.setMoveOnMarkerPress(moveOnPress);
+    }
+
     @ReactProp(name="loadingBackgroundColor", customType="Color")
     public void setLoadingBackgroundColor(AirMapView view, @Nullable Integer loadingBackgroundColor) {
         view.setLoadingBackgroundColor(loadingBackgroundColor);
diff --git a/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java b/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
index 4a04af88a5..faae1a002b 100644
--- a/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
+++ b/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
@@ -65,6 +65,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     private boolean isMonitoringRegion = false;
     private boolean isTouchDown = false;
     private boolean handlePanDrag = false;
+    private boolean moveOnMarkerPress = true;
     private boolean cacheEnabled = false;
 
     private static final String[] PERMISSIONS = new String[] {
@@ -154,7 +155,14 @@ public boolean onMarkerClick(Marker marker) {
                 event.putString("action", "marker-press");
                 manager.pushEvent(markerMap.get(marker), "onPress", event);
 
-                return false; // returning false opens the callout window, if possible
+                // Return false to open the callout info window and center on the marker
+                // https://developers.google.com/android/reference/com/google/android/gms/maps/GoogleMap.OnMarkerClickListener
+                if (view.moveOnMarkerPress) {
+                  return false;
+                } else {
+                  marker.showInfoWindow();
+                  return true;
+                }
             }
         });
 
@@ -330,6 +338,10 @@ public void enableMapLoading(boolean loadingEnabled) {
         }
     }
 
+    public void setMoveOnMarkerPress(boolean moveOnPress) {
+        this.moveOnMarkerPress = moveOnPress;
+    }
+
     public void setLoadingBackgroundColor(Integer loadingBackgroundColor) {
         this.loadingBackgroundColor = loadingBackgroundColor;
 
diff --git a/components/MapView.js b/components/MapView.js
index 429a711335..a7762665db 100644
--- a/components/MapView.js
+++ b/components/MapView.js
@@ -167,6 +167,14 @@ const propTypes = {
    */
   toolbarEnabled: PropTypes.bool,
 
+  /**
+   * A Boolean indicating whether on marker press the map will move to the pressed marker
+   * Default value is `true`
+   *
+   * @platform android
+   */
+  moveOnMarkerPress: PropTypes.bool,
+
   /**
    * A Boolean indicating whether the map shows scale information.
    * Default value is `false`