Merge pull request #1296 from mapbox/1258-deadpan

Cancel animations on touch down
2015-04-29 16:24:43 -04:00
parent e955e6cae2 261b6161f2
commit c48962ebf2
1 changed files with 9 additions and 0 deletions
--- a/platform/ios/MGLMapView.mm
+++ b/platform/ios/MGLMapView.mm
@@ -706,6 +706,15 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;

 #pragma clang diagnostic pop

+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    (void)touches;
+    (void)event;
+    mbglMap->cancelTransitions();
+    mbglMap->setGestureInProgress(false);
+    self.animatingGesture = NO;
+}
+
 - (void)handlePanGesture:(UIPanGestureRecognizer *)pan
 {
    if ( ! self.isScrollEnabled) return;