diff options
| author | Julian Rex <julian.rex@mapbox.com> | 2018-02-09 12:05:16 -0500 |
|---|---|---|
| committer | Julian Rex <julian.rex@mapbox.com> | 2018-02-09 16:33:29 -0500 |
| commit | 6259ef642a914071816ee07ae65c0a1c033836b1 (patch) | |
| tree | f25b5c1ff463a8e783a99956e3d9911473cb42f9 | |
| parent | ed00f2516b4b49fd2f847b42b0636790a90babf6 (diff) | |
| download | qtlocation-mapboxgl-6259ef642a914071816ee07ae65c0a1c033836b1.tar.gz | |
[ios] Fixed issue with quick zoom not firing if new single tap delegate method is implemented.
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 10 | ||||
| -rw-r--r-- | platform/ios/uitest/MapViewTests.m | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index ea437887c4..233ffa164c 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -504,10 +504,6 @@ public: _doubleTap.numberOfTapsRequired = 2; [self addGestureRecognizer:_doubleTap]; - _singleTapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleSingleTapGesture:)]; - [_singleTapGestureRecognizer requireGestureRecognizerToFail:_doubleTap]; - _singleTapGestureRecognizer.delegate = self; - [self addGestureRecognizer:_singleTapGestureRecognizer]; _twoFingerDrag = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handleTwoFingerDragGesture:)]; _twoFingerDrag.minimumNumberOfTouches = 2; @@ -532,6 +528,12 @@ public: [_quickZoom requireGestureRecognizerToFail:_doubleTap]; [self addGestureRecognizer:_quickZoom]; + _singleTapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleSingleTapGesture:)]; + [_singleTapGestureRecognizer requireGestureRecognizerToFail:_doubleTap]; + _singleTapGestureRecognizer.delegate = self; + [_singleTapGestureRecognizer requireGestureRecognizerToFail:_quickZoom]; + [self addGestureRecognizer:_singleTapGestureRecognizer]; + // observe app activity // [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willTerminate) name:UIApplicationWillTerminateNotification object:nil]; diff --git a/platform/ios/uitest/MapViewTests.m b/platform/ios/uitest/MapViewTests.m index 52b88be80c..a64bc44f30 100644 --- a/platform/ios/uitest/MapViewTests.m +++ b/platform/ios/uitest/MapViewTests.m @@ -543,7 +543,7 @@ [[NSNotificationCenter defaultCenter] postNotificationName:@"regionDidChangeAnimated" object:mapView userInfo:@{ @"animated" : @(animated), - @"reason" : reason + @"reason" : @(reason) }]; } |