From 1a6b5137031d96dcbfb38d0e1a2289386502c7e4 Mon Sep 17 00:00:00 2001
From: Jason Wray <friedbunny@users.noreply.github.com>
Date: Wed, 29 Jun 2016 12:48:53 -0400
Subject: [ios] Fix conflict between view dragging gesture and quick zoom
 (#5506)

This stops the quick zoom gesture (double-tap and hold) from also triggering a drag, when performed on a draggable annotation view.
---
 platform/ios/src/MGLAnnotationView.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/ios/src/MGLAnnotationView.mm b/platform/ios/src/MGLAnnotationView.mm
index 7068cdc0db..3bbe2fcc84 100644
--- a/platform/ios/src/MGLAnnotationView.mm
+++ b/platform/ios/src/MGLAnnotationView.mm
@@ -238,7 +238,7 @@
 
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
 {
-    return YES;
+    return otherGestureRecognizer == _longPressRecognizer || otherGestureRecognizer == _panGestureRecognizer;
 }
 
 - (id<CAAction>)actionForLayer:(CALayer *)layer forKey:(NSString *)event
-- 
cgit v1.2.1