@maplibre/maplibre-react-native 11.0.0-alpha.13 → 11.0.0-alpha.15

package/lib/typescript/module/src/modules/location/NativeLocationModule.d.ts

@@ -0,0 +1,24 @@
+import type { TurboModule, CodegenTypes } from "react-native";
+type NativeGeolocationCoordinates = {
+    longitude: CodegenTypes.Double;
+    latitude: CodegenTypes.Double;
+    accuracy: CodegenTypes.Double;
+    altitude: CodegenTypes.Double;
+    altitudeAccuracy: CodegenTypes.Double | null;
+    heading: CodegenTypes.Double;
+    speed: CodegenTypes.Double;
+};
+type NativeGeolocationPosition = {
+    coords: NativeGeolocationCoordinates;
+    timestamp: number;
+};
+export interface Spec extends TurboModule {
+    start(): void;
+    stop(): void;
+    getCurrentPosition(): Promise<NativeGeolocationPosition>;
+    setMinDisplacement(minDisplacement: number): void;
+    readonly onUpdate: CodegenTypes.EventEmitter<NativeGeolocationPosition>;
+}
+declare const _default: Spec;
+export default _default;
+//# sourceMappingURL=NativeLocationModule.d.ts.map

package/lib/typescript/module/src/modules/location/NativeLocationModule.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NativeLocationModule.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/location/NativeLocationModule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG9D,KAAK,4BAA4B,GAAG;IAClC,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC;IAC/B,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC;IAC9B,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC;IAC9B,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC;IAC9B,gBAAgB,EAAE,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC;IAC7C,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC;IAC7B,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC;CAC5B,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B,MAAM,EAAE,4BAA4B,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,KAAK,IAAI,IAAI,CAAC;IAEd,IAAI,IAAI,IAAI,CAAC;IAEb,kBAAkB,IAAI,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAEzD,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAElD,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAC;CACzE;;AAED,wBAA4E"}

package/lib/typescript/module/src/modules/location/requestAndroidLocationPermissions.d.ts

@@ -0,0 +1,5 @@
+/**
+ * @deprected Use `LocationManager.requestAndroidPermissions` instead
+ */
+export declare function requestAndroidLocationPermissions(): Promise<boolean>;
+//# sourceMappingURL=requestAndroidLocationPermissions.d.ts.map

package/lib/typescript/module/src/modules/location/requestAndroidLocationPermissions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"requestAndroidLocationPermissions.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/location/requestAndroidLocationPermissions.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,OAAO,CAAC,CAE1E"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-react-native",
   "description": "React Native library for creating maps with MapLibre Native for Android & iOS",
-  "version": "11.0.0-alpha.13",
+  "version": "11.0.0-alpha.15",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -127,10 +127,12 @@
     },
     "ios": {
       "componentProvider": {
-        "MLRNMapView": "MLRNMapViewComponentView",
-        "MLRNCamera": "MLRNCameraComponentView"
+        "MLRNCamera": "MLRNCameraComponentView",
+        "MLRNMapView": "MLRNMapViewComponentView"
       },
       "modulesProvider": {
+        "MLRNCameraModule": "MLRNCameraModule",
+        "MLRNLocationModule": "MLRNLocationModule",
         "MLRNMapViewModule": "MLRNMapViewModule"
       }
     }

package/src/components/user-location/UserLocation.tsx

@@ -11,7 +11,7 @@ import {
 import { NativeUserLocation } from "./NativeUserLocation";
 import { UserLocationPuck } from "./UserLocationPuck";
 import {
-  type Location,
+  type GeolocationPosition,
   LocationManager,
 } from "../../modules/location/LocationManager";
 import { Annotation } from "../annotations/Annotation";
@@ -49,7 +49,7 @@ interface UserLocationProps {
   /**
    * Callback that is triggered on location update
    */
-  onUpdate?: (location: Location) => void;
+  onUpdate?: (location: GeolocationPosition) => void;
   /**
    * Show or hide small arrow which indicates direction the device is pointing relative to north.
    */
@@ -86,7 +86,7 @@ export enum UserLocationRenderMode {
 export interface UserLocationRef {
   setLocationManager: (props: { running: boolean }) => Promise<void>;
   needsLocationManagerRunning: () => boolean;
-  _onLocationUpdate: (location: Location | null) => void;
+  _onLocationUpdate: (location: GeolocationPosition | undefined) => void;
 }
 
 export const UserLocation = memo(
@@ -149,7 +149,7 @@ export const UserLocation = memo(
             return;
           }
 
-          LocationManager.setMinDisplacement(minDisplacement ?? 0);
+          LocationManager.setMinDisplacement(minDisplacement);
         });
 
         return (): void => {
@@ -160,7 +160,7 @@ export const UserLocation = memo(
       }, []);
 
       useEffect(() => {
-        LocationManager.setMinDisplacement(minDisplacement ?? 0);
+        LocationManager.setMinDisplacement(minDisplacement);
       }, [minDisplacement]);
 
       useEffect(() => {
@@ -183,7 +183,7 @@ export const UserLocation = memo(
 
           if (running) {
             LocationManager.addListener(_onLocationUpdate);
-            const location = await LocationManager.getLastKnownLocation();
+            const location = await LocationManager.getCurrentPosition();
             _onLocationUpdate(location);
           } else {
             LocationManager.removeListener(_onLocationUpdate);
@@ -198,7 +198,9 @@ export const UserLocation = memo(
         );
       }
 
-      function _onLocationUpdate(location: Location | null): void {
+      function _onLocationUpdate(
+        location: GeolocationPosition | undefined,
+      ): void {
         if (!_isMounted.current || !location) {
           return;
         }

package/src/index.ts

@@ -28,7 +28,6 @@ export { PointAnnotation } from "./components/annotations/PointAnnotation";
 export type { PointAnnotationRef } from "./components/annotations/PointAnnotation";
 export { Annotation } from "./components/annotations/Annotation";
 export { Callout } from "./components/annotations/Callout";
-export { requestAndroidLocationPermissions } from "./requestAndroidLocationPermissions";
 export {
   UserLocation,
   UserLocationRenderMode,
@@ -52,8 +51,10 @@ export { MarkerView } from "./components/annotations/MarkerView";
 
 export {
   LocationManager,
-  type Location,
+  type GeolocationPosition,
 } from "./modules/location/LocationManager";
+export { requestAndroidLocationPermissions } from "./modules/location/requestAndroidLocationPermissions";
+
 export { OfflineManager } from "./modules/offline/OfflineManager";
 export type { OfflinePackError } from "./modules/offline/OfflineManager";
 export type { OfflinePackStatus } from "./modules/offline/OfflinePack";

package/src/modules/location/LocationManager.ts

@@ -1,160 +1,153 @@
 import {
-  NativeModules,
-  NativeEventEmitter,
-  type EmitterSubscription,
+  type EventSubscription,
+  type Permission,
+  PermissionsAndroid,
 } from "react-native";
 
-const MLRNModule = NativeModules.MLRNModule;
-const MLRNLocationModule = NativeModules.MLRNLocationModule;
+import NativeLocationModule from "./NativeLocationModule";
+import { isAndroid } from "../../utils";
 
-export const LocationModuleEventEmitter = new NativeEventEmitter(
-  MLRNLocationModule,
-);
-
-/*
- * Location sent by LocationManager
- */
-export interface Location {
-  coords: Coordinates;
-  timestamp?: number;
-}
-
-/*
- * Coordinates sent by LocationManager
- */
-interface Coordinates {
-  /*
-   * The heading (measured in degrees) relative to true north.
-   * Heading is used to describe the direction the device is pointing to (the value of the compass).
-   * Note that on Android this is incorrectly reporting the course value as mentioned in issue https://github.com/rnmapbox/maps/issues/1213
-   * and will be corrected in a future update.
+interface GeolocationCoordinates {
+  /**
+   * Longitude in degrees
    */
-  heading?: number;
+  longitude: number;
 
-  /*
-   * The direction in which the device is traveling, measured in degrees and relative to due north.
-   * The course refers to the direction the device is actually moving (not the same as heading).
+  /**
+   * Latitude in degrees
    */
-  course?: number;
+  latitude: number;
 
-  /*
-   * The instantaneous speed of the device, measured in meters per second.
+  /**
+   * Accuracy for longitude/latitude in meters
    */
-  speed?: number;
+  accuracy: number;
 
-  /*
-   * The latitude in degrees.
+  /**
+   * Altitude in meters
    */
-  latitude: number;
+  altitude: number;
 
-  /*
-   * The longitude in degrees.
+  /**
+   * Accuracy for altitude in meters
    */
-  longitude: number;
+  altitudeAccuracy: number | null;
 
-  /*
-   * The radius of uncertainty for the location, measured in meters.
+  /**
+   * Direction in which the device is traveling in degrees, relative to north
    */
-  accuracy?: number;
+  heading: number;
 
-  /*
-   * The altitude, measured in meters.
+  /**
+   * Instantaneous speed of the device in meters per second
    */
-  altitude?: number;
+  speed: number;
+}
+
+export interface GeolocationPosition {
+  coords: GeolocationCoordinates;
+
+  timestamp: number;
 }
 
 class LocationManager {
-  _listeners: ((location: Location) => void)[];
-  _lastKnownLocation: Location | null;
-  _isListening: boolean;
-  subscription: EmitterSubscription | null;
+  private listeners: ((location: GeolocationPosition) => void)[] = [];
+  private currentPosition: GeolocationPosition | undefined = undefined;
+  private isListening: boolean = false;
+
+  private subscription: EventSubscription | undefined = 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(): Promise<Location | null> {
-    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);
-      }
+  async getCurrentPosition(): Promise<GeolocationPosition | undefined> {
+    let currentPosition;
 
-      if (!this._lastKnownLocation && lastKnownLocation) {
-        this._lastKnownLocation = lastKnownLocation;
-      }
+    try {
+      currentPosition = await NativeLocationModule.getCurrentPosition();
+    } catch (error) {
+      console.log("LocationManager [error]: ", error);
     }
 
-    return this._lastKnownLocation;
+    this.currentPosition = currentPosition;
+
+    return this.currentPosition;
   }
 
-  addListener(listener: (location: Location) => void): void {
-    if (!this._isListening) {
+  addListener(newListener: (location: GeolocationPosition) => void): void {
+    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: (location: Location) => void): void {
-    this._listeners = this._listeners.filter((l) => l !== listener);
-    if (this._listeners.length === 0) {
+  removeListener(oldListener: (location: GeolocationPosition) => void): void {
+    this.listeners = this.listeners.filter(
+      (listener) => listener !== oldListener,
+    );
+
+    if (this.listeners.length === 0) {
       this.stop();
     }
   }
 
   removeAllListeners(): void {
-    this._listeners = [];
+    this.listeners = [];
+
     this.stop();
   }
 
-  start(displacement = 0): void {
-    if (!this._isListening) {
-      MLRNLocationModule.start(displacement);
+  start(): void {
+    if (!this.isListening) {
+      NativeLocationModule.start();
 
-      this.subscription = LocationModuleEventEmitter.addListener(
-        MLRNModule.LocationCallbackName.Update,
-        this.onUpdate,
-      );
+      this.subscription = NativeLocationModule.onUpdate(this.handleUpdate);
 
-      this._isListening = true;
+      this.isListening = true;
     }
   }
 
   stop(): void {
-    MLRNLocationModule.stop();
+    NativeLocationModule.stop();
 
-    if (this._isListening) {
+    if (this.isListening) {
       this.subscription?.remove();
     }
 
-    this._isListening = false;
+    this.isListening = false;
   }
 
   setMinDisplacement(minDisplacement: number): void {
-    MLRNLocationModule.setMinDisplacement(minDisplacement);
+    NativeLocationModule.setMinDisplacement(minDisplacement);
   }
 
-  onUpdate(location: Location): void {
-    this._lastKnownLocation = location;
+  private handleUpdate(location: GeolocationPosition): void {
+    this.currentPosition = location;
+
+    this.listeners.forEach((listener) => listener(location));
+  }
+
+  async requestAndroidPermissions(): Promise<boolean> {
+    if (isAndroid()) {
+      const res = await PermissionsAndroid.requestMultiple([
+        PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION as Permission,
+        PermissionsAndroid.PERMISSIONS.ACCESS_COARSE_LOCATION as Permission,
+      ]);
+
+      return Object.values(res).every(
+        (permission) => permission === PermissionsAndroid.RESULTS.GRANTED,
+      );
+    }
 
-    this._listeners.forEach((l) => l(location));
+    throw new Error("This method should only be called on Android");
   }
 }
 

package/src/modules/location/NativeLocationModule.ts

@@ -0,0 +1,31 @@
+import type { TurboModule, CodegenTypes } from "react-native";
+import { TurboModuleRegistry } from "react-native";
+
+type NativeGeolocationCoordinates = {
+  longitude: CodegenTypes.Double;
+  latitude: CodegenTypes.Double;
+  accuracy: CodegenTypes.Double;
+  altitude: CodegenTypes.Double;
+  altitudeAccuracy: CodegenTypes.Double | null;
+  heading: CodegenTypes.Double;
+  speed: CodegenTypes.Double;
+};
+
+type NativeGeolocationPosition = {
+  coords: NativeGeolocationCoordinates;
+  timestamp: number;
+};
+
+export interface Spec extends TurboModule {
+  start(): void;
+
+  stop(): void;
+
+  getCurrentPosition(): Promise<NativeGeolocationPosition>;
+
+  setMinDisplacement(minDisplacement: number): void;
+
+  readonly onUpdate: CodegenTypes.EventEmitter<NativeGeolocationPosition>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>("MLRNLocationModule");

package/src/modules/location/requestAndroidLocationPermissions.ts

@@ -0,0 +1,8 @@
+import { LocationManager } from "./LocationManager";
+
+/**
+ * @deprected Use `LocationManager.requestAndroidPermissions` instead
+ */
+export async function requestAndroidLocationPermissions(): Promise<boolean> {
+  return LocationManager.requestAndroidPermissions();
+}

package/android/src/main/java/org/maplibre/reactnative/events/LocationEvent.java

@@ -1,100 +0,0 @@
-package org.maplibre.reactnative.events;
-
-import android.location.Location;
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import org.maplibre.reactnative.components.mapview.MLRNMapView;
-import org.maplibre.reactnative.events.constants.EventKeys;
-import org.maplibre.reactnative.events.constants.EventTypes;
-
-import java.util.UUID;
-
-public class LocationEvent implements IEvent {
-    private UUID uuid;
-    private MLRNMapView mapView;
-    private Location location;
-
-    public LocationEvent(@NonNull Location location, MLRNMapView mapView) {
-        this.mapView = mapView;
-        this.location = location;
-        this.uuid = UUID.randomUUID();
-    }
-
-    public LocationEvent(Location location) {
-        this(location, null);
-    }
-
-    @Override
-    public int getID() {
-        if (mapView != null) {
-            return mapView.getId();
-        }
-        return -1;
-    }
-
-    public UUID getUUID() {
-        return uuid;
-    }
-
-    @Override
-    public String getKey() {
-        return EventKeys.USER_LOCATION_UPDATE;
-    }
-
-    @Override
-    public String getType() {
-        return EventTypes.USER_LOCATION_UPDATED;
-    }
-
-    @Override
-    public long getTimestamp() {
-        return System.currentTimeMillis();
-    }
-
-    @Override
-    public boolean equals(IEvent event) {
-        LocationEvent other = (LocationEvent) event;
-        return getUUID().equals(other.getUUID());
-    }
-
-    public boolean equals(LocationEvent event) {
-        return uuid.equals(event.getUUID());
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        WritableMap positionProperties = new WritableNativeMap();
-        WritableMap coords = new WritableNativeMap();
-
-        coords.putDouble("longitude", location.getLongitude());
-        coords.putDouble("latitude", location.getLatitude());
-        coords.putDouble("altitude", location.getAltitude());
-        coords.putDouble("accuracy", location.getAccuracy());
-        // A better solution will be to pull the heading from the compass engine, 
-        // unfortunately the api is not publicly available in the mapbox sdk
-        coords.putDouble("heading", location.getBearing());
-        coords.putDouble("course", location.getBearing());
-        coords.putDouble("speed", location.getSpeed());
-
-        positionProperties.putMap("coords", coords);
-        positionProperties.putDouble("timestamp", location.getTime());
-
-        return positionProperties;
-    }
-
-    @Override
-    public WritableMap toJSON() {
-        WritableMap map = Arguments.createMap();
-        map.putString("type", getType());
-        map.putMap("payload", getPayload());
-        return map;
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        return true;
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/events/TrackUserLocationChangeEvent.kt

@@ -1,24 +0,0 @@
-package org.maplibre.reactnative.events
-
-import android.view.View
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.uimanager.events.Event
-import org.maplibre.reactnative.events.constants.EventKeys
-import org.maplibre.reactnative.events.constants.EventTypes
-import org.maplibre.reactnative.location.TrackUserLocationMode
-
-class TrackUserLocationChangeEvent(
-    surfaceId: Int,
-    viewId: Int,
-    private val trackUserLocationMode: Int
-) :
-    Event<TrackUserLocationChangeEvent>(surfaceId, viewId) {
-    override fun getEventName() = "onTrackUserLocationChange"
-
-    override fun getEventData(): WritableMap? {
-        return Arguments.createMap().apply {
-            putString("trackUserLocation", TrackUserLocationMode.toString(trackUserLocationMode))
-        }
-    }
-}