summaryrefslogtreecommitdiff
path: root/platform/osx
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2015-12-15 12:51:15 -0800
committerMinh Nguyễn <mxn@1ec5.org>2015-12-15 12:52:13 -0800
commit4e0e8166539a03fb5180b813b27d8fff87850a37 (patch)
treec05687465673afaea1d81b0b276b4da913cc8c47 /platform/osx
parent5dd00d10720652852ede07b82a25c88cddc4892c (diff)
downloadqtlocation-mapboxgl-4e0e8166539a03fb5180b813b27d8fff87850a37.tar.gz
[ios, osx] Added flyToCamera: variation that uses default duration
Diffstat (limited to 'platform/osx')
-rw-r--r--platform/osx/app/AppDelegate.m2
-rw-r--r--platform/osx/src/MGLMapView.mm4
2 files changed, 5 insertions, 1 deletions
diff --git a/platform/osx/app/AppDelegate.m b/platform/osx/app/AppDelegate.m
index 1229e12a37..bb39613881 100644
--- a/platform/osx/app/AppDelegate.m
+++ b/platform/osx/app/AppDelegate.m
@@ -319,7 +319,7 @@ static const CLLocationCoordinate2D WorldTourDestinations[] = {
pitch:arc4random_uniform(60)
heading:arc4random_uniform(360)];
__weak AppDelegate *weakSelf = self;
- [self.mapView flyToCamera:camera withDuration:0 completionHandler:^{
+ [self.mapView flyToCamera:camera completionHandler:^{
AppDelegate *strongSelf = weakSelf;
[strongSelf performSelector:@selector(continueWorldTourWithRemainingAnnotations:)
withObject:annotations
diff --git a/platform/osx/src/MGLMapView.mm b/platform/osx/src/MGLMapView.mm
index 40e37bac20..8767c3041f 100644
--- a/platform/osx/src/MGLMapView.mm
+++ b/platform/osx/src/MGLMapView.mm
@@ -1008,6 +1008,10 @@ public:
[self didChangeValueForKey:@"camera"];
}
+- (void)flyToCamera:(MGLMapCamera *)camera completionHandler:(nullable void (^)(void))completion {
+ [self flyToCamera:camera withDuration:0 completionHandler:completion];
+}
+
- (void)flyToCamera:(MGLMapCamera *)camera withDuration:(NSTimeInterval)duration completionHandler:(nullable void (^)(void))completion {
_mbglMap->cancelTransitions();