[ios] Map view can now be optionally configured to make pitch adjustments w…

platform/ios/CHANGELOG.md

@@ -16,6 +16,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
 * Fixed a crash when switching between two styles having layers with the same identifier but different layer types. ([#12432](https://github.com/mapbox/mapbox-gl-native/issues/12432))
 * Fixed an issue where the symbols for `MGLMapPointForCoordinate` could not be found. ([#12445](https://github.com/mapbox/mapbox-gl-native/issues/12445))
 * Fixed an issue causing country and ocean labels to disappear after calling `-[MGLStyle localizeLabelsIntoLocale:]` when the system language is set to Simplified Chinese. ([#12164](https://github.com/mapbox/mapbox-gl-native/issues/12164))
+* Added a new method `-[MGLMapView setCamera:edgePadding:]` that sets the camera with arbitrary insets. ([#12518](https://github.com/mapbox/mapbox-gl-native/pull/12518))
 
 ## 4.2.0 - July 18, 2018
 

platform/ios/src/MGLMapView.h

@@ -856,6 +856,15 @@ MGL_EXPORT IB_DESIGNABLE
  */
 - (void)setCamera:(MGLMapCamera *)camera animated:(BOOL)animated;
 
+/**
+ Moves the viewpoint to a different location without using a transition.
+
+ @param camera The new viewpoint.
+ @param edgePadding The minimum padding (in screen points) that would be visible
+
+ */
+- (void)setCamera:(MGLMapCamera *)camera edgePadding:(UIEdgeInsets)edgePadding;
+
 /**
  Moves the viewpoint to a different location with respect to the map with an
  optional transition duration and timing function.

platform/ios/src/MGLMapView.mm

@@ -240,6 +240,9 @@ @interface MGLMapView () <UIGestureRecognizerDelegate,
 @property (nonatomic) MGLUserLocation *userLocation;
 @property (nonatomic) NSMutableDictionary<NSString *, NSMutableArray<MGLAnnotationView *> *> *annotationViewReuseQueueByIdentifier;
 
+/// A Boolean value that determines whether the updating pitch will also affect the altitude.
+@property(nonatomic, getter=isCameraAltitudeAffectedByPitch) BOOL cameraAltitudeAffectedByPitch;
+
 @end
 
 @implementation MGLMapView
@@ -536,6 +539,8 @@ - (void)commonInit
  [self addGestureRecognizer:_twoFingerTap];
 
  _hapticFeedbackEnabled = YES;
+
+ _cameraAltitudeAffectedByPitch = YES;
 
  _decelerationRate = MGLMapViewDecelerationRateNormal;
 
@@ -2352,7 +2357,8 @@ - (void)resetPosition
  auto camera = _mbglMap->getStyle().getDefaultCamera();
  CGFloat pitch = *camera.pitch;
  CLLocationDirection heading = mbgl::util::wrap(*camera.angle, 0., 360.);
- CLLocationDistance distance = MGLAltitudeForZoomLevel(*camera.zoom, pitch, 0, self.frame.size);
+ CLLocationDegrees pitchForAltitude = self.isCameraAltitudeAffectedByPitch ? pitch : 0.0;
+ CLLocationDistance distance = MGLAltitudeForZoomLevel(*camera.zoom, pitchForAltitude, 0, self.frame.size);
  self.camera = [MGLMapCamera cameraLookingAtCenterCoordinate:MGLLocationCoordinate2DFromLatLng(*camera.center)
  fromDistance:distance
  pitch:pitch
@@ -3257,6 +3263,11 @@ - (void)setCamera:(MGLMapCamera *)camera
  [self setCamera:camera animated:NO];
 }
 
+- (void)setCamera:(MGLMapCamera *)camera edgePadding:(UIEdgeInsets)edgePadding
+{
+ [self setCamera:camera withDuration:0 animationTimingFunction:nil edgePadding:edgePadding completionHandler:nil];
+}
+
 - (void)setCamera:(MGLMapCamera *)camera animated:(BOOL)animated
 {
  [self setCamera:camera withDuration:animated ? MGLAnimationDuration : 0 animationTimingFunction:nil];
@@ -3428,7 +3439,8 @@ - (MGLMapCamera *)cameraForCameraOptions:(const mbgl::CameraOptions &)cameraOpti
  double zoomLevel = cameraOptions.zoom ? *cameraOptions.zoom : self.zoomLevel;
  CLLocationDirection direction = cameraOptions.angle ? mbgl::util::wrap(-MGLDegreesFromRadians(*cameraOptions.angle), 0., 360.) : self.direction;
  CGFloat pitch = cameraOptions.pitch ? MGLDegreesFromRadians(*cameraOptions.pitch) : _mbglMap->getPitch();
- CLLocationDistance altitude = MGLAltitudeForZoomLevel(zoomLevel, pitch, centerCoordinate.latitude, self.frame.size);
+ CLLocationDegrees pitchForAltitude = self.isCameraAltitudeAffectedByPitch ? pitch : 0.0;
+ CLLocationDistance altitude = MGLAltitudeForZoomLevel(zoomLevel, pitchForAltitude, centerCoordinate.latitude, self.frame.size);
  return [MGLMapCamera cameraLookingAtCenterCoordinate:centerCoordinate fromDistance:altitude pitch:pitch heading:direction];
 }
 
@@ -3442,7 +3454,8 @@ - (MGLMapCamera *)cameraForCameraOptions:(const mbgl::CameraOptions &)cameraOpti
  options.center = MGLLatLngFromLocationCoordinate2D(camera.centerCoordinate);
  }
  options.padding = MGLEdgeInsetsFromNSEdgeInsets(insets);
- options.zoom = MGLZoomLevelForAltitude(camera.altitude, camera.pitch,
+ CLLocationDegrees pitch = (self.isCameraAltitudeAffectedByPitch) ? camera.pitch : 0.0;
+ options.zoom = MGLZoomLevelForAltitude(camera.altitude, pitch,
  camera.centerCoordinate.latitude,
  self.frame.size);
  if (camera.heading >= 0)
@@ -5144,10 +5157,11 @@ - (void)didUpdateLocationSignificantlyAnimated:(BOOL)animated
  MGLMapCamera *camera = self.camera;
  camera.centerCoordinate = self.userLocation.location.coordinate;
  camera.heading = self.directionByFollowingWithCourse;
+ CLLocationDegrees pitch = (self.isCameraAltitudeAffectedByPitch) ? camera.pitch : 0.0;
  if (self.zoomLevel < MGLMinimumZoomLevelForUserTracking)
  {
  camera.altitude = MGLAltitudeForZoomLevel(MGLDefaultZoomLevelForUserTracking,
- camera.pitch,
+ pitch,
  camera.centerCoordinate.latitude,
  self.frame.size);
  }

platform/macos/CHANGELOG.md

@@ -7,6 +7,10 @@
 * Token string syntax (`"{token}"`) in `MGLSymbolStyleLayer` `text` and `iconImageName` properties is now correctly converted to the appropriate `NSExpression` equivalent. ([#11659](https://github.com/mapbox/mapbox-gl-native/issues/11659))
 * Fixed a crash when switching between two styles having layers with the same identifier but different layer types. ([#12432](https://github.com/mapbox/mapbox-gl-native/issues/12432))
 
+## Other changes
+
+* Added a new method `-[MGLMapView setCamera:edgePadding:]` that sets the camera with arbitrary insets. ([#12518](https://github.com/mapbox/mapbox-gl-native/pull/12518))
+
 # 0.9.0 - July 18, 2018
 
 ## Styles and rendering

platform/macos/src/MGLMapView.h

@@ -308,6 +308,15 @@ MGL_EXPORT IB_DESIGNABLE
  */
 - (void)setCamera:(MGLMapCamera *)camera animated:(BOOL)animated;
 
+/**
+ Moves the viewpoint to a different location without using a transition.
+
+ @param camera The new viewpoint.
+ @param edgePadding The minimum padding (in screen points) that would be visible
+
+ */
+- (void)setCamera:(MGLMapCamera *)camera edgePadding:(NSEdgeInsets)edgePadding;
+
 /**
  Moves the viewpoint to a different location with respect to the map with an
  optional transition duration and timing function.

platform/macos/src/MGLMapView.mm

@@ -1124,6 +1124,11 @@ - (void)setCamera:(MGLMapCamera *)camera animated:(BOOL)animated {
  [self setCamera:camera withDuration:animated ? MGLAnimationDuration : 0 animationTimingFunction:nil completionHandler:NULL];
 }
 
+- (void)setCamera:(MGLMapCamera *)camera edgePadding:(NSEdgeInsets)edgePadding
+{
+ [self setCamera:camera withDuration:0 animationTimingFunction:nil edgePadding:edgePadding completionHandler:nil];
+}
+
 - (void)setCamera:(MGLMapCamera *)camera withDuration:(NSTimeInterval)duration animationTimingFunction:(nullable CAMediaTimingFunction *)function completionHandler:(nullable void (^)(void))completion {
  [self setCamera:camera withDuration:duration animationTimingFunction:function edgePadding:self.contentInsets completionHandler:completion];
 }