diff options
Diffstat (limited to 'platform/macos/src')
| -rw-r--r-- | platform/macos/src/MGLMapView.h | 108 | ||||
| -rw-r--r-- | platform/macos/src/MGLMapView.mm | 61 |
2 files changed, 137 insertions, 32 deletions
diff --git a/platform/macos/src/MGLMapView.h b/platform/macos/src/MGLMapView.h index 35db5257d9..fbe57524b8 100644 --- a/platform/macos/src/MGLMapView.h +++ b/platform/macos/src/MGLMapView.h @@ -434,8 +434,16 @@ MGL_EXPORT IB_DESIGNABLE - (void)setVisibleCoordinateBounds:(MGLCoordinateBounds)bounds animated:(BOOL)animated; /** - Changes the receiver’s viewport to fit the given coordinate bounds and - optionally some additional padding on each side. + Changes the receiver’s viewport to fit the given coordinate bounds with some + additional padding on each side. + + To bring both sides of the antimeridian or international date line into view, + specify some longitudes less than −180 degrees or greater than 180 degrees. For + example, to show both Tokyo and San Francisco simultaneously, you could set the + visible bounds to extend from (35.68476, −220.24257) to (37.78428, −122.41310). + + To specify a completion handler to execute after the animation finishes, use + the `-setVisibleCoordinateBounds:edgePadding:animated:completionHandler:` method. @param bounds The bounds that the viewport will show in its entirety. @param insets The minimum padding (in screen points) that will be visible @@ -446,6 +454,24 @@ MGL_EXPORT IB_DESIGNABLE - (void)setVisibleCoordinateBounds:(MGLCoordinateBounds)bounds edgePadding:(NSEdgeInsets)insets animated:(BOOL)animated; /** + Changes the receiver’s viewport to fit the given coordinate bounds with some + additional padding on each side, optionally calling a completion handler. + + To bring both sides of the antimeridian or international date line into view, + specify some longitudes less than −180 degrees or greater than 180 degrees. For + example, to show both Tokyo and San Francisco simultaneously, you could set the + visible bounds to extend from (35.68476, −220.24257) to (37.78428, −122.41310). + + @param bounds The bounds that the viewport will show in its entirety. + @param insets The minimum padding (in screen points) that will be visible + around the given coordinate bounds. + @param animated Specify `YES` to animate the change by smoothly scrolling and + zooming or `NO` to immediately display the given bounds. + @param completion The block executed after the animation finishes. + */ +- (void)setVisibleCoordinateBounds:(MGLCoordinateBounds)bounds edgePadding:(NSEdgeInsets)insets animated:(BOOL)animated completionHandler:(nullable void (^)(void))completion; + +/** Sets the visible region so that the map displays the specified annotations. Calling this method updates the value in the `visibleCoordinateBounds` property @@ -465,6 +491,9 @@ MGL_EXPORT IB_DESIGNABLE Calling this method updates the value in the `visibleCoordinateBounds` property and potentially other properties to reflect the new map region. + + To specify a completion handler to execute after the animation finishes, use + the `-showAnnotations:edgePadding:animated:completionHandler:` method. @param annotations The annotations that you want to be visible in the map. @param insets The minimum padding (in screen points) around the edges of the @@ -475,6 +504,23 @@ MGL_EXPORT IB_DESIGNABLE - (void)showAnnotations:(NSArray<id <MGLAnnotation>> *)annotations edgePadding:(NSEdgeInsets)insets animated:(BOOL)animated; /** + Sets the visible region so that the map displays the specified annotations with + the specified amount of padding on each side and an optional completion + handler. + + Calling this method updates the value in the `visibleCoordinateBounds` property + and potentially other properties to reflect the new map region. + + @param annotations The annotations that you want to be visible in the map. + @param insets The minimum padding (in screen points) around the edges of the + map view to keep clear of annotations. + @param animated `YES` if you want the map region change to be animated, or `NO` + if you want the map to display the new region immediately without animations. + @param completion The block executed after the animation finishes. + */ +- (void)showAnnotations:(NSArray<id <MGLAnnotation>> *)annotations edgePadding:(NSEdgeInsets)insets animated:(BOOL)animated completionHandler:(nullable void (^)(void))completion; + +/** Returns the camera that best fits the given coordinate bounds. @param bounds The coordinate bounds to fit to the receiver’s viewport. @@ -486,8 +532,8 @@ MGL_EXPORT IB_DESIGNABLE - (MGLMapCamera *)cameraThatFitsCoordinateBounds:(MGLCoordinateBounds)bounds; /** - Returns the camera that best fits the given coordinate bounds, optionally with - some additional padding on each side. + Returns the camera that best fits the given coordinate bounds with some + additional padding on each side. @param bounds The coordinate bounds to fit to the receiver’s viewport. @param insets The minimum padding (in screen points) that would be visible @@ -500,8 +546,9 @@ MGL_EXPORT IB_DESIGNABLE - (MGLMapCamera *)cameraThatFitsCoordinateBounds:(MGLCoordinateBounds)bounds edgePadding:(NSEdgeInsets)insets; /** - Returns the camera that best fits the given coordinate bounds, with the specified camera, - optionally with some additional padding on each side. + Returns the camera that best fits the given coordinate bounds with some + additional padding on each side, matching an existing camera as much as + possible. @param camera The camera that the return camera should adhere to. All values on this camera will be manipulated except for pitch and direction. @@ -516,8 +563,8 @@ MGL_EXPORT IB_DESIGNABLE - (MGLMapCamera *)camera:(MGLMapCamera *)camera fittingCoordinateBounds:(MGLCoordinateBounds)bounds edgePadding:(NSEdgeInsets)insets; /** - Returns the camera that best fits the given shape, with the specified camera, - optionally with some additional padding on each side. + Returns the camera that best fits the given shape with some additional padding + on each side, matching an existing camera as much as possible. @param camera The camera that the return camera should adhere to. All values on this camera will be manipulated except for pitch and direction. @@ -525,22 +572,23 @@ MGL_EXPORT IB_DESIGNABLE @param insets The minimum padding (in screen points) that would be visible around the returned camera object if it were set as the receiver’s camera. @return A camera object centered on the shape's center with zoom level as high - (close to the ground) as possible while still including the entire shape. The - initial camera's pitch and direction will be honored. + (close to the ground) as possible while still including the entire shape. + The initial camera's pitch and direction will be honored. */ - (MGLMapCamera *)camera:(MGLMapCamera *)camera fittingShape:(MGLShape *)shape edgePadding:(NSEdgeInsets)insets; /** - Returns the camera that best fits the given shape, with the specified direction, - optionally with some additional padding on each side. + Returns the camera that best fits the given shape with some additional padding + on each side while looking in the specified direction. @param shape The shape to fit to the receiver’s viewport. - @param direction The direction of the viewport, measured in degrees clockwise from true north. + @param direction The direction of the viewport, measured in degrees clockwise + from true north. @param insets The minimum padding (in screen points) that would be visible around the returned camera object if it were set as the receiver’s camera. - @return A camera object centered on the shape's center with zoom level as high - (close to the ground) as possible while still including the entire shape. The - camera object uses the current pitch. + @return A camera object centered on the shape's center with zoom level as high + (close to the ground) as possible while still including the entire shape. + The camera object uses the current pitch. */ - (MGLMapCamera *)cameraThatFitsShape:(MGLShape *)shape direction:(CLLocationDirection)direction edgePadding:(NSEdgeInsets)insets; @@ -589,6 +637,9 @@ MGL_EXPORT IB_DESIGNABLE When the value of the `automaticallyAdjustsContentInsets` property is `YES`, the value of this property may be overridden at any time. + + To specify a completion handler to execute after the animation finishes, use + the `-setContentInsets:animated:completionHandler:` method. @param contentInsets The new values to inset the content by. @param animated Specify `YES` if you want the map view to animate the change to @@ -597,6 +648,28 @@ MGL_EXPORT IB_DESIGNABLE */ - (void)setContentInsets:(NSEdgeInsets)contentInsets animated:(BOOL)animated; +/** + Sets the distance from the edges of the map view’s frame to the edges of the + map view’s logical viewport with an optional transition animation and + completion handler. + + When the value of this property is equal to `NSEdgeInsetsZero`, viewport + properties such as `centerCoordinate` assume a viewport that matches the map + view’s frame. Otherwise, those properties are inset, excluding part of the + frame from the viewport. For instance, if the only the top edge is inset, the + map center is effectively shifted downward. + + When the value of the `automaticallyAdjustsContentInsets` property is `YES`, + the value of this property may be overridden at any time. + + @param contentInsets The new values to inset the content by. + @param animated Specify `YES` if you want the map view to animate the change to + the content insets or `NO` if you want the map to inset the content + immediately. + @param completion The block executed after the animation finishes. + */ +- (void)setContentInsets:(NSEdgeInsets)contentInsets animated:(BOOL)animated completionHandler:(nullable void (^)(void))completion; + #pragma mark Configuring How the User Interacts with the Map /** @@ -784,9 +857,6 @@ MGL_EXPORT IB_DESIGNABLE annotation is *not* centered within the viewport. @param annotation The annotation object to select. - - @note In versions prior to `4.0.0` selecting an offscreen annotation did not - change the camera. */ - (void)selectAnnotation:(id <MGLAnnotation>)annotation; diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index 0a1ec5516a..ad3d1eee51 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -1010,13 +1010,26 @@ public: } - (void)setCenterCoordinate:(CLLocationCoordinate2D)centerCoordinate animated:(BOOL)animated { + [self setCenterCoordinate:centerCoordinate animated:animated completionHandler:nil]; +} + +- (void)setCenterCoordinate:(CLLocationCoordinate2D)centerCoordinate animated:(BOOL)animated completionHandler:(nullable void (^)(void))completion { MGLLogDebug(@"Setting centerCoordinate: %@ animated: %@", MGLStringFromCLLocationCoordinate2D(centerCoordinate), MGLStringFromBOOL(animated)); + mbgl::AnimationOptions animationOptions = MGLDurationFromTimeInterval(animated ? MGLAnimationDuration : 0); + animationOptions.transitionFinishFn = ^() { + [self didChangeValueForKey:@"centerCoordinate"]; + if (completion) { + dispatch_async(dispatch_get_main_queue(), ^{ + completion(); + }); + } + }; + [self willChangeValueForKey:@"centerCoordinate"]; _mbglMap->easeTo(mbgl::CameraOptions() .withCenter(MGLLatLngFromLocationCoordinate2D(centerCoordinate)) .withPadding(MGLEdgeInsetsFromNSEdgeInsets(self.contentInsets)), - MGLDurationFromTimeInterval(animated ? MGLAnimationDuration : 0)); - [self didChangeValueForKey:@"centerCoordinate"]; + animationOptions); } - (void)offsetCenterCoordinateBy:(NSPoint)delta animated:(BOOL)animated { @@ -1296,6 +1309,10 @@ public: } - (void)setVisibleCoordinateBounds:(MGLCoordinateBounds)bounds edgePadding:(NSEdgeInsets)insets animated:(BOOL)animated { + [self setVisibleCoordinateBounds:bounds edgePadding:insets animated:animated completionHandler:nil]; +} + +- (void)setVisibleCoordinateBounds:(MGLCoordinateBounds)bounds edgePadding:(NSEdgeInsets)insets animated:(BOOL)animated completionHandler:(nullable void (^)(void))completion { _mbglMap->cancelTransitions(); mbgl::EdgeInsets padding = MGLEdgeInsetsFromNSEdgeInsets(insets); @@ -1308,12 +1325,18 @@ public: MGLMapCamera *camera = [self cameraForCameraOptions:cameraOptions]; if ([self.camera isEqualToMapCamera:camera]) { + completion(); return; } [self willChangeValueForKey:@"visibleCoordinateBounds"]; animationOptions.transitionFinishFn = ^() { [self didChangeValueForKey:@"visibleCoordinateBounds"]; + if (completion) { + dispatch_async(dispatch_get_main_queue(), ^{ + completion(); + }); + } }; _mbglMap->easeTo(cameraOptions, animationOptions); } @@ -1413,8 +1436,14 @@ public: } - (void)setContentInsets:(NSEdgeInsets)contentInsets animated:(BOOL)animated { - + [self setContentInsets:contentInsets animated:animated completionHandler:nil]; +} + +- (void)setContentInsets:(NSEdgeInsets)contentInsets animated:(BOOL)animated completionHandler:(nullable void (^)(void))completion { if (NSEdgeInsetsEqual(contentInsets, self.contentInsets)) { + if (completion) { + completion(); + } return; } MGLLogDebug(@"Setting contentInset: %@ animated:", MGLStringFromNSEdgeInsets(contentInsets), MGLStringFromBOOL(animated)); @@ -1423,7 +1452,7 @@ public: // content insets. CLLocationCoordinate2D oldCenter = self.centerCoordinate; _contentInsets = contentInsets; - [self setCenterCoordinate:oldCenter animated:animated]; + [self setCenterCoordinate:oldCenter animated:animated completionHandler:completion]; } #pragma mark Mouse events and gestures @@ -2465,25 +2494,31 @@ public: } - (void)showAnnotations:(NSArray<id <MGLAnnotation>> *)annotations edgePadding:(NSEdgeInsets)insets animated:(BOOL)animated { - if ( ! annotations || ! annotations.count) return; + [self showAnnotations:annotations edgePadding:insets animated:animated completionHandler:nil]; +} + +- (void)showAnnotations:(NSArray<id <MGLAnnotation>> *)annotations edgePadding:(NSEdgeInsets)insets animated:(BOOL)animated completionHandler:(nullable void (^)(void))completion { + if (!annotations.count) { + if (completion) { + completion(); + } + return; + } mbgl::LatLngBounds bounds = mbgl::LatLngBounds::empty(); - for (id <MGLAnnotation> annotation in annotations) - { - if ([annotation conformsToProtocol:@protocol(MGLOverlay)]) - { + for (id <MGLAnnotation> annotation in annotations) { + if ([annotation conformsToProtocol:@protocol(MGLOverlay)]) { bounds.extend(MGLLatLngBoundsFromCoordinateBounds(((id <MGLOverlay>)annotation).overlayBounds)); - } - else - { + } else { bounds.extend(MGLLatLngFromLocationCoordinate2D(annotation.coordinate)); } } [self setVisibleCoordinateBounds:MGLCoordinateBoundsFromLatLngBounds(bounds) edgePadding:insets - animated:animated]; + animated:animated + completionHandler:completion]; } /// Returns a popover detailing the annotation. |