Cherry picks for release 6.2.2

platform/ios/CHANGELOG.md

@@ -2,10 +2,16 @@
 
 Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started.
 
-## 6.2.1 - September 23, 2020
+## 6.2.2 - October 19, 2020
 
 ### 🐞 Bug fixes
 
+* Partly fixed an issue on iOS 14 where `-[UIView layoutSubviews]` was being repeatedly called. ([#501](https://github.com/mapbox/mapbox-gl-native-ios/pull/501))
+* Fixed a bug with UIViews being incorrectly updated with a one frame delay. ([#483](https://github.com/mapbox/mapbox-gl-native-ios/pull/483))
+* Fixed an issue on iOS 14 where scalebar triggers unnecessary `-[UIView layoutSubviews]`. ([#507](https://github.com/mapbox/mapbox-gl-native-ios/pull/507))
+
+## 6.2.1 - September 23, 2020
+
 * Fixed an issue where completion blocks were not called until the map was rendered. ([#463](https://github.com/mapbox/mapbox-gl-native-ios/pull/463))
 * Fixed an issue that caused a crash when custom location managers did not implement `MGLLocationManager.accuracyAuthorization`. ([#474](https://github.com/mapbox/mapbox-gl-native-ios/pull/474))
 * Fixed a crash that occurred when `MGLIdeographicFontFamilyName` was set to `NO`. ([#467](https://github.com/mapbox/mapbox-gl-native-ios/pull/467), [#476](https://github.com/mapbox/mapbox-gl-native-ios/pull/476))

platform/ios/Integration Test Harness/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.2.1</string>
+	<string>6.2.2</string>
 	<key>CFBundleVersion</key>
-	<string>15271</string>
+	<string>15275</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

platform/ios/Integration Tests/Info.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.2.1</string>
+	<string>6.2.2</string>
 	<key>CFBundleVersion</key>
-	<string>15271</string>
+	<string>15275</string>
 </dict>
 </plist>

platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  version = '6.2.1'
+  version = '6.2.2'
 
   m.name    = 'Mapbox-iOS-SDK-snapshot-dynamic'
   m.version = "#{version}-snapshot"
@@ -10,9 +10,9 @@ Pod::Spec.new do |m|
   m.homepage          = 'https://docs.mapbox.com/ios/maps/'
   m.license           = { :type => 'BSD', :file => 'LICENSE.md' }
   m.author            = { 'Mapbox' => '[email protected]' }
-  m.screenshot        = "https://docs.mapbox.com/ios/api/maps/#{version}/img/screenshot.png"
+  m.screenshot        = "https://docs.mapbox.com/ios/maps/api/#{version}/img/screenshot.png"
   m.social_media_url  = 'https://twitter.com/mapbox'
-  m.documentation_url = 'https://docs.mapbox.com/ios/api/maps/'
+  m.documentation_url = 'https://docs.mapbox.com/ios/maps/api/'
 
   m.source = {
     :http => "https://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/mapbox-ios-sdk-snapshot-dynamic.zip",

platform/ios/Mapbox-iOS-SDK-stripped.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  version = '6.2.1'
+  version = '6.2.2'
 
   m.name    = 'Mapbox-iOS-SDK-stripped'
   m.version = "#{version}-stripped"
@@ -10,9 +10,9 @@ Pod::Spec.new do |m|
   m.homepage          = 'https://docs.mapbox.com/ios/maps/'
   m.license           = { :type => 'BSD', :file => 'LICENSE.md' }
   m.author            = { 'Mapbox' => '[email protected]' }
-  m.screenshot        = "https://docs.mapbox.com/ios/api/maps/#{version}/img/screenshot.png"
+  m.screenshot        = "https://docs.mapbox.com/ios/maps/api/#{version}/img/screenshot.png"
   m.social_media_url  = 'https://twitter.com/mapbox'
-  m.documentation_url = 'https://docs.mapbox.com/ios/api/maps/'
+  m.documentation_url = 'https://docs.mapbox.com/ios/maps/api/'
 
   m.source = {    
     :http => "https://api.mapbox.com/downloads/v2/mobile-maps/releases/ios/packages/#{version.to_s}/mapbox-ios-sdk-stripped-dynamic.zip",

platform/ios/Mapbox-iOS-SDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  version = '6.2.1'
+  version = '6.2.2'
 
   m.name    = 'Mapbox-iOS-SDK'
   m.version = version
@@ -10,9 +10,9 @@ Pod::Spec.new do |m|
   m.homepage          = 'https://docs.mapbox.com/ios/maps/'
   m.license           = { :type => 'BSD', :file => 'LICENSE.md' }
   m.author            = { 'Mapbox' => '[email protected]' }
-  m.screenshot        = "https://docs.mapbox.com/ios/api/maps/#{version}/img/screenshot.png"
+  m.screenshot        = "https://docs.mapbox.com/ios/maps/api/#{version}/img/screenshot.png"
   m.social_media_url  = 'https://twitter.com/mapbox'
-  m.documentation_url = 'https://docs.mapbox.com/ios/api/maps/'
+  m.documentation_url = 'https://docs.mapbox.com/ios/maps/api/'
 
   m.source = {
     :http => "https://api.mapbox.com/downloads/v2/mobile-maps/releases/ios/packages/#{version.to_s}/mapbox-ios-sdk-dynamic.zip",

platform/ios/app/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.2.1</string>
+	<string>6.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>MBGL</string>
 	<key>CFBundleVersion</key>
-	<string>15271</string>
+	<string>15275</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocationTemporaryUsageDescriptionDictionary</key>

platform/ios/benchmark/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.2.1</string>
+	<string>6.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>MBGL</string>
 	<key>CFBundleVersion</key>
-	<string>15271</string>
+	<string>15275</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>

platform/ios/framework/Info-static.plist

@@ -11,11 +11,11 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.2.1</string>
+	<string>6.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>15271</string>
+	<string>15275</string>
 	<key>MGLCommitHash</key>
 	<string>$(CURRENT_COMMIT_HASH)</string>
 	<key>MGLSemanticVersionString</key>

platform/ios/framework/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.2.1</string>
+	<string>6.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>15271</string>
+	<string>15275</string>
 	<key>MGLCommitHash</key>
 	<string>$(CURRENT_COMMIT_HASH)</string>
 	<key>MGLSemanticVersionString</key>

platform/ios/ios.xcodeproj/project.pbxproj

@@ -3767,7 +3767,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 15271;
+				CURRENT_PROJECT_VERSION = 15275;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
@@ -3820,7 +3820,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 15271;
+				DYLIB_CURRENT_VERSION = 15275;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
@@ -3844,7 +3844,7 @@
 			buildSettings = {
 				BITCODE_GENERATION_MODE = bitcode;
 				DEFINES_MODULE = YES;
-				DYLIB_CURRENT_VERSION = 15271;
+				DYLIB_CURRENT_VERSION = 15275;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -3966,7 +3966,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 15271;
+				CURRENT_PROJECT_VERSION = 15275;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_TESTABILITY = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -3990,7 +3990,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 15271;
+				CURRENT_PROJECT_VERSION = 15275;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
@@ -4108,7 +4108,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 15271;
+				DYLIB_CURRENT_VERSION = 15275;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = framework/Info.plist;
@@ -4136,7 +4136,7 @@
 				DEFINES_MODULE = YES;
 				DEPLOYMENT_POSTPROCESSING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 15271;
+				DYLIB_CURRENT_VERSION = 15275;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
@@ -4183,7 +4183,7 @@
 			buildSettings = {
 				BITCODE_GENERATION_MODE = bitcode;
 				DEFINES_MODULE = YES;
-				DYLIB_CURRENT_VERSION = 15271;
+				DYLIB_CURRENT_VERSION = 15275;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -4208,7 +4208,7 @@
 				BITCODE_GENERATION_MODE = bitcode;
 				DEFINES_MODULE = YES;
 				DEPLOYMENT_POSTPROCESSING = YES;
-				DYLIB_CURRENT_VERSION = 15271;
+				DYLIB_CURRENT_VERSION = 15275;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",

platform/ios/src/MGLCompassButton.mm

@@ -12,6 +12,7 @@
 @interface MGLCompassButton ()
 
 @property (nonatomic, weak) MGLMapView *mapView;
+@property (nonatomic) CALayer *imageLayer;
 @property (nonatomic) MGLCompassDirectionFormatter *accessibilityCompassFormatter;
 
 @end
@@ -30,8 +31,21 @@ - (instancetype)initWithMapView:(MGLMapView *)mapView {
     return self;
 }
 
+- (void)setImage:(UIImage *)image {
+    self.imageLayer.contents = (id)image.CGImage;
+}
+
 - (void)commonInit {
-    self.image = self.compassImage;
+    UIImage *image = self.compassImage;
+    CGRect bounds = (CGRect){CGPointZero, image.size};
+    self.bounds = bounds;
+
+    self.imageLayer = [[CALayer alloc] init];
+    self.imageLayer.frame = bounds;
+    self.imageLayer.contentsGravity = kCAGravityResizeAspect;
+
+    self.image = image;
+    [self.layer addSublayer:self.imageLayer];
 
     self.compassVisibility = MGLOrnamentVisibilityAdaptive;
 
@@ -48,8 +62,6 @@ - (void)commonInit {
 
     self.accessibilityCompassFormatter = [[MGLCompassDirectionFormatter alloc] init];
     self.accessibilityCompassFormatter.unitStyle = NSFormattingUnitStyleLong;
-
-    [self sizeToFit];
 }
 
 - (void)setCompassVisibility:(MGLOrnamentVisibility)compassVisibility {
@@ -96,7 +108,11 @@ - (void)updateCompass {
 - (void)updateCompassAnimated:(BOOL)animated {
     CLLocationDirection direction = self.mapView.direction;
     CLLocationDirection plateDirection = mbgl::util::wrap(-direction, 0., 360.);
-    self.transform = CGAffineTransformMakeRotation(MGLRadiansFromDegrees(plateDirection));
+
+    [CATransaction begin];
+    [CATransaction setValue:@(YES) forKey:kCATransactionDisableActions];
+    self.imageLayer.transform = CATransform3DMakeRotation(MGLRadiansFromDegrees(plateDirection), 0.0, 0.0, 1.0);
+    [CATransaction commit];
 
     self.isAccessibilityElement = direction > 0;
     self.accessibilityValue = [self.accessibilityCompassFormatter stringFromDirection:direction];

platform/ios/src/MGLCompassButton_Private.h

@@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)compassButtonWithMapView:(MGLMapView *)mapView;
 
 @property (nonatomic, weak) MGLMapView *mapView;
+@property (nonatomic) CALayer *imageLayer;
 
 - (void)updateCompass;