@rnmapbox/maps 10.0.11 → 10.0.12-rc.1

package/ios/RCTMGL-v10/RCTMGLLocationModule.swift

@@ -42,6 +42,126 @@ protocol LocationProviderRCTMGLDelegate : AnyObject {
   func locationManager(_ locationManager: LocationProviderRCTMGL, didUpdateLocation: RCTMGLLocation)
 }
 
+class RCTMGLAppleLocationProvider: NSObject {
+    private var locationProvider: CLLocationManager
+    private var privateLocationProviderOptions: LocationOptions {
+        didSet {
+            locationProvider.distanceFilter = privateLocationProviderOptions.distanceFilter
+            locationProvider.desiredAccuracy = privateLocationProviderOptions.desiredAccuracy
+            locationProvider.activityType = privateLocationProviderOptions.activityType
+        }
+    }
+    private weak var delegate: LocationProviderDelegate?
+
+    public var headingOrientation: CLDeviceOrientation {
+        didSet { locationProvider.headingOrientation = headingOrientation }
+    }
+
+    public override init() {
+        locationProvider = CLLocationManager()
+        privateLocationProviderOptions = LocationOptions()
+        headingOrientation = locationProvider.headingOrientation
+        super.init()
+        locationProvider.delegate = self
+    }
+}
+
+extension RCTMGLAppleLocationProvider: LocationProvider {
+
+    public var locationProviderOptions: LocationOptions {
+        get { privateLocationProviderOptions }
+        set { privateLocationProviderOptions = newValue }
+    }
+
+    public var authorizationStatus: CLAuthorizationStatus {
+        if #available(iOS 14.0, *) {
+            return locationProvider.authorizationStatus
+        } else {
+            return CLLocationManager.authorizationStatus()
+        }
+    }
+
+    public var accuracyAuthorization: CLAccuracyAuthorization {
+        if #available(iOS 14.0, *) {
+            return locationProvider.accuracyAuthorization
+        } else {
+            return .fullAccuracy
+        }
+    }
+
+    public var heading: CLHeading? {
+        return locationProvider.heading
+    }
+
+    public func setDelegate(_ delegate: LocationProviderDelegate) {
+        self.delegate = delegate
+    }
+
+    public func requestAlwaysAuthorization() {
+        locationProvider.requestAlwaysAuthorization()
+    }
+
+    public func requestWhenInUseAuthorization() {
+        locationProvider.requestWhenInUseAuthorization()
+    }
+
+    @available(iOS 14.0, *)
+    public func requestTemporaryFullAccuracyAuthorization(withPurposeKey purposeKey: String) {
+        locationProvider.requestTemporaryFullAccuracyAuthorization(withPurposeKey: purposeKey)
+    }
+
+    public func startUpdatingLocation() {
+        locationProvider.startUpdatingLocation()
+    }
+
+    public func stopUpdatingLocation() {
+        locationProvider.stopUpdatingLocation()
+    }
+
+    public func startUpdatingHeading() {
+        locationProvider.startUpdatingHeading()
+    }
+
+    public func stopUpdatingHeading() {
+        locationProvider.stopUpdatingHeading()
+    }
+
+    public func dismissHeadingCalibrationDisplay() {
+        locationProvider.dismissHeadingCalibrationDisplay()
+    }
+}
+
+extension RCTMGLAppleLocationProvider: CLLocationManagerDelegate {
+    public func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        delegate?.locationProvider(self, didUpdateLocations: locations)
+    }
+
+    public func locationManager(_ manager: CLLocationManager, didUpdateHeading heading: CLHeading) {
+        delegate?.locationProvider(self, didUpdateHeading: heading)
+    }
+
+    public func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+        delegate?.locationProvider(self, didFailWithError: error)
+    }
+
+    @available(iOS 14.0, *)
+    public func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
+        delegate?.locationProviderDidChangeAuthorization(self)
+    }
+
+    public func locationManagerShouldDisplayHeadingCalibration(_ manager: CLLocationManager) -> Bool {
+        guard let calibratingDelegate = delegate as? CalibratingLocationProviderDelegate else {
+            return false
+        }
+
+        return calibratingDelegate.locationProviderShouldDisplayHeadingCalibration(self)
+    }
+}
+
+internal protocol CalibratingLocationProviderDelegate: LocationProviderDelegate {
+    func locationProviderShouldDisplayHeadingCalibration(_ locationProvider: LocationProvider) -> Bool
+}
+
 /// LocationProviderRCTMGL listens to updates from a locationProvider and implements the LocationProvider interface itself
 /// So it can be source of Mapbox locationProduces (which updates location pluck and viewport if configured) as well as source to updates
 /// to RCTMGLLocationModules.
@@ -84,7 +204,7 @@ class LocationProviderRCTMGL : LocationProviderDelegate {
   }
 
   init() {
-    provider = AppleLocationProvider()
+    provider = RCTMGLAppleLocationProvider()
     provider.setDelegate(self)
   }
   
@@ -222,6 +342,17 @@ extension LocationProviderRCTMGL: LocationProvider {
   func setDelegate(_ delegate: LocationProviderDelegate) {
     provider.setDelegate(self)
     locationProviderDelage = delegate
+
+    if let lastLocation = lastKnownLocation {
+      DispatchQueue.main.async {
+        self.locationProviderDelage?.locationProvider(self, didUpdateLocations: [lastLocation])
+      }
+    }
+    if let lastHeading = lastKnownHeading {
+      DispatchQueue.main.async { [self] in
+        self.locationProviderDelage?.locationProvider(self, didUpdateHeading: lastHeading)
+      }
+    }
   }
   
   func requestAlwaysAuthorization() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.11",
+  "version": "10.0.12-rc.1",
   "publishConfig": {
     "access": "public"
   },

package/plugin/build/withMapbox.d.ts

@@ -1,4 +1,4 @@
-import { ConfigPlugin, XcodeProject } from 'expo/config-plugins';
+import { ConfigPlugin } from 'expo/config-plugins';
 declare type InstallerBlockName = 'pre' | 'post';
 export declare type MapboxPlugProps = {
     RNMapboxMapsImpl?: string;
@@ -12,11 +12,6 @@ export declare const addInstallerBlock: (src: string, blockName: InstallerBlockN
 export declare const addConstantBlock: (src: string, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, }: MapboxPlugProps) => string;
 export declare const applyCocoaPodsModifications: (contents: string, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, }: MapboxPlugProps) => string;
 export declare const addMapboxInstallerBlock: (src: string, blockName: InstallerBlockName) => string;
-/**
- * Exclude building for arm64 on simulator devices in the pbxproj project.
- * Without this, production builds targeting simulators will fail.
- */
-export declare const setExcludedArchitectures: (project: XcodeProject) => XcodeProject;
 export declare const addMapboxMavenRepo: (src: string) => string;
 declare const _default: ConfigPlugin<MapboxPlugProps>;
 export default _default;

package/plugin/build/withMapbox.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._addMapboxMavenRepo = exports.addMapboxMavenRepo = exports.setExcludedArchitectures = exports.addMapboxInstallerBlock = exports.applyCocoaPodsModifications = exports.addConstantBlock = exports.addInstallerBlock = void 0;
+exports._addMapboxMavenRepo = exports.addMapboxMavenRepo = exports.addMapboxInstallerBlock = exports.applyCocoaPodsModifications = exports.addConstantBlock = exports.addInstallerBlock = void 0;
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const config_plugins_1 = require("expo/config-plugins");
@@ -119,26 +119,6 @@ const withCocoaPodsInstallerBlocks = (config, { RNMapboxMapsImpl, RNMapboxMapsVe
         return exportedConfig;
     },
 ]);
-/**
- * Exclude building for arm64 on simulator devices in the pbxproj project.
- * Without this, production builds targeting simulators will fail.
- */
-const setExcludedArchitectures = (project) => {
-    const configurations = project.pbxXCBuildConfigurationSection();
-    for (const { buildSettings } of Object.values(configurations || {})) {
-        // Guessing that this is the best way to emulate Xcode.
-        // Using `project.addToBuildSettings` modifies too many targets.
-        if (typeof buildSettings?.PRODUCT_NAME !== 'undefined') {
-            buildSettings['"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"';
-        }
-    }
-    return project;
-};
-exports.setExcludedArchitectures = setExcludedArchitectures;
-const withExcludedSimulatorArchitectures = (config) => (0, config_plugins_1.withXcodeProject)(config, (exportedConfig) => {
-    exportedConfig.modResults = (0, exports.setExcludedArchitectures)(exportedConfig.modResults);
-    return exportedConfig;
-});
 const withAndroidPropertiesDownloadToken = (config, { RNMapboxMapsDownloadToken }) => {
     const key = 'MAPBOX_DOWNLOADS_TOKEN';
     if (RNMapboxMapsDownloadToken) {
@@ -269,7 +249,6 @@ const withMapboxAndroid = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken
     return config;
 };
 const withMapbox = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken }) => {
-    config = withExcludedSimulatorArchitectures(config);
     config = withMapboxAndroid(config, {
         RNMapboxMapsImpl,
         RNMapboxMapsVersion,

package/plugin/src/withMapbox.ts

@@ -5,8 +5,6 @@ import {
   ConfigPlugin,
   createRunOncePlugin,
   withDangerousMod,
-  withXcodeProject,
-  XcodeProject,
   withGradleProperties,
   WarningAggregator,
   withProjectBuildGradle,
@@ -185,35 +183,6 @@ const withCocoaPodsInstallerBlocks: ConfigPlugin<MapboxPlugProps> = (
     },
   ]);
 
-/**
- * Exclude building for arm64 on simulator devices in the pbxproj project.
- * Without this, production builds targeting simulators will fail.
- */
-export const setExcludedArchitectures: (
-  project: XcodeProject,
-) => XcodeProject = (project: XcodeProject): XcodeProject => {
-  const configurations: { buildSettings: Record<string, string> }[] =
-    project.pbxXCBuildConfigurationSection();
-  for (const { buildSettings } of Object.values(configurations || {})) {
-    // Guessing that this is the best way to emulate Xcode.
-    // Using `project.addToBuildSettings` modifies too many targets.
-    if (typeof buildSettings?.PRODUCT_NAME !== 'undefined') {
-      buildSettings['"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"';
-    }
-  }
-
-  return project;
-};
-
-const withExcludedSimulatorArchitectures: ConfigPlugin = (config) =>
-  withXcodeProject(config, (exportedConfig) => {
-    exportedConfig.modResults = setExcludedArchitectures(
-      exportedConfig.modResults,
-    );
-
-    return exportedConfig;
-  });
-
 const withAndroidPropertiesDownloadToken: ConfigPlugin<MapboxPlugProps> = (
   config,
   { RNMapboxMapsDownloadToken },
@@ -408,7 +377,6 @@ const withMapbox: ConfigPlugin<MapboxPlugProps> = (
   config,
   { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken },
 ) => {
-  config = withExcludedSimulatorArchitectures(config);
   config = withMapboxAndroid(config, {
     RNMapboxMapsImpl,
     RNMapboxMapsVersion,