Cherry picks prs from master to release-z (#478)

* Ensure pending completion blocks, even if rendering is not strictly required. (#463) * Address crash when localFontFamilyName is nil (#467) * Location manager crash fix when a selector is not implemented (#474) * Fix a location manager crash when a selector is not implemented * Update changelog * Fix crash with nil font family name (#476) * Fix crash with nil font family name. See also #467 * Update gl-native to 5.1.0 (#475) * Bump sdk version to 6.2.1 (#477) * Bump version to 6.2.1 * Update changelog Co-authored-by: Julian Rex <[email protected]> Co-authored-by: Jordan Kiley <[email protected]>
mapbox · Sep 23, 2020 · 7526f6b · 7526f6b
1 parent 3501f47
commit 7526f6b
Show file tree

Hide file tree

Showing 19 changed files with 152 additions and 134 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" == 4.0.0
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" == 5.1.0
 github "mapbox/mapbox-events-ios" ~> 0.10.4
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" "4.0.0"
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" "5.1.0"
 github "mapbox/mapbox-events-ios" "v0.10.4"
diff --git a/Makefile b/Makefile
@@ -151,7 +151,7 @@ $(IOS_OUTPUT_PATH):
 $(NETRC_FILE):
 	@echo "$$NETRC" > $(NETRC_FILE)
 
-$(CARTHAGE_DEPS): $(NETRC_FILE) | $(IOS_OUTPUT_PATH)
+$(CARTHAGE_DEPS): | $(NETRC_FILE) $(IOS_OUTPUT_PATH)
 	carthage bootstrap --platform iOS --use-netrc
 	@echo "Finishing bootstrapping"
 

diff --git a/platform/darwin/src/MGLMapSnapshotter.mm b/platform/darwin/src/MGLMapSnapshotter.mm
@@ -725,7 +725,7 @@ - (void)configureWithOptions:(MGLMapSnapshotOptions *)options {
                    .withAssetPath(NSBundle.mainBundle.resourceURL.path.UTF8String);
 
     // Create the snapshotter
-    auto localFontFamilyName = config.localFontFamilyName ? std::string(config.localFontFamilyName.UTF8String) : nullptr;
+    mbgl::optional<std::string> localFontFamilyName = config.localFontFamilyName ? mbgl::optional<std::string>(std::string(config.localFontFamilyName.UTF8String)) : mbgl::nullopt;
     _delegateHost = std::make_unique<MGLMapSnapshotterDelegateHost>(self);
     _mbglMapSnapshotter = std::make_unique<mbgl::MapSnapshotter>(
                                                                  size, pixelRatio, resourceOptions, *_delegateHost, localFontFamilyName);

diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started.
 
+## 6.2.1 - September 23, 2020
+
+### 🐞 Bug fixes
+
+* 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))
+* Fixed an issue with local font glyph rendering, by updating the core library to version 5.1.0. ([#475](https://github.com/mapbox/mapbox-gl-native-ios/pull/475))
+
+### 🔧 Dependencies
+
+* Core library updated to `5.1.0`. ([#475](https://github.com/mapbox/mapbox-gl-native-ios/pull/475)) 
+
 ## 6.2.0 - September 17, 2020
 
 **This release supports iOS 14 and Xcode 12**

diff --git a/platform/ios/Integration Test Harness/Info.plist b/platform/ios/Integration Test Harness/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.2.0</string>
+	<string>6.2.1</string>
 	<key>CFBundleVersion</key>
-	<string>15270</string>
+	<string>15271</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/platform/ios/Integration Tests/Info.plist b/platform/ios/Integration Tests/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.2.0</string>
+	<string>6.2.1</string>
 	<key>CFBundleVersion</key>
-	<string>15270</string>
+	<string>15271</string>
 </dict>
 </plist>
diff --git a/...ation Tests/MGLMapViewPendingBlockTests.m → ...tion Tests/MGLMapViewPendingBlockTests.mm b/...ation Tests/MGLMapViewPendingBlockTests.m → ...tion Tests/MGLMapViewPendingBlockTests.mm
@@ -1,5 +1,6 @@
 #import "MGLMapViewIntegrationTest.h"
 #import "MGLTestUtility.h"
+#import "MGLMapView_Private.h"
 
 @interface MGLMapView (MGLMapViewPendingBlockTests)
 @property (nonatomic) NSMutableArray *pendingCompletionBlocks;
@@ -14,75 +15,89 @@ @interface MGLMapViewPendingBlockTests : MGLMapViewIntegrationTest
 @implementation MGLMapViewPendingBlockTests
 
 - (void)testSetCenterCoordinate {
-    __typeof__(self) weakSelf = self;
-
-    void (^transition)(dispatch_block_t) = ^(dispatch_block_t completion) {
-        __typeof__(self) strongSelf = weakSelf;
-
-        if (strongSelf) {
-            [strongSelf.mapView setCenterCoordinate:CLLocationCoordinate2DMake(10.0, 10.0)
-                                          zoomLevel:10.0
-                                          direction:0
-                                           animated:NO
-                                  completionHandler:completion];
-        }
-        else {
-            completion();
-        }
-    };
-
-    [self internalTestCompletionBlockAddedToPendingForTestName:NSStringFromSelector(_cmd)
-                                                    transition:transition
-                                          addToPendingCallback:nil];
+    [self internal_testSetCenterCoordinate:CLLocationCoordinate2DMake(10.0, 20.0)
+                                 zoomLevel:10.0
+                                  animated:NO
+                                  testName:NSStringFromSelector(_cmd)];
 }
 
 - (void)testSetCenterCoordinateAnimated {
+    [self internal_testSetCenterCoordinate:CLLocationCoordinate2DMake(10.0, 20.0)
+                                 zoomLevel:10.0
+                                  animated:NO
+                                  testName:NSStringFromSelector(_cmd)];
+}
+
+- (void)internal_testSetCenterCoordinate:(CLLocationCoordinate2D)coord
+                               zoomLevel:(double)zoomLevel
+                                animated:(BOOL)animated
+                                testName:(NSString*)testName {
     __typeof__(self) weakSelf = self;
 
     void (^transition)(dispatch_block_t) = ^(dispatch_block_t completion) {
         __typeof__(self) strongSelf = weakSelf;
 
         if (strongSelf) {
-            [strongSelf.mapView setCenterCoordinate:CLLocationCoordinate2DMake(10.0, 10.0)
-                                          zoomLevel:10.0
+            [strongSelf.mapView setCenterCoordinate:coord
+                                          zoomLevel:zoomLevel
                                           direction:0
-                                           animated:YES
+                                           animated:animated
                                   completionHandler:completion];
         }
         else {
             completion();
         }
     };
 
-    [self internalTestCompletionBlockAddedToPendingForTestName:NSStringFromSelector(_cmd)
+    [self internalTestCompletionBlockAddedToPendingForTestName:testName
                                                     transition:transition
                                           addToPendingCallback:nil];
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+- (void)testSetSameCenterCoordinateBug461 {
+    [self internal_testSetSameCenterCoordinateBug461Animated:NO testName:NSStringFromSelector(_cmd)];
+}
+
+- (void)testSetSameCenterCoordinateBug461Animated {
+    [self internal_testSetSameCenterCoordinateBug461Animated:YES testName:NSStringFromSelector(_cmd)];
+}
+
+- (void)internal_testSetSameCenterCoordinateBug461Animated:(BOOL)animated testName:(NSString*)testName {
+
+    CLLocationCoordinate2D coord = CLLocationCoordinate2DMake(10.0, 20.0);
+    double zoomLevel = 10.0;
+    // Set the map zoom level to a specific constant
+    // Set the map center coordinate to a specific constant
+    [self.mapView setCenterCoordinate:coord
+                            zoomLevel:zoomLevel
+                             animated:NO];
+
+    [self.mapView setNeedsRerender];
+    [self waitForMapViewToIdleWithTimeout:1];
+
+    XCTAssert(self.mapView.zoomLevel == zoomLevel);
+    XCTAssertEqualWithAccuracy(self.mapView.centerCoordinate.latitude, coord.latitude, 0.000001);
+    XCTAssertEqualWithAccuracy(self.mapView.centerCoordinate.longitude, coord.longitude, 0.000001);
+
+    [self internal_testSetCenterCoordinate:coord
+                                 zoomLevel:zoomLevel
+                                  animated:NO
+                                  testName:testName];
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 - (void)testSetVisibleCoordinateBounds {
-    __typeof__(self) weakSelf = self;
-
-    void (^transition)(dispatch_block_t) = ^(dispatch_block_t completion) {
-        __typeof__(self) strongSelf = weakSelf;
-
-        if (strongSelf) {
-            MGLCoordinateBounds unitBounds = MGLCoordinateBoundsMake(CLLocationCoordinate2DMake(0, 0), CLLocationCoordinate2DMake(1, 1));
-            [strongSelf.mapView setVisibleCoordinateBounds:unitBounds
-                                               edgePadding:UIEdgeInsetsZero
-                                                  animated:NO
-                                         completionHandler:completion];
-        }
-        else {
-            completion();
-        }
-    };
-
-    [self internalTestCompletionBlockAddedToPendingForTestName:NSStringFromSelector(_cmd)
-                                                    transition:transition
-                                          addToPendingCallback:nil];
+    [self internal_testSetVisibleCoordinateBoundsAnimated:NO testName:NSStringFromSelector(_cmd)];
 }
 
 - (void)testSetVisibleCoordinateBoundsAnimated {
+    [self internal_testSetVisibleCoordinateBoundsAnimated:YES testName:NSStringFromSelector(_cmd)];
+}
+
+- (void)internal_testSetVisibleCoordinateBoundsAnimated:(BOOL)animated testName:(NSString*)testName {
     __typeof__(self) weakSelf = self;
 
     void (^transition)(dispatch_block_t) = ^(dispatch_block_t completion) {
@@ -92,42 +107,30 @@ - (void)testSetVisibleCoordinateBoundsAnimated {
             MGLCoordinateBounds unitBounds = MGLCoordinateBoundsMake(CLLocationCoordinate2DMake(0, 0), CLLocationCoordinate2DMake(1, 1));
             [strongSelf.mapView setVisibleCoordinateBounds:unitBounds
                                                edgePadding:UIEdgeInsetsZero
-                                                  animated:YES
+                                                  animated:animated
                                          completionHandler:completion];
         }
         else {
             completion();
         }
     };
 
-    [self internalTestCompletionBlockAddedToPendingForTestName:NSStringFromSelector(_cmd)
+    [self internalTestCompletionBlockAddedToPendingForTestName:testName
                                                     transition:transition
                                           addToPendingCallback:nil];
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 - (void)testSetCamera {
-    __typeof__(self) weakSelf = self;
-
-    void (^transition)(dispatch_block_t) = ^(dispatch_block_t completion) {
-        __typeof__(self) strongSelf = weakSelf;
-
-        if (strongSelf) {
-            MGLCoordinateBounds unitBounds = MGLCoordinateBoundsMake(CLLocationCoordinate2DMake(0, 0), CLLocationCoordinate2DMake(1, 1));
-            MGLMapCamera *camera = [strongSelf.mapView cameraThatFitsCoordinateBounds:unitBounds];
-
-            [strongSelf.mapView setCamera:camera withDuration:0.0 animationTimingFunction:nil completionHandler:completion];
-        }
-        else {
-            completion();
-        }
-    };
-
-    [self internalTestCompletionBlockAddedToPendingForTestName:NSStringFromSelector(_cmd)
-                                                    transition:transition
-                                          addToPendingCallback:nil];
+    [self internal_testSetCameraAnimated:NO testName:NSStringFromSelector(_cmd)];
 }
 
 - (void)testSetCameraAnimated {
+    [self internal_testSetCameraAnimated:YES testName:NSStringFromSelector(_cmd)];
+}
+
+- (void)internal_testSetCameraAnimated:(BOOL)animated testName:(NSString*)testName {
     __typeof__(self) weakSelf = self;
 
     void (^transition)(dispatch_block_t) = ^(dispatch_block_t completion) {
@@ -137,41 +140,32 @@ - (void)testSetCameraAnimated {
             MGLCoordinateBounds unitBounds = MGLCoordinateBoundsMake(CLLocationCoordinate2DMake(0, 0), CLLocationCoordinate2DMake(1, 1));
             MGLMapCamera *camera = [strongSelf.mapView cameraThatFitsCoordinateBounds:unitBounds];
 
-            [strongSelf.mapView setCamera:camera withDuration:0.3 animationTimingFunction:nil completionHandler:completion];
+            [strongSelf.mapView setCamera:camera
+                             withDuration:animated ? 0.3 : 0.0
+                  animationTimingFunction:nil
+                        completionHandler:completion];
         }
         else {
             completion();
         }
     };
 
-    [self internalTestCompletionBlockAddedToPendingForTestName:NSStringFromSelector(_cmd)
+    [self internalTestCompletionBlockAddedToPendingForTestName:testName
                                                     transition:transition
                                           addToPendingCallback:nil];
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 - (void)testFlyToCamera {
-    __typeof__(self) weakSelf = self;
-
-    void (^transition)(dispatch_block_t) = ^(dispatch_block_t completion) {
-        __typeof__(self) strongSelf = weakSelf;
-
-        if (strongSelf) {
-            MGLCoordinateBounds unitBounds = MGLCoordinateBoundsMake(CLLocationCoordinate2DMake(0, 0), CLLocationCoordinate2DMake(1, 1));
-            MGLMapCamera *camera = [strongSelf.mapView cameraThatFitsCoordinateBounds:unitBounds];
-
-            [strongSelf.mapView flyToCamera:camera withDuration:0.0 completionHandler:completion];
-        }
-        else {
-            completion();
-        }
-    };
-
-    [self internalTestCompletionBlockAddedToPendingForTestName:NSStringFromSelector(_cmd)
-                                                    transition:transition
-                                          addToPendingCallback:nil];
+    [self internal_testFlyToCameraAnimated:NO testName:NSStringFromSelector(_cmd)];
 }
 
 - (void)testFlyToCameraAnimated {
+    [self internal_testFlyToCameraAnimated:YES testName:NSStringFromSelector(_cmd)];
+}
+
+- (void)internal_testFlyToCameraAnimated:(BOOL)animated testName:(NSString*)testName {
 
     __typeof__(self) weakSelf = self;
 
@@ -182,19 +176,20 @@ - (void)testFlyToCameraAnimated {
             MGLCoordinateBounds unitBounds = MGLCoordinateBoundsMake(CLLocationCoordinate2DMake(0, 0), CLLocationCoordinate2DMake(1, 1));
             MGLMapCamera *camera = [strongSelf.mapView cameraThatFitsCoordinateBounds:unitBounds];
 
-            [strongSelf.mapView flyToCamera:camera withDuration:0.3 completionHandler:completion];
+            [strongSelf.mapView flyToCamera:camera
+                               withDuration:animated ? 0.3 : 0.0
+                          completionHandler:completion];
         }
         else {
             completion();
         }
     };
 
-    [self internalTestCompletionBlockAddedToPendingForTestName:NSStringFromSelector(_cmd)
+    [self internalTestCompletionBlockAddedToPendingForTestName:testName
                                                     transition:transition
                                           addToPendingCallback:nil];
 }
 
-
 #pragma mark - test interrupting regular rendering
 
 - (void)testSetCenterCoordinateSetHidden {

diff --git a/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec b/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  version = '6.2.0'
+  version = '6.2.1'
 
   m.name    = 'Mapbox-iOS-SDK-snapshot-dynamic'
   m.version = "#{version}-snapshot"

diff --git a/platform/ios/Mapbox-iOS-SDK-stripped.podspec b/platform/ios/Mapbox-iOS-SDK-stripped.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  version = '6.2.0'
+  version = '6.2.1'
 
   m.name    = 'Mapbox-iOS-SDK-stripped'
   m.version = "#{version}-stripped"

diff --git a/platform/ios/Mapbox-iOS-SDK.podspec b/platform/ios/Mapbox-iOS-SDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  version = '6.2.0'
+  version = '6.2.1'
 
   m.name    = 'Mapbox-iOS-SDK'
   m.version = version

diff --git a/platform/ios/app/Info.plist b/platform/ios/app/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.2.0</string>
+	<string>6.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>MBGL</string>
 	<key>CFBundleVersion</key>
-	<string>15270</string>
+	<string>15271</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocationTemporaryUsageDescriptionDictionary</key>

diff --git a/platform/ios/benchmark/Info.plist b/platform/ios/benchmark/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.2.0</string>
+	<string>6.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>MBGL</string>
 	<key>CFBundleVersion</key>
-	<string>15270</string>
+	<string>15271</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>