From 3ee56f50751ed8a018a8870052f5144290acfd62 Mon Sep 17 00:00:00 2001
From: Ben Clayton <ben@calvium.com>
Date: Mon, 29 Aug 2016 22:09:14 +0100
Subject: [PATCH] Expose pitchEnabled property (#407)

* Expose the 'pitchEnabled' property, so developer can turn off 'two-fingers to tile map' feature. iOS-only so far.

* Add `pitchEnabled` property to Android implementation

* add `pitchEnabled` to docs
---
 API.md                                              |  1 +
 .../ReactNativeMapboxGLManager.java                 |  5 +++++
 .../ReactNativeMapboxGLView.java                    | 10 ++++++++++
 index.js                                            |  2 ++
 ios/RCTMapboxGL/RCTMapboxGL.m                       | 13 +++++++++++--
 ios/RCTMapboxGL/RCTMapboxGLManager.m                |  1 +
 6 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/API.md b/API.md
index 2143064..289d7d3 100644
--- a/API.md
+++ b/API.md
@@ -29,6 +29,7 @@ import { MapView } from 'react-native-mapbox-gl';
 | `rotateEnabled` | `boolean`  |  Optional | Whether the map can rotate. | `true`  |
 | `scrollEnabled` | `boolean`  |  Optional | Whether the map can be scrolled. | `true`  |
 | `zoomEnabled` | `boolean`  |  Optional | Whether the map zoom level can be changed. | `true`  |
+| `pitchEnabled` | `boolean`  |  Optional | Whether the map pitch (tilt) level can be changed via a two-finger drag (iOS) or three-finger drag (Android). | `true`  |
 | `showsUserLocation` | `boolean` | Optional | Whether the user's location is shown on the map. Note: The map will not zoom to their location. | `false` |
 | `userTrackingMode` | `enum` | Optional | Wether the map is zoomed to and follows the user's location. One of `Mapbox.userTrackingMode.none`, `Mapbox.userTrackingMode.follow`, `Mapbox.userTrackingMode.followWithCourse`, `Mapbox.userTrackingMode.followWithHeading` | `Mapbox.userTrackingMode.none` |
 | `userLocationVerticalAlignment` | `enum` | Optional | Change the alignment of where the user location shows on the screen. One of `Mapbox.userLocationVerticalAlignment.top`, `Mapbox.userLocationVerticalAlignment.center`, `Mapbox.userLocationVerticalAlignment.bottom` | `Mapbox.userLocationVerticalAlignment.center` |
diff --git a/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java b/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java
index 301c22e..adaba93 100644
--- a/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java
+++ b/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java
@@ -131,6 +131,11 @@ public class ReactNativeMapboxGLManager extends SimpleViewManager<ReactNativeMap
         view.setZoomEnabled(value);
     }
 
+    @ReactProp(name = "pitchEnabled")
+    public void setPitchEnabled(ReactNativeMapboxGLView view, boolean value) {
+        view.setPitchEnabled(value);
+    }
+
     @ReactProp(name = "showsUserLocation")
     public void setShowsUserLocation(ReactNativeMapboxGLView view, boolean value) {
         view.setShowsUserLocation(value);
diff --git a/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLView.java b/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLView.java
index 788a933..f0164e0 100644
--- a/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLView.java
+++ b/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLView.java
@@ -56,6 +56,7 @@ public class ReactNativeMapboxGLView extends RelativeLayout implements
     private boolean _trackingModeUpdateScheduled = false;
     private boolean _showsUserLocation;
     private boolean _zoomEnabled = true;
+    private boolean _pitchEnabled = true;
     private boolean _scrollEnabled = true;
     private boolean _rotateEnabled = true;
     private boolean _enableOnRegionWillChange = false;
@@ -148,6 +149,7 @@ public class ReactNativeMapboxGLView extends RelativeLayout implements
         uiSettings.setZoomGesturesEnabled(_zoomEnabled);
         uiSettings.setScrollGesturesEnabled(_scrollEnabled);
         uiSettings.setRotateGesturesEnabled(_rotateEnabled);
+        uiSettings.setTiltGesturesEnabled(_pitchEnabled);
 
         // If these settings changed between setupMapView() and onMapReady(), coerce them to their right values
         // This doesn't happen in the current implementation of MapView, but let's be future proof
@@ -252,6 +254,14 @@ public class ReactNativeMapboxGLView extends RelativeLayout implements
         }
     }
 
+    public void setPitchEnabled(boolean value) {
+        if (_pitchEnabled == value) { return; }
+        _pitchEnabled = value;
+        if (_map != null) {
+            _map.getUiSettings().setTiltGesturesEnabled(value);
+        }
+    }
+
     public void setStyleURL(String styleURL) {
         if (styleURL.equals(_mapOptions.getStyle())) { return; }
         _mapOptions.styleUrl(styleURL);
diff --git a/index.js b/index.js
index d0aad08..25c6888 100644
--- a/index.js
+++ b/index.js
@@ -262,6 +262,7 @@ class MapView extends Component {
     rotateEnabled: PropTypes.bool,
     scrollEnabled: PropTypes.bool,
     zoomEnabled: PropTypes.bool,
+    pitchEnabled: PropTypes.bool,
     showsUserLocation: PropTypes.bool,
     styleURL: PropTypes.string.isRequired,
     userTrackingMode: PropTypes.number,
@@ -318,6 +319,7 @@ class MapView extends Component {
     debugActive: false,
     rotateEnabled: true,
     scrollEnabled: true,
+    pitchEnabled: true,
     showsUserLocation: false,
     styleURL: mapStyles.streets,
     userTrackingMode: userTrackingMode.none,
diff --git a/ios/RCTMapboxGL/RCTMapboxGL.m b/ios/RCTMapboxGL/RCTMapboxGL.m
index 1534c15..a0e6e09 100644
--- a/ios/RCTMapboxGL/RCTMapboxGL.m
+++ b/ios/RCTMapboxGL/RCTMapboxGL.m
@@ -31,6 +31,7 @@
     BOOL _finishedLoading;
     BOOL _rotateEnabled;
     BOOL _scrollEnabled;
+    BOOL _pitchEnabled;
     BOOL _showsUserLocation;
     NSURL *_styleURL;
     int _userTrackingMode;
@@ -91,6 +92,7 @@
     _map.rotateEnabled = _rotateEnabled;
     _map.scrollEnabled = _scrollEnabled;
     _map.zoomEnabled = _zoomEnabled;
+    _map.pitchEnabled = _pitchEnabled;
     _map.showsUserLocation = _showsUserLocation;
     _map.styleURL = _styleURL;
     _map.zoomLevel = _initialZoomLevel;
@@ -282,14 +284,21 @@
 {
     if (_scrollEnabled == scrollEnabled) { return; }
     _scrollEnabled = scrollEnabled;
-    if (_map) { _map.scrollEnabled; }
+    if (_map) { _map.scrollEnabled = scrollEnabled; }
 }
 
 - (void)setZoomEnabled:(BOOL)zoomEnabled
 {
     if (_zoomEnabled == zoomEnabled) { return; }
     _zoomEnabled = zoomEnabled;
-    if (_map) { _map.zoomEnabled; }
+    if (_map) { _map.zoomEnabled = zoomEnabled; }
+}
+
+- (void)setPitchEnabled:(BOOL)pitchEnabled
+{
+    if (_pitchEnabled == pitchEnabled) { return; }
+    _pitchEnabled = pitchEnabled;
+    if (_map) { _map.pitchEnabled = pitchEnabled; }
 }
 
 - (void)setShowsUserLocation:(BOOL)showsUserLocation
diff --git a/ios/RCTMapboxGL/RCTMapboxGLManager.m b/ios/RCTMapboxGL/RCTMapboxGLManager.m
index e48a5b7..8e7a4c2 100644
--- a/ios/RCTMapboxGL/RCTMapboxGLManager.m
+++ b/ios/RCTMapboxGL/RCTMapboxGLManager.m
@@ -43,6 +43,7 @@ RCT_EXPORT_VIEW_PROPERTY(debugActive, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(rotateEnabled, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(scrollEnabled, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(zoomEnabled, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(pitchEnabled, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(showsUserLocation, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(styleURL, NSURL);
 RCT_EXPORT_VIEW_PROPERTY(userTrackingMode, int);