Merge branch 'release-boba' into masterupstream/fabian-merge-release-4.0.1-master

# Conflicts:
#	mapbox-gl-js
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/gradle/dependencies.gradle
#	platform/darwin/src/MGLVectorTileSource.mm
#	platform/darwin/src/MGLVectorTileSource_Private.h
#	platform/ios/CHANGELOG.md
#	src/mbgl/style/expression/compound_expression.cpp

5 files changed, 56 insertions, 20 deletions

diff --git a/platform/ios/src/MGLAnnotationView.mm b/platform/ios/src/MGLAnnotationView.mm
index 1c53ba507a..46b0f56a79 100644
--- a/platform/ios/src/MGLAnnotationView.mm
+++ b/platform/ios/src/MGLAnnotationView.mm
@@ -11,8 +11,9 @@
 
 @property (nonatomic, readwrite, nullable) NSString *reuseIdentifier;
 @property (nonatomic, readwrite) CATransform3D lastAppliedScaleTransform;
-@property (nonatomic, readwrite) CATransform3D lastAppliedRotateTransform;
 @property (nonatomic, readwrite) CGFloat lastPitch;
+@property (nonatomic, readwrite) CATransform3D lastAppliedRotationTransform;
+@property (nonatomic, readwrite) CGFloat lastDirection;
 @property (nonatomic, weak) UIPanGestureRecognizer *panGestureRecognizer;
 @property (nonatomic, weak) UILongPressGestureRecognizer *longPressRecognizer;
 @property (nonatomic, weak) MGLMapView *mapView;
@@ -43,9 +44,9 @@
 
 - (void)commonInitWithAnnotation:(nullable id<MGLAnnotation>)annotation reuseIdentifier:(nullable NSString *)reuseIdentifier {
     _lastAppliedScaleTransform = CATransform3DIdentity;
+    _lastAppliedRotationTransform = CATransform3DIdentity;
     _annotation = annotation;
     _reuseIdentifier = [reuseIdentifier copy];
-    _scalesWithViewingDistance = NO;
     _enabled = YES;
 }
 
@@ -159,7 +160,7 @@
 
         // We keep track of each viewing distance scale transform that we apply. Each iteration,
         // we can account for it so that we don't get cumulative scaling every time we move.
-        // We also avoid clobbering any existing transform passed in by the client, too.
+        // We also avoid clobbering any existing transform passed in by the client or this SDK.
         CATransform3D undoOfLastScaleTransform = CATransform3DInvert(_lastAppliedScaleTransform);
         CATransform3D newScaleTransform = CATransform3DMakeScale(pitchAdjustedScale, pitchAdjustedScale, 1);
         CATransform3D effectiveTransform = CATransform3DConcat(undoOfLastScaleTransform, newScaleTransform);
@@ -181,11 +182,20 @@
 {
     if (self.rotatesToMatchCamera == NO) return;
 
-    CGFloat directionRad = self.mapView.direction * M_PI / 180.0;
-    CATransform3D newRotateTransform = CATransform3DMakeRotation(-directionRad, 0, 0, 1);
-    self.layer.transform = CATransform3DConcat(CATransform3DIdentity, newRotateTransform);
-    
-    _lastAppliedRotateTransform = newRotateTransform;
+    CGFloat direction = -MGLRadiansFromDegrees(self.mapView.direction);
+
+    // Return early if the map view has the same rotation as the already-applied transform.
+    if (direction == _lastDirection) return;
+    _lastDirection = direction;
+
+    // We keep track of each rotation transform that we apply. Each iteration,
+    // we can account for it so that we don't get cumulative rotation every time we move.
+    // We also avoid clobbering any existing transform passed in by the client or this SDK.
+    CATransform3D undoOfLastRotationTransform = CATransform3DInvert(_lastAppliedRotationTransform);
+    CATransform3D newRotationTransform = CATransform3DMakeRotation(direction, 0, 0, 1);
+    CATransform3D effectiveTransform = CATransform3DConcat(undoOfLastRotationTransform, newRotationTransform);
+    self.layer.transform = CATransform3DConcat(self.layer.transform, effectiveTransform);
+    _lastAppliedRotationTransform = newRotationTransform;
 }
 
 #pragma mark - Draggable
diff --git a/platform/ios/src/MGLMapView.h b/platform/ios/src/MGLMapView.h
index bde8e6a71d..fd0ca19b26 100644
--- a/platform/ios/src/MGLMapView.h
+++ b/platform/ios/src/MGLMapView.h
@@ -1065,7 +1065,7 @@ MGL_EXPORT IB_DESIGNABLE
  */
 - (CLLocationDistance)metersPerPointAtLatitude:(CLLocationDegrees)latitude;
 
-- (CLLocationDistance)metersPerPixelAtLatitude:(CLLocationDegrees)latitude __attribute__((deprecated("Use -metersPerPointAtLatitude:.")));
+- (CLLocationDistance)metersPerPixelAtLatitude:(CLLocationDegrees)latitude __attribute__((unavailable("Use -metersPerPointAtLatitude:.")));
 
 #pragma mark Annotating the Map
 
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 978547b9c6..26b23abb4e 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -49,7 +49,7 @@
 #import "NSBundle+MGLAdditions.h"
 #import "NSDate+MGLAdditions.h"
 #import "NSException+MGLAdditions.h"
-#import "NSPredicate+MGLAdditions.h"
+#import "NSPredicate+MGLPrivateAdditions.h"
 #import "NSProcessInfo+MGLAdditions.h"
 #import "NSString+MGLAdditions.h"
 #import "NSURL+MGLAdditions.h"
@@ -4280,6 +4280,15 @@ public:
         moveOnscreen = [self isBringingAnnotationOnscreenSupportedForAnnotation:annotation animated:animateSelection];
     }
 
+    // If we have an invalid positioning rect, we need to provide a suitable default.
+    // This (currently) happens if you select an annotation that has NOT yet been
+    // added. See https://github.com/mapbox/mapbox-gl-native/issues/11476
+    if (CGRectIsNull(calloutPositioningRect)) {
+        CLLocationCoordinate2D origin = annotation.coordinate;
+        CGPoint originPoint = [self convertCoordinate:origin toPointToView:self];
+        calloutPositioningRect = { .origin = originPoint, .size = CGSizeZero };
+    }
+
     CGRect expandedPositioningRect = UIEdgeInsetsInsetRect(calloutPositioningRect, MGLMapViewOffscreenAnnotationPadding);
 
     // Used for callout positioning, and moving offscreen annotations onscreen.
@@ -4432,7 +4441,11 @@ public:
 {
     MGLAnnotationTag annotationTag = [self annotationTagForAnnotation:annotation];
     CGRect positioningRect = [self positioningRectForCalloutForAnnotationWithTag:annotationTag];
-    
+
+    if (CGRectIsNull(positioningRect)) {
+        return positioningRect;
+    }
+
     // For annotations which `coordinate` falls offscreen it will use the current tap point as anchor instead.
     if ( ! CGRectIntersectsRect(positioningRect, self.bounds) && annotation != self.userLocation)
     {
@@ -4452,15 +4465,15 @@ public:
     id <MGLAnnotation> annotation = [self annotationWithTag:annotationTag];
     if ( ! annotation)
     {
-        return CGRectZero;
+        return CGRectNull;
     }
     
     if ([annotation isKindOfClass:[MGLMultiPoint class]]) {
         CLLocationCoordinate2D origin = annotation.coordinate;
         CGPoint originPoint = [self convertCoordinate:origin toPointToView:self];
         return CGRectMake(originPoint.x, originPoint.y, MGLAnnotationImagePaddingForHitTest, MGLAnnotationImagePaddingForHitTest);
-        
     }
+    
     UIImage *image = [self imageOfAnnotationWithTag:annotationTag].image;
     if ( ! image)
     {
@@ -4547,6 +4560,8 @@ public:
         return;
     }
 
+    __weak __typeof__(self) weakSelf = self;
+
     // The user location callout view initially points to the user location
     // annotation’s implicit (visual) frame, which is offset from the
     // annotation’s explicit frame. Now the callout view needs to rendezvous
@@ -4560,10 +4575,16 @@ public:
                                  UIViewAnimationOptionBeginFromCurrentState)
                      animations:^
      {
+         __typeof__(self) strongSelf = weakSelf;
+         if ( ! strongSelf)
+         {
+             return;
+         }
+
          calloutView.frame = CGRectOffset(calloutView.frame,
-                                          _initialImplicitCalloutViewOffset.x,
-                                          _initialImplicitCalloutViewOffset.y);
-         _initialImplicitCalloutViewOffset = CGPointZero;
+                                          strongSelf->_initialImplicitCalloutViewOffset.x,
+                                          strongSelf->_initialImplicitCalloutViewOffset.y);
+         strongSelf->_initialImplicitCalloutViewOffset = CGPointZero;
      }
                      completion:NULL];
 }
@@ -5694,10 +5715,12 @@ public:
                 if (annotationView.layer.animationKeys.count > 0) {
                     continue;
                 }
+
                 // Move the annotation view far out of view to the left
-                CGRect adjustedFrame = annotationView.frame;
-                adjustedFrame.origin.x = -CGRectGetWidth(self.frame) * 10.0;
-                annotationView.frame = adjustedFrame;
+                CGPoint adjustedCenter = annotationView.center;
+                adjustedCenter.x = -CGRectGetWidth(self.frame) * 10.0;
+                annotationView.center = adjustedCenter;
+
                 [self enqueueAnnotationViewForAnnotationContext:annotationContext];
             }
         }
@@ -5733,6 +5756,8 @@ public:
             rect = annotationView.frame;
         }
 
+        NSAssert(!CGRectIsNull(rect), @"Positioning rect should not be CGRectNull by this point");
+
         CGPoint point = CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect));
 
         if ( ! CGPointEqualToPoint(calloutView.center, point)) {
diff --git a/platform/ios/src/Mapbox.h b/platform/ios/src/Mapbox.h
index 20417dbbd4..7beb8b766b 100644
--- a/platform/ios/src/Mapbox.h
+++ b/platform/ios/src/Mapbox.h
@@ -66,3 +66,4 @@ FOUNDATION_EXPORT MGL_EXPORT const unsigned char MapboxVersionString[];
 #import "MGLAttributionInfo.h"
 #import "MGLMapSnapshotter.h"
 #import "NSExpression+MGLAdditions.h"
+#import "NSPredicate+MGLAdditions.h"
diff --git a/platform/ios/src/UIColor+MGLAdditions.mm b/platform/ios/src/UIColor+MGLAdditions.mm
index 9ca39acda4..7c1fbddc20 100644
--- a/platform/ios/src/UIColor+MGLAdditions.mm
+++ b/platform/ios/src/UIColor+MGLAdditions.mm
@@ -66,7 +66,7 @@
     return [UIColor colorWithRed:[components[0].constantValue doubleValue] / 255.0
                            green:[components[1].constantValue doubleValue] / 255.0
                             blue:[components[2].constantValue doubleValue] / 255.0
-                           alpha:components.count == 3 ? [components[3].constantValue doubleValue] : 1.0];
+                           alpha:components.count == 3 ? 1.0 : [components[3].constantValue doubleValue]];
 }
 
 @end