[ios, core] Updates project for iOS SDK 12.2 / Always use vendored optional (#14241)

1 files changed, 9 insertions, 4 deletions

diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 50e022013b..eab690b854 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -2512,10 +2512,15 @@ public:
 {
     MGLLogInfo(@"Resetting the map to the current style’s default viewport.");
     auto camera = self.mbglMap.getStyle().getDefaultCamera();
-    CGFloat pitch = *camera.pitch;
-    CLLocationDirection heading = mbgl::util::wrap(*camera.bearing, 0., 360.);
-    CLLocationDistance altitude = MGLAltitudeForZoomLevel(*camera.zoom, pitch, 0, self.frame.size);
-    self.camera = [MGLMapCamera cameraLookingAtCenterCoordinate:MGLLocationCoordinate2DFromLatLng(*camera.center)
+    
+    double pitch        = camera.pitch ? *camera.pitch : 0.0;
+    double bearing      = camera.bearing ? *camera.bearing : 0.0;
+    double zoom         = camera.zoom ? *camera.zoom : 0.0;
+    mbgl::LatLng center = camera.center ? *camera.center : mbgl::LatLng();
+    
+    CLLocationDirection heading = mbgl::util::wrap(bearing, 0., 360.);
+    CLLocationDistance altitude = MGLAltitudeForZoomLevel(zoom, pitch, 0, self.frame.size);
+    self.camera = [MGLMapCamera cameraLookingAtCenterCoordinate:MGLLocationCoordinate2DFromLatLng(center)
                                                        altitude:altitude
                                                           pitch:pitch
                                                         heading:heading];