@maplibre/maplibre-react-native 11.0.0-alpha.12 → 11.0.0-alpha.14

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/GoogleLocationEngineImpl.kt

@@ -0,0 +1,131 @@
+package org.maplibre.reactnative.location.engine
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.content.Context
+import android.location.Location
+import android.os.Looper
+import androidx.annotation.VisibleForTesting
+import com.google.android.gms.location.FusedLocationProviderClient
+import com.google.android.gms.location.LocationCallback
+import com.google.android.gms.location.LocationRequest
+import com.google.android.gms.location.LocationResult
+import com.google.android.gms.location.LocationServices
+import com.google.android.gms.location.Priority
+import com.google.android.gms.tasks.OnFailureListener
+import com.google.android.gms.tasks.OnSuccessListener
+import org.maplibre.android.location.engine.LocationEngineCallback
+import org.maplibre.android.location.engine.LocationEngineImpl
+import org.maplibre.android.location.engine.LocationEngineRequest
+import org.maplibre.android.location.engine.LocationEngineResult
+
+/**
+ * Wraps implementation of Fused Location Provider
+ */
+class GoogleLocationEngineImpl : LocationEngineImpl<LocationCallback?> {
+    private val fusedLocationProviderClient: FusedLocationProviderClient
+
+    @VisibleForTesting
+    internal constructor(fusedLocationProviderClient: FusedLocationProviderClient) {
+        this.fusedLocationProviderClient = fusedLocationProviderClient
+    }
+
+    constructor(context: Context) {
+        this.fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(context)
+    }
+
+    override fun createListener(callback: LocationEngineCallback<LocationEngineResult?>): LocationCallback {
+        return GoogleLocationEngineCallbackTransport(callback)
+    }
+
+    @SuppressLint("MissingPermission")
+    @Throws(SecurityException::class)
+    override fun getLastLocation(callback: LocationEngineCallback<LocationEngineResult?>) {
+        val transport = GoogleLastLocationEngineCallbackTransport(callback)
+        fusedLocationProviderClient.lastLocation.addOnSuccessListener(transport)
+            .addOnFailureListener(transport)
+    }
+
+    @SuppressLint("MissingPermission")
+    @Throws(SecurityException::class)
+    override fun requestLocationUpdates(
+        request: LocationEngineRequest, listener: LocationCallback, looper: Looper?
+    ) {
+        fusedLocationProviderClient.requestLocationUpdates(
+            toGMSLocationRequest(request), listener, looper
+        )
+    }
+
+    @SuppressLint("MissingPermission")
+    @Throws(SecurityException::class)
+    override fun requestLocationUpdates(
+        request: LocationEngineRequest, pendingIntent: PendingIntent
+    ) {
+        fusedLocationProviderClient.requestLocationUpdates(
+            toGMSLocationRequest(request), pendingIntent
+        )
+    }
+
+    override fun removeLocationUpdates(listener: LocationCallback?) {
+        if (listener != null) {
+            fusedLocationProviderClient.removeLocationUpdates(listener)
+        }
+    }
+
+    override fun removeLocationUpdates(pendingIntent: PendingIntent?) {
+        if (pendingIntent != null) {
+            fusedLocationProviderClient.removeLocationUpdates(pendingIntent)
+        }
+    }
+
+    private class GoogleLocationEngineCallbackTransport(private val callback: LocationEngineCallback<LocationEngineResult?>) :
+        LocationCallback() {
+        override fun onLocationResult(locationResult: LocationResult) {
+            super.onLocationResult(locationResult)
+            val locations = locationResult.locations
+            if (!locations.isEmpty()) {
+                callback.onSuccess(LocationEngineResult.create(locations))
+            } else {
+                callback.onFailure(Exception("Unavailable location"))
+            }
+        }
+    }
+
+    @VisibleForTesting
+    internal class GoogleLastLocationEngineCallbackTransport
+        (private val callback: LocationEngineCallback<LocationEngineResult?>) :
+        OnSuccessListener<Location?>, OnFailureListener {
+        override fun onSuccess(location: Location?) {
+            callback.onSuccess(
+                if (location != null) LocationEngineResult.create(location) else LocationEngineResult.create(
+                    mutableListOf<Location?>()
+                )
+            )
+        }
+
+        override fun onFailure(e: Exception) {
+            callback.onFailure(e)
+        }
+    }
+
+    companion object {
+        private fun toGMSLocationRequest(request: LocationEngineRequest): LocationRequest {
+            val builder = LocationRequest.Builder(request.interval)
+            builder.setMinUpdateIntervalMillis(request.fastestInterval)
+            builder.setMinUpdateDistanceMeters(request.displacement)
+            builder.setMaxUpdateDelayMillis(request.maxWaitTime)
+            builder.setPriority(toGMSLocationPriority(request.priority))
+            return builder.build()
+        }
+
+        private fun toGMSLocationPriority(enginePriority: Int): Int {
+            return when (enginePriority) {
+                LocationEngineRequest.PRIORITY_HIGH_ACCURACY -> Priority.PRIORITY_HIGH_ACCURACY
+                LocationEngineRequest.PRIORITY_BALANCED_POWER_ACCURACY -> Priority.PRIORITY_BALANCED_POWER_ACCURACY
+                LocationEngineRequest.PRIORITY_LOW_POWER -> Priority.PRIORITY_LOW_POWER
+                LocationEngineRequest.PRIORITY_NO_POWER -> Priority.PRIORITY_PASSIVE
+                else -> Priority.PRIORITY_PASSIVE
+            }
+        }
+    }
+}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/GoogleLocationEngineProvider.kt

@@ -0,0 +1,28 @@
+package org.maplibre.reactnative.location.engine
+
+import android.content.Context
+import android.util.Log
+import com.google.android.gms.common.ConnectionResult
+import com.google.android.gms.common.GoogleApiAvailability
+import com.google.android.gms.location.LocationCallback
+import org.maplibre.android.location.engine.LocationEngine
+import org.maplibre.android.location.engine.LocationEngineProxy
+
+class GoogleLocationEngineProvider : LocationEngineProvidable {
+    override fun getLocationEngine(context: Context): LocationEngine {
+        if (GoogleApiAvailability.getInstance()
+                .isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS
+        ) {
+            val locationEngine: LocationEngine =
+                LocationEngineProxy<LocationCallback?>(GoogleLocationEngineImpl(context.applicationContext))
+            Log.d(LOG_TAG, "GoogleLocationEngine will be used.")
+            return locationEngine
+        } else {
+            return DefaultLocationEngineProvider().getLocationEngine(context)
+        }
+    }
+
+    companion object {
+        private const val LOG_TAG = "GoogleLocationEngineProvider"
+    }
+}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/LocationEngineProvider.kt

@@ -0,0 +1,10 @@
+package org.maplibre.reactnative.location.engine
+
+import android.content.Context
+import org.maplibre.android.location.engine.LocationEngine
+
+class LocationEngineProvider : LocationEngineProvidable {
+    override fun getLocationEngine(context: Context): LocationEngine {
+        return GoogleLocationEngineProvider().getLocationEngine(context)
+    }
+}

package/ios/components/camera/MLRNCameraComponentView.mm

@@ -42,8 +42,12 @@ using namespace facebook::react;
     __typeof__(self) strongSelf = weakSelf;
 
     if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+      NSString *trackUserLocation = event[@"trackUserLocation"];
+
       facebook::react::MLRNCameraEventEmitter::OnTrackUserLocationChange eventStruct{
-          [event[@"trackUserLocation"] UTF8String],
+          [trackUserLocation isKindOfClass:[NSString class]]
+              ? folly::dynamic([trackUserLocation UTF8String])
+              : folly::dynamic(nullptr),
       };
       std::dynamic_pointer_cast<const facebook::react::MLRNCameraEventEmitter>(
           strongSelf->_eventEmitter)

package/ios/modules/location/MLRNLocation.h

@@ -1,5 +1,4 @@
 #import <CoreLocation/CoreLocation.h>
-#import <Foundation/Foundation.h>
 
 @interface MLRNLocation : NSObject
 

package/ios/modules/location/MLRNLocation.m

@@ -8,10 +8,10 @@
   NSMutableDictionary<NSString *, NSNumber *> *coords = [[NSMutableDictionary alloc] init];
   coords[@"longitude"] = @(_location.coordinate.longitude);
   coords[@"latitude"] = @(_location.coordinate.latitude);
-  coords[@"altitude"] = @(_location.altitude);
   coords[@"accuracy"] = @(_location.horizontalAccuracy);
-  coords[@"heading"] = @(_heading.trueHeading);
-  coords[@"course"] = @(_location.course);
+  coords[@"altitude"] = @(_location.altitude);
+  coords[@"altitudeAccuracy"] = @(_location.verticalAccuracy);
+  coords[@"heading"] = @(_location.course);
   coords[@"speed"] = @(_location.speed);
 
   json[@"coords"] = coords;

package/ios/modules/location/MLRNLocationManager.h

@@ -1,5 +1,3 @@
-#import <Foundation/Foundation.h>
-
 #import "MLRNLocation.h"
 #import "MLRNLocationManagerDelegate.h"
 
@@ -11,7 +9,7 @@ typedef void (^MLRNLocationBlock)(MLRNLocation *location);
 
 + (id)sharedInstance;
 
-- (void)start:(CLLocationDistance)minDisplacement;
+- (void)start;
 - (void)stop;
 - (void)setMinDisplacement:(CLLocationDistance)minDisplacement;
 - (BOOL)isEnabled;

package/ios/modules/location/MLRNLocationManager.m

@@ -36,9 +36,7 @@
   [self stop];
 }
 
-- (void)start:(CLLocationDistance)minDisplacement {
-  displacement = minDisplacement;
-
+- (void)start {
   if ([self isEnabled]) {
     return;
   }
@@ -47,7 +45,6 @@
     [self->locationManager requestWhenInUseAuthorization];
     [self->locationManager startUpdatingLocation];
     [self->locationManager startUpdatingHeading];
-    [self->locationManager setDistanceFilter:(minDisplacement)];
     self->isListening = YES;
   });
 }

package/ios/modules/location/MLRNLocationManagerDelegate.h

@@ -1,5 +1,3 @@
-#import <CoreLocation/CoreLocation.h>
-
 #import "MLRNLocation.h"
 
 @class MLRNLocationManager;

package/ios/modules/location/MLRNLocationModule.h

@@ -1,7 +1,7 @@
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
+#import <MapLibreReactNativeSpec/MapLibreReactNativeSpec.h>
 
-@interface MLRNLocationModule : RCTEventEmitter <RCTBridgeModule>
+#import "MLRNLocationManagerDelegate.h"
 
+@interface MLRNLocationModule
+    : NativeLocationModuleSpecBase <NativeLocationModuleSpec, MLRNLocationManagerDelegate>
 @end

package/ios/modules/location/MLRNLocationModule.mm

@@ -0,0 +1,56 @@
+#import "MLRNLocationModule.h"
+#import "MLRNEventTypes.h"
+#import "MLRNLocation.h"
+#import "MLRNLocationManager.h"
+#import "MLRNLocationManagerDelegate.h"
+
+@implementation MLRNLocationModule {
+  MLRNLocationManager *locationManager;
+}
+
++ (NSString *)moduleName {
+  return @"MLRNLocationModule";
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params {
+  return std::make_shared<facebook::react::NativeLocationModuleSpecJSI>(params);
+}
+
+- (instancetype)init {
+  if (self = [super init]) {
+    locationManager = [[MLRNLocationManager alloc] init];
+    locationManager.delegate = self;
+  }
+
+  return self;
+}
+
+- (void)start {
+  [locationManager start];
+}
+
+- (void)pause {
+  [locationManager stop];
+}
+
+- (void)stop {
+  [locationManager stop];
+}
+
+- (void)setMinDisplacement:(CLLocationDistance)minDisplacement {
+  [locationManager setMinDisplacement:minDisplacement];
+}
+
+- (void)getCurrentPosition:(nonnull RCTPromiseResolveBlock)resolve
+                    reject:(nonnull RCTPromiseRejectBlock)reject {
+  MLRNLocation *lastKnownLocation = [locationManager getLastKnownLocation];
+  resolve(lastKnownLocation);
+}
+
+- (void)locationManager:(MLRNLocationManager *)locationManager
+      didUpdateLocation:(MLRNLocation *)location {
+  [self emitOnUpdate:[location toJSON]];
+}
+
+@end

package/ios/modules/mlrn/MLRNModule.m

@@ -23,10 +23,6 @@ RCT_EXPORT_MODULE();
   [eventTypes setObject:RCT_MLRN_PRESS forKey:@"Press"];
   [eventTypes setObject:RCT_MLRN_LONG_PRESS forKey:@"LongPress"];
 
-  // location module events
-  NSMutableDictionary *locationModuleEvents = [[NSMutableDictionary alloc] init];
-  [locationModuleEvents setObject:RCT_MLRN_USER_LOCATION_UPDATE forKey:@"Update"];
-
   // style sources
   NSMutableDictionary *styleSourceConsts = [[NSMutableDictionary alloc] init];
   [styleSourceConsts setObject:DEFAULT_SOURCE_ID forKey:@"DefaultSourceID"];
@@ -47,7 +43,6 @@ RCT_EXPORT_MODULE();
     @"StyleSource" : styleSourceConsts,
     @"OfflineCallbackName" : offlineModuleCallbackNames,
     @"OfflinePackDownloadState" : offlinePackDownloadState,
-    @"LocationCallbackName" : locationModuleEvents
   };
 }
 

package/ios/utils/MLRNEventTypes.h

@@ -14,8 +14,6 @@ extern NSString *const RCT_MLRN_OFFLINE_TILE_LIMIT;
 extern NSString *const RCT_MLRN_SHAPE_SOURCE_LAYER_PRESS;
 extern NSString *const RCT_MLRN_VECTOR_SOURCE_LAYER_PRESS;
 
-extern NSString *const RCT_MLRN_USER_LOCATION_UPDATE;
-
 extern NSString *const RCT_MLRN_MISSING_IMAGE;
 
 @end

package/ios/utils/MLRNEventTypes.m

@@ -16,6 +16,4 @@ NSString *const RCT_MLRN_VECTOR_SOURCE_LAYER_PRESS = @"VectorSourceLayerPress";
 
 NSString *const RCT_MLRN_MISSING_IMAGE = @"MissingImage";
 
-NSString *const RCT_MLRN_USER_LOCATION_UPDATE = @"UserLocationUpdate";
-
 @end

package/lib/commonjs/components/camera/Camera.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_CameraNativeComponent","_interopRequireDefault","_NativeCameraModule","_jsxRuntime","e","__esModule","default","Camera","exports","memo","forwardRef","testID","initialViewState","minZoom","maxZoom","maxBounds","trackUserLocation","onTrackUserLocationChange","stop","ref","nativeRef","useRef","setStop","nodeHandle","findNodeHandle","current","Error","NativeCameraModule","useImperativeHandle","jumpTo","center","options","duration","easing","undefined","easeTo","flyTo","fitBounds","bounds","zoomTo","zoom","jsx"],"sourceRoot":"../../../../src","sources":["components/camera/Camera.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_CameraNativeComponent","_interopRequireDefault","_NativeCameraModule","_jsxRuntime","e","__esModule","default","Camera","exports","memo","forwardRef","testID","initialViewState","minZoom","maxZoom","maxBounds","trackUserLocation","onTrackUserLocationChange","stop","ref","nativeRef","useRef","setStop","nodeHandle","findNodeHandle","current","Error","NativeCameraModule","useImperativeHandle","jumpTo","center","options","duration","easing","undefined","easeTo","flyTo","fitBounds","bounds","zoomTo","zoom","jsx"],"sourceRoot":"../../../../src","sources":["components/camera/Camera.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/camera/CameraNativeComponent.ts

@@ -5,6 +5,8 @@ import {
   type ViewProps,
 } from "react-native";
 
+import type { UnsafeMixed } from "../../types/codegen/UnsafeMixed";
+
 // START: NativeCameraStop
 type NativeViewPadding = {
   top?: CodegenTypes.WithDefault<CodegenTypes.Int32, 0>;
@@ -36,7 +38,10 @@ type NativeCameraStop = NativeViewState & {
 type NativeTrackUserLocationMode = "none" | "default" | "heading" | "course";
 
 type TrackUserLocationChangeEvent = {
-  trackUserLocation?: string;
+  trackUserLocation: UnsafeMixed<Exclude<
+    NativeTrackUserLocationMode,
+    "none"
+  > | null>;
 };
 
 export interface NativeProps extends ViewProps {

package/lib/commonjs/components/user-location/UserLocation.js

@@ -62,7 +62,7 @@ const UserLocation = exports.UserLocation = /*#__PURE__*/(0, _react.memo)(/*#__P
       if (renderMode === UserLocationRenderMode.Native) {
         return;
       }
-      _LocationManager.LocationManager.setMinDisplacement(minDisplacement ?? 0);
+      _LocationManager.LocationManager.setMinDisplacement(minDisplacement);
     });
     return () => {
       _isMounted.current = false;
@@ -73,7 +73,7 @@ const UserLocation = exports.UserLocation = /*#__PURE__*/(0, _react.memo)(/*#__P
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   (0, _react.useEffect)(() => {
-    _LocationManager.LocationManager.setMinDisplacement(minDisplacement ?? 0);
+    _LocationManager.LocationManager.setMinDisplacement(minDisplacement);
   }, [minDisplacement]);
   (0, _react.useEffect)(() => {
     if (!_isMounted.current) {
@@ -90,7 +90,7 @@ const UserLocation = exports.UserLocation = /*#__PURE__*/(0, _react.memo)(/*#__P
       locationManagerRunning.current = running;
       if (running) {
         _LocationManager.LocationManager.addListener(_onLocationUpdate);
-        const location = await _LocationManager.LocationManager.getLastKnownLocation();
+        const location = await _LocationManager.LocationManager.getCurrentPosition();
         _onLocationUpdate(location);
       } else {
         _LocationManager.LocationManager.removeListener(_onLocationUpdate);

package/lib/commonjs/components/user-location/UserLocation.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_NativeUserLocation","_UserLocationPuck","_LocationManager","_Annotation","_jsxRuntime","USER_LOCATION_SOURCE_ID","UserLocationRenderMode","exports","UserLocation","memo","forwardRef","animated","visible","showsUserHeadingIndicator","minDisplacement","renderMode","androidRenderMode","androidPreferredFramesPerSecond","children","onUpdate","onPress","ref","_isMounted","useRef","locationManagerRunning","userLocationState","setUserLocationState","useState","shouldShowUserLocation","useImperativeHandle","setLocationManager","needsLocationManagerRunning","_onLocationUpdate","useEffect","current","running","then","Native","LocationManager","setMinDisplacement","addListener","location","getLastKnownLocation","removeListener","Normal","coordinates","heading","coords","longitude","latitude","props","iosShowsUserHeadingIndicator","jsx","NativeUserLocation","Annotation","id","style","iconRotate","UserLocationPuck","sourceID","undefined"],"sourceRoot":"../../../../src","sources":["components/user-location/UserLocation.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_NativeUserLocation","_UserLocationPuck","_LocationManager","_Annotation","_jsxRuntime","USER_LOCATION_SOURCE_ID","UserLocationRenderMode","exports","UserLocation","memo","forwardRef","animated","visible","showsUserHeadingIndicator","minDisplacement","renderMode","androidRenderMode","androidPreferredFramesPerSecond","children","onUpdate","onPress","ref","_isMounted","useRef","locationManagerRunning","userLocationState","setUserLocationState","useState","shouldShowUserLocation","useImperativeHandle","setLocationManager","needsLocationManagerRunning","_onLocationUpdate","useEffect","current","running","then","Native","LocationManager","setMinDisplacement","addListener","location","getCurrentPosition","removeListener","Normal","coordinates","heading","coords","longitude","latitude","props","iosShowsUserHeadingIndicator","jsx","NativeUserLocation","Annotation","id","style","iconRotate","UserLocationPuck","sourceID","undefined"],"sourceRoot":"../../../../src","sources":["components/user-location/UserLocation.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/index.js

@@ -9,7 +9,6 @@ var _exportNames = {
   PointAnnotation: true,
   Annotation: true,
   Callout: true,
-  requestAndroidLocationPermissions: true,
   UserLocation: true,
   UserLocationRenderMode: true,
   VectorSource: true,
@@ -27,6 +26,7 @@ var _exportNames = {
   BackgroundLayer: true,
   MarkerView: true,
   LocationManager: true,
+  requestAndroidLocationPermissions: true,
   OfflineManager: true,
   OfflinePack: true,
   OfflineCreatePackOptions: true,
@@ -225,7 +225,6 @@ var _MapView = require("./components/map-view/MapView.js");
 var _PointAnnotation = require("./components/annotations/PointAnnotation.js");
 var _Annotation = require("./components/annotations/Annotation.js");
 var _Callout = require("./components/annotations/Callout.js");
-var _requestAndroidLocationPermissions = require("./requestAndroidLocationPermissions.js");
 var _UserLocation = require("./components/user-location/UserLocation.js");
 var _VectorSource = require("./components/sources/VectorSource.js");
 var _ShapeSource = require("./components/sources/ShapeSource.js");
@@ -242,6 +241,7 @@ var _RasterLayer = require("./components/layers/RasterLayer.js");
 var _BackgroundLayer = require("./components/layers/BackgroundLayer.js");
 var _MarkerView = require("./components/annotations/MarkerView.js");
 var _LocationManager = require("./modules/location/LocationManager.js");
+var _requestAndroidLocationPermissions = require("./modules/location/requestAndroidLocationPermissions.js");
 var _OfflineManager = require("./modules/offline/OfflineManager.js");
 var _OfflinePack = require("./modules/offline/OfflinePack.js");
 var _OfflineCreatePackOptions = require("./modules/offline/OfflineCreatePackOptions.js");

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_MLRNModule","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_Camera","_MapView","_PointAnnotation","_Annotation","_Callout","_requestAndroidLocationPermissions","_UserLocation","_VectorSource","_ShapeSource","_RasterSource","_ImageSource","_Images","_FillLayer","_FillExtrusionLayer","_HeatmapLayer","_LineLayer","_CircleLayer","_SymbolLayer","_RasterLayer","_BackgroundLayer","_MarkerView","_LocationManager","_OfflineManager","_OfflinePack","_OfflineCreatePackOptions","_SnapshotManager","_Animated","_Logger"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,WAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAL,WAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAb,WAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AAEA,IAAAS,OAAA,GAAAb,OAAA;AAiBA,IAAAc,QAAA,GAAAd,OAAA;AAOA,IAAAe,gBAAA,GAAAf,OAAA;AAEA,IAAAgB,WAAA,GAAAhB,OAAA;AACA,IAAAiB,QAAA,GAAAjB,OAAA;AACA,IAAAkB,kCAAA,GAAAlB,OAAA;AACA,IAAAmB,aAAA,GAAAnB,OAAA;AAKA,IAAAoB,aAAA,GAAApB,OAAA;AACA,IAAAqB,YAAA,GAAArB,OAAA;AAEA,IAAAsB,aAAA,GAAAtB,OAAA;AACA,IAAAuB,YAAA,GAAAvB,OAAA;AACA,IAAAwB,OAAA,GAAAxB,OAAA;AACA,IAAAyB,UAAA,GAAAzB,OAAA;AACA,IAAA0B,mBAAA,GAAA1B,OAAA;AACA,IAAA2B,aAAA,GAAA3B,OAAA;AACA,IAAA4B,UAAA,GAAA5B,OAAA;AACA,IAAA6B,YAAA,GAAA7B,OAAA;AACA,IAAA8B,YAAA,GAAA9B,OAAA;AACA,IAAA+B,YAAA,GAAA/B,OAAA;AACA,IAAAgC,gBAAA,GAAAhC,OAAA;AACA,IAAAiC,WAAA,GAAAjC,OAAA;AAEA,IAAAkC,gBAAA,GAAAlC,OAAA;AAIA,IAAAmC,eAAA,GAAAnC,OAAA;AAGA,IAAAoC,YAAA,GAAApC,OAAA;AACA,IAAAqC,yBAAA,GAAArC,OAAA;AACA,IAAAsC,gBAAA,GAAAtC,OAAA;AAoBA,IAAAuC,SAAA,GAAAvC,OAAA;AACA,IAAAwC,OAAA,GAAAxC,OAAA","ignoreList":[]}
+{"version":3,"names":["_MLRNModule","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_Camera","_MapView","_PointAnnotation","_Annotation","_Callout","_UserLocation","_VectorSource","_ShapeSource","_RasterSource","_ImageSource","_Images","_FillLayer","_FillExtrusionLayer","_HeatmapLayer","_LineLayer","_CircleLayer","_SymbolLayer","_RasterLayer","_BackgroundLayer","_MarkerView","_LocationManager","_requestAndroidLocationPermissions","_OfflineManager","_OfflinePack","_OfflineCreatePackOptions","_SnapshotManager","_Animated","_Logger"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,WAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAL,WAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAb,WAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AAEA,IAAAS,OAAA,GAAAb,OAAA;AAiBA,IAAAc,QAAA,GAAAd,OAAA;AAOA,IAAAe,gBAAA,GAAAf,OAAA;AAEA,IAAAgB,WAAA,GAAAhB,OAAA;AACA,IAAAiB,QAAA,GAAAjB,OAAA;AACA,IAAAkB,aAAA,GAAAlB,OAAA;AAKA,IAAAmB,aAAA,GAAAnB,OAAA;AACA,IAAAoB,YAAA,GAAApB,OAAA;AAEA,IAAAqB,aAAA,GAAArB,OAAA;AACA,IAAAsB,YAAA,GAAAtB,OAAA;AACA,IAAAuB,OAAA,GAAAvB,OAAA;AACA,IAAAwB,UAAA,GAAAxB,OAAA;AACA,IAAAyB,mBAAA,GAAAzB,OAAA;AACA,IAAA0B,aAAA,GAAA1B,OAAA;AACA,IAAA2B,UAAA,GAAA3B,OAAA;AACA,IAAA4B,YAAA,GAAA5B,OAAA;AACA,IAAA6B,YAAA,GAAA7B,OAAA;AACA,IAAA8B,YAAA,GAAA9B,OAAA;AACA,IAAA+B,gBAAA,GAAA/B,OAAA;AACA,IAAAgC,WAAA,GAAAhC,OAAA;AAEA,IAAAiC,gBAAA,GAAAjC,OAAA;AAIA,IAAAkC,kCAAA,GAAAlC,OAAA;AAEA,IAAAmC,eAAA,GAAAnC,OAAA;AAGA,IAAAoC,YAAA,GAAApC,OAAA;AACA,IAAAqC,yBAAA,GAAArC,OAAA;AACA,IAAAsC,gBAAA,GAAAtC,OAAA;AAoBA,IAAAuC,SAAA,GAAAvC,OAAA;AACA,IAAAwC,OAAA,GAAAxC,OAAA","ignoreList":[]}

package/lib/commonjs/modules/location/LocationManager.js

@@ -3,88 +3,77 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.LocationModuleEventEmitter = exports.LocationManager = void 0;
+exports.LocationManager = void 0;
 var _reactNative = require("react-native");
-const MLRNModule = _reactNative.NativeModules.MLRNModule;
-const MLRNLocationModule = _reactNative.NativeModules.MLRNLocationModule;
-const LocationModuleEventEmitter = exports.LocationModuleEventEmitter = new _reactNative.NativeEventEmitter(MLRNLocationModule);
-
-/*
- * Location sent by LocationManager
- */
-
-/*
- * Coordinates sent by LocationManager
- */
-
+var _NativeLocationModule = _interopRequireDefault(require("./NativeLocationModule.js"));
+var _index = require("../../utils/index.js");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class LocationManager {
+  listeners = [];
+  currentPosition = undefined;
+  isListening = false;
+  subscription = undefined;
   constructor() {
-    this._listeners = [];
-    this._lastKnownLocation = null;
-    this._isListening = false;
-    this.onUpdate = this.onUpdate.bind(this);
-    this.subscription = null;
+    this.handleUpdate = this.handleUpdate.bind(this);
   }
-  async getLastKnownLocation() {
-    if (!this._lastKnownLocation) {
-      let lastKnownLocation;
-
-      // as location can be brittle it might happen,
-      // that we get an exception from native land
-      // let's silently catch it and simply log out
-      // instead of throwing an exception
-      try {
-        lastKnownLocation = await MLRNLocationModule.getLastKnownLocation();
-      } catch (error) {
-        console.log("LocationManager Error: ", error);
-      }
-      if (!this._lastKnownLocation && lastKnownLocation) {
-        this._lastKnownLocation = lastKnownLocation;
-      }
+  async getCurrentPosition() {
+    let currentPosition;
+    try {
+      currentPosition = await _NativeLocationModule.default.getCurrentPosition();
+    } catch (error) {
+      console.log("LocationManager [error]: ", error);
     }
-    return this._lastKnownLocation;
+    this.currentPosition = currentPosition;
+    return this.currentPosition;
   }
-  addListener(listener) {
-    if (!this._isListening) {
+  addListener(newListener) {
+    if (!this.isListening) {
       this.start();
     }
-    if (!this._listeners.includes(listener)) {
-      this._listeners.push(listener);
-      if (this._lastKnownLocation) {
-        listener(this._lastKnownLocation);
+    if (!this.listeners.includes(newListener)) {
+      this.listeners.push(newListener);
+      if (this.currentPosition) {
+        newListener(this.currentPosition);
       }
     }
   }
-  removeListener(listener) {
-    this._listeners = this._listeners.filter(l => l !== listener);
-    if (this._listeners.length === 0) {
+  removeListener(oldListener) {
+    this.listeners = this.listeners.filter(listener => listener !== oldListener);
+    if (this.listeners.length === 0) {
       this.stop();
     }
   }
   removeAllListeners() {
-    this._listeners = [];
+    this.listeners = [];
     this.stop();
   }
-  start(displacement = 0) {
-    if (!this._isListening) {
-      MLRNLocationModule.start(displacement);
-      this.subscription = LocationModuleEventEmitter.addListener(MLRNModule.LocationCallbackName.Update, this.onUpdate);
-      this._isListening = true;
+  start() {
+    if (!this.isListening) {
+      _NativeLocationModule.default.start();
+      this.subscription = _NativeLocationModule.default.onUpdate(this.handleUpdate);
+      this.isListening = true;
     }
   }
   stop() {
-    MLRNLocationModule.stop();
-    if (this._isListening) {
+    _NativeLocationModule.default.stop();
+    if (this.isListening) {
       this.subscription?.remove();
     }
-    this._isListening = false;
+    this.isListening = false;
   }
   setMinDisplacement(minDisplacement) {
-    MLRNLocationModule.setMinDisplacement(minDisplacement);
+    _NativeLocationModule.default.setMinDisplacement(minDisplacement);
   }
-  onUpdate(location) {
-    this._lastKnownLocation = location;
-    this._listeners.forEach(l => l(location));
+  handleUpdate(location) {
+    this.currentPosition = location;
+    this.listeners.forEach(listener => listener(location));
+  }
+  async requestAndroidPermissions() {
+    if ((0, _index.isAndroid)()) {
+      const res = await _reactNative.PermissionsAndroid.requestMultiple([_reactNative.PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION, _reactNative.PermissionsAndroid.PERMISSIONS.ACCESS_COARSE_LOCATION]);
+      return Object.values(res).every(permission => permission === _reactNative.PermissionsAndroid.RESULTS.GRANTED);
+    }
+    throw new Error("This method should only be called on Android");
   }
 }
 const locationManager = exports.LocationManager = new LocationManager();