feat: migrate LocationManager to new Architecture (#1111)

Author: KiwiKilian

android/src/main/java/org/maplibre/reactnative/MLRNPackage.kt

@@ -55,7 +55,7 @@ class MLRNPackage : BaseReactPackage() {
 
             MLRNOfflineModule.REACT_CLASS -> return MLRNOfflineModule(reactContext)
             MLRNSnapshotModule.NAME -> return MLRNSnapshotModule(reactContext)
-            MLRNLocationModule.REACT_CLASS -> return MLRNLocationModule(reactContext)
+            MLRNLocationModule.NAME -> return MLRNLocationModule(reactContext)
             MLRNLogging.REACT_CLASS -> return MLRNLogging(reactContext)
         }
 
@@ -111,13 +111,13 @@ class MLRNPackage : BaseReactPackage() {
                 isTurboModule = true
             )
 
-            moduleInfos[MLRNLocationModule.REACT_CLASS] = ReactModuleInfo(
-                MLRNLocationModule.REACT_CLASS,
-                MLRNLocationModule.REACT_CLASS,
+            moduleInfos[MLRNLocationModule.NAME] = ReactModuleInfo(
+                MLRNLocationModule.NAME,
+                MLRNLocationModule.NAME,
                 canOverrideExistingModule = false,
                 needsEagerInit = false,
                 isCxxModule = false,
-                isTurboModule = false
+                isTurboModule = true
             )
 
             moduleInfos[MLRNLogging.REACT_CLASS] = ReactModuleInfo(

android/src/main/java/org/maplibre/reactnative/components/camera/MLRNCamera.kt

@@ -1,14 +1,16 @@
 package org.maplibre.reactnative.components.camera
 
+import android.Manifest
 import android.content.Context
 import android.location.Location
 import android.util.AttributeSet
+import androidx.annotation.RequiresPermission
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.EventDispatcher
 import org.maplibre.android.camera.CameraPosition
 import org.maplibre.android.camera.CameraUpdateFactory.newCameraPosition
@@ -22,8 +24,6 @@ import org.maplibre.reactnative.components.AbstractMapFeature
 import org.maplibre.reactnative.components.camera.constants.CameraEasing
 import org.maplibre.reactnative.components.location.LocationComponentManager
 import org.maplibre.reactnative.components.mapview.MLRNMapView
-import org.maplibre.reactnative.events.MapChangeEvent
-import org.maplibre.reactnative.events.TrackUserLocationChangeEvent
 import org.maplibre.reactnative.location.LocationManager
 import org.maplibre.reactnative.location.LocationManager.OnUserLocationChange
 import org.maplibre.reactnative.location.TrackUserLocationMode
@@ -63,13 +63,12 @@ class MLRNCamera(context: Context) : AbstractMapFeature(
 
 
     private val locationChangeListener: OnUserLocationChange = object : OnUserLocationChange {
-        override fun onLocationChange(nextLocation: Location) {
+        override fun onLocationChange(location: Location) {
             if (mapView!!.mapLibreMap == null || locationComponentManager == null || !locationComponentManager!!.hasLocationComponent() || trackUserLocation == TrackUserLocationMode.NONE) {
                 return
             }
 
-            userLocation.currentLocation = nextLocation
-            sendUserLocationUpdateEvent(nextLocation)
+            userLocation.setCurrentLocation(location);
         }
     }
 
@@ -103,6 +102,7 @@ class MLRNCamera(context: Context) : AbstractMapFeature(
         }
     }
 
+    @RequiresPermission(allOf = [Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION])
     override fun addToMap(mapView: MLRNMapView) {
         this@MLRNCamera.mapView = mapView
 
@@ -192,7 +192,7 @@ class MLRNCamera(context: Context) : AbstractMapFeature(
     private fun updateUserTrackingMode(trackUserLocationMode: Int) {
         userLocation.trackingMode = trackUserLocationMode
 
-        val event = TrackUserLocationChangeEvent(surfaceId, id, trackUserLocationMode)
+        val event = OnTrackUserLocationChangeEvent(surfaceId, id, trackUserLocationMode)
         eventDispatcher?.dispatchEvent(event)
     }
 
@@ -232,17 +232,6 @@ class MLRNCamera(context: Context) : AbstractMapFeature(
             return direction
         }
 
-    private fun sendUserLocationUpdateEvent(location: Location?) {
-        if (location == null) {
-            return
-        }
-        // TODO: This has to be emitted from the proper Component
-        val event = MapChangeEvent(
-            surfaceId, id, "onUpdate", makeLocationChangePayload(location)
-        )
-        eventDispatcher?.dispatchEvent(event)
-    }
-
     private fun updateUserLocationSignificantly() {
         userTrackingState = TrackUserLocationState.BEGAN
 
@@ -282,12 +271,13 @@ class MLRNCamera(context: Context) : AbstractMapFeature(
         mapView!!.moveCamera(cameraUpdate, callback)
     }
 
+    @RequiresPermission(allOf = [Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION])
     private fun enableLocation() {
         if (!PermissionsManager.areLocationPermissionsGranted(context)) {
             return
         }
 
-        if (!locationManager.isActive) {
+        if (!locationManager.isActive()) {
             locationManager.enable()
         }
 
@@ -385,25 +375,23 @@ class MLRNCamera(context: Context) : AbstractMapFeature(
             return mapView!!.mapLibreMap
         }
 
-    // TODO: Update structure
-    private fun makeLocationChangePayload(location: Location): WritableMap {
-        val positionProperties: WritableMap = WritableNativeMap()
-        val coordinates: WritableMap = WritableNativeMap()
-
-        coordinates.putDouble("longitude", location.longitude)
-        coordinates.putDouble("latitude", location.latitude)
-        coordinates.putDouble("altitude", location.altitude)
-        coordinates.putDouble("accuracy", location.accuracy.toDouble())
-        // TODO
-        // A better solution will be to pull the heading from the compass engine, 
-        // unfortunately the api is not public
-        coordinates.putDouble("heading", location.bearing.toDouble())
-        coordinates.putDouble("course", location.bearing.toDouble())
-        coordinates.putDouble("speed", location.speed.toDouble())
-
-        positionProperties.putMap("coords", coordinates)
-        positionProperties.putDouble("timestamp", location.time.toDouble())
-
-        return positionProperties
+
+    inner class OnTrackUserLocationChangeEvent(
+        surfaceId: Int,
+        viewId: Int,
+        private val trackUserLocationMode: Int
+    ) :
+        Event<OnTrackUserLocationChangeEvent>(surfaceId, viewId) {
+        override fun getEventName() = "onTrackUserLocationChange"
+
+        override fun getEventData(): WritableMap {
+            return Arguments.createMap().apply {
+                putString(
+                    "trackUserLocation",
+                    TrackUserLocationMode.toString(trackUserLocationMode)
+                )
+            }
+        }
     }
+
 }

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

@@ -6,8 +6,6 @@ public class EventKeys {
     // map events
     public static final String MAP_CLICK = ns("map.press");
     public static final String MAP_LONG_CLICK = ns("map.longpress");
-    public static final String MAP_ONCHANGE = ns("map.change");
-    public static final String MAP_ON_LOCATION_CHANGE = ns("map.location.change");
     public static final String MAP_ANDROID_CALLBACK = ns("map.androidcallback");
 
     // point annotation events
@@ -25,8 +23,6 @@ public class EventKeys {
     // images event
     public static final String IMAGES_MISSING = ns("images.missing");
 
-    // location events
-    public static final String USER_LOCATION_UPDATE = ns("user.location.update");
 
     private static String ns(String name) {
         return String.format("%s.%s", NAMESPACE, name);

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

@@ -4,7 +4,6 @@ public class EventTypes {
     // map event types
     public static final String MAP_CLICK = "press";
     public static final String MAP_LONG_CLICK = "longpress";
-    public static final String USER_LOCATION_UPDATED = "userlocationdupdated";
 
     // point annotation event types
     public static final String ANNOTATION_SELECTED = "annotationselected";