From b98dbd21212e611235292236f0b23be1a77a6157 Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Thu, 20 Jun 2019 10:33:32 -0700 Subject: [ios] Require two fingers for duration of tilt gesture --- platform/ios/CHANGELOG.md | 4 ++++ platform/ios/src/MGLMapView.mm | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index d6583d277a..01d70385ac 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -2,6 +2,10 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started. +## 5.2.0 + +* Fixed an issue where the two-finger tilt gesture would continue after lifting one finger. ([#14969](https://github.com/mapbox/mapbox-gl-native/pull/14969)) + ## 5.1.0 - June 19, 2019 ### Styles and rendering diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 85a2e3be92..9693e3cff9 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -2062,6 +2062,12 @@ public: if (twoFingerDrag.state == UIGestureRecognizerStateBegan || twoFingerDrag.state == UIGestureRecognizerStateChanged) { + if (twoFingerDrag.numberOfTouches != 2) + { + twoFingerDrag.state = UIGestureRecognizerStateEnded; + return; + } + CGFloat gestureDistance = CGPoint([twoFingerDrag translationInView:twoFingerDrag.view]).y; CGFloat slowdown = 2.0; -- cgit v1.2.1