@jacques_gordon/expo-mapbox-navigation 2.0.5 → 2.0.7

package/android/src/main/java/expo/modules/mapboxnavigation/ExpoMapboxNavigationView.kt

@@ -1,24 +1,24 @@
 package expo.modules.mapboxnavigation
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.util.Log
 import com.mapbox.api.directions.v5.models.RouteOptions
 import com.mapbox.geojson.Point
 import com.mapbox.maps.MapView
-import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.Style
-import com.mapbox.maps.plugin.animation.camera
+import com.mapbox.maps.plugin.animation.camera        // ← correct import for .camera extension
+import com.mapbox.maps.plugin.locationcomponent.location
 import com.mapbox.navigation.base.extensions.applyDefaultNavigationOptions
-import com.mapbox.navigation.base.formatter.UnitType
 import com.mapbox.navigation.base.options.NavigationOptions
 import com.mapbox.navigation.base.route.NavigationRoute
 import com.mapbox.navigation.base.route.NavigationRouterCallback
 import com.mapbox.navigation.base.route.RouterFailure
+import com.mapbox.navigation.base.route.RouterOrigin
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.MapboxNavigationProvider
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.directions.session.RoutesUpdatedResult
-import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
 import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.ui.maps.camera.NavigationCamera
 import com.mapbox.navigation.ui.maps.camera.data.MapboxNavigationViewportDataSource
@@ -36,17 +36,14 @@ private const val TAG = "ExpoMapboxNavigation"
 class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     ExpoView(context, appContext) {
 
-    // ── UI ───────────────────────────────────────────────────────────────────
     private val mapView: MapView = MapView(context)
     private var navigationCamera: NavigationCamera? = null
     private var viewportDataSource: MapboxNavigationViewportDataSource? = null
     private var routeLineApi: MapboxRouteLineApi? = null
     private var routeLineView: MapboxRouteLineView? = null
-
-    // ── Navigation ───────────────────────────────────────────────────────────
     private var mapboxNavigation: MapboxNavigation? = null
 
-    // ── Props ────────────────────────────────────────────────────────────────
+    // Props
     private var coordinates: List<Map<String, Double>> = emptyList()
     private var waypointIndices: List<Int>? = null
     private var language: String? = null
@@ -67,87 +64,86 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         setupNavigation()
     }
 
-    // ─────────────────────────────────────────────────────────────────────────
-    // Setup
-    // ─────────────────────────────────────────────────────────────────────────
-
     private fun setupNavigation() {
-        val accessToken = getAccessToken() ?: run {
-            Log.e(TAG, "Mapbox access token not found.")
-            return
-        }
+        val navigationOptions = NavigationOptions.Builder(context).build()
+        mapboxNavigation = MapboxNavigationProvider.create(navigationOptions)
 
-        // Create MapboxNavigation instance (Nav SDK v3 API)
-        val navigationOptions = NavigationOptions.Builder(context)
-            .build()
+        mapView.mapboxMap.loadStyle(mapStyle ?: Style.MAPBOX_STREETS) { style ->
+            // Route line components
+            routeLineApi = MapboxRouteLineApi(MapboxRouteLineApiOptions.Builder().build())
+            routeLineView = MapboxRouteLineView(
+                MapboxRouteLineViewOptions.Builder(context).build()
+            )
 
-        mapboxNavigation = MapboxNavigationProvider.create(navigationOptions)
+            // NavigationCamera — exactly as in official Mapbox example:
+            // NavigationCamera(mapboxMap, mapView.camera, viewportDataSource)
+            viewportDataSource = MapboxNavigationViewportDataSource(mapView.mapboxMap)
+            navigationCamera = NavigationCamera(
+                mapView.mapboxMap,
+                mapView.camera,          // ← mapView.camera (Maps plugin extension)
+                viewportDataSource!!
+            )
 
-        // Setup map style + route line + camera once map is loaded
-        mapView.getMapboxMap().loadStyle(
-            mapStyle ?: Style.MAPBOX_STREETS
-        ) { style ->
-            setupRouteLineComponents(style)
-            setupCamera()
             registerObservers()
         }
     }
 
-    private fun setupRouteLineComponents(style: Style) {
-        routeLineApi = MapboxRouteLineApi(MapboxRouteLineApiOptions.Builder().build())
-        routeLineView = MapboxRouteLineView(MapboxRouteLineViewOptions.Builder(context).build())
-    }
-
-    private fun setupCamera() {
-        val mapboxMap = mapView.getMapboxMap()
-        viewportDataSource = MapboxNavigationViewportDataSource(mapboxMap)
-        navigationCamera = NavigationCamera(
-            mapboxMap,
-            mapView.camera,
-            viewportDataSource!!
-        )
-    }
-
     private fun registerObservers() {
         val nav = mapboxNavigation ?: return
 
-        // Routes observer — updates route line on map
+        // Routes observer
         nav.registerRoutesObserver(object : RoutesObserver {
             override fun onRoutesChanged(result: RoutesUpdatedResult) {
                 val routes = result.navigationRoutes
                 if (routes.isNotEmpty()) {
                     routeLineApi?.setNavigationRoutes(routes) { value ->
-                        mapView.getMapboxMap().getStyle()?.let { style ->
+                        mapView.mapboxMap.style?.let { style ->
                             routeLineView?.renderRouteDrawData(style, value)
                         }
                     }
-                    // Issue #43 fix: safe camera transition to following
+                    // Update viewport data source with the route
+                    viewportDataSource?.onRouteChanged(routes.first())
+                    viewportDataSource?.evaluate()
+
+                    // Issue #43 fix: safe camera following transition
                     safeCameraFollowing()
 
-                    sendEvent("onRoutesReady", mapOf(
+                    emitEvent("onRoutesReady", mapOf(
                         "routeCount" to routes.size,
-                        "distanceMeters" to (routes.firstOrNull()?.directionsRoute?.distance() ?: 0.0),
-                        "durationSeconds" to (routes.firstOrNull()?.directionsRoute?.duration() ?: 0.0)
+                        "distanceMeters" to (routes.first().directionsRoute.distance() ?: 0.0),
+                        "durationSeconds" to (routes.first().directionsRoute.duration() ?: 0.0)
                     ))
+                } else {
+                    routeLineApi?.clearRouteLine { value ->
+                        mapView.mapboxMap.style?.let { style ->
+                            routeLineView?.renderClearRouteLineValue(style, value)
+                        }
+                    }
+                    viewportDataSource?.clearRouteData()
+                    viewportDataSource?.evaluate()
                 }
             }
         })
 
         // Route progress observer
-        nav.registerRouteProgressObserver(RouteProgressObserver { progress ->
-            sendEvent("onRouteProgressChanged", mapOf(
-                "distanceRemaining" to progress.distanceRemaining,
-                "durationRemaining" to progress.durationRemaining,
-                "distanceTraveled" to progress.distanceTraveled,
-                "fractionTraveled" to progress.fractionTraveled,
-                "currentStepDistanceRemaining" to (progress.currentLegProgress?.currentStepProgress?.distanceRemaining ?: 0f)
+        nav.registerRouteProgressObserver(RouteProgressObserver { routeProgress ->
+            // Update viewport data source with progress
+            viewportDataSource?.onRouteProgressChanged(routeProgress)
+            viewportDataSource?.evaluate()
+
+            emitEvent("onRouteProgressChanged", mapOf(
+                "distanceRemaining" to routeProgress.distanceRemaining,
+                "durationRemaining" to routeProgress.durationRemaining,
+                "distanceTraveled" to routeProgress.distanceTraveled,
+                "fractionTraveled" to routeProgress.fractionTraveled,
+                "currentStepDistanceRemaining" to
+                    (routeProgress.currentLegProgress
+                        ?.currentStepProgress?.distanceRemaining ?: 0f)
             ))
         })
     }
 
-    // ─────────────────────────────────────────────────────────────────────────
-    // Issue #43 fix: safe camera transition
-    // ─────────────────────────────────────────────────────────────────────────
+    // ── Issue #43: safe camera transition ────────────────────────────────────
     private fun safeCameraFollowing() {
         try {
             navigationCamera?.requestNavigationCameraToFollowing(
@@ -160,10 +156,8 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         }
     }
 
-    // ─────────────────────────────────────────────────────────────────────────
-    // Issue #31 fix: voice units
-    // ─────────────────────────────────────────────────────────────────────────
-    private fun resolveUnitType(): String {
+    // ── Issue #31: voice units ────────────────────────────────────────────────
+    private fun resolveVoiceUnits(): String {
         return when (voiceUnits?.lowercase()) {
             "metric" -> "metric"
             "imperial" -> "imperial"
@@ -175,9 +169,8 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         }
     }
 
-    // ─────────────────────────────────────────────────────────────────────────
-    // Route request
-    // ─────────────────────────────────────────────────────────────────────────
+    // ── Route request ─────────────────────────────────────────────────────────
+    @SuppressLint("MissingPermission")
     private fun fetchRoutes() {
         val nav = mapboxNavigation ?: return
         if (coordinates.size < 2) return
@@ -185,39 +178,34 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         val points = coordinates.map { coord ->
             Point.fromLngLat(coord["longitude"] ?: 0.0, coord["latitude"] ?: 0.0)
         }
-
         val locale = language?.let { Locale.forLanguageTag(it) } ?: Locale.getDefault()
-        val unitType = resolveUnitType()
 
         val builder = RouteOptions.builder()
             .applyDefaultNavigationOptions()
             .language(locale.toLanguageTag())
-            .voiceUnits(unitType)  // Issue #31 fix
+            .voiceUnits(resolveVoiceUnits())   // Issue #31 fix
             .coordinatesList(points)
 
         waypointIndices?.let { builder.waypointIndicesList(it) }
-
         navigationProfile?.let {
-            val profile = if (it.startsWith("mapbox/")) it else "mapbox/$it"
-            builder.profile(profile)
+            builder.profile(if (it.startsWith("mapbox/")) it else "mapbox/$it")
         }
-
         excludeTypes?.takeIf { it.isNotEmpty() }?.let {
             builder.exclude(it.joinToString(","))
         }
-
         maxHeight?.let { builder.maxHeight(it) }
         maxWidth?.let { builder.maxWidth(it) }
 
+        // Exact Nav SDK v3 callback signature from official Mapbox docs
         nav.requestRoutes(
             builder.build(),
             object : NavigationRouterCallback {
                 override fun onRoutesReady(
                     routes: List<NavigationRoute>,
-                    routerOrigin: com.mapbox.navigation.base.route.RouterOrigin
+                    @RouterOrigin routerOrigin: String
                 ) {
                     if (routes.isEmpty()) {
-                        sendEvent("onRoutesFailed", mapOf("message" to "No routes returned"))
+                        emitEvent("onRoutesFailed", mapOf("message" to "No routes returned"))
                         return
                     }
                     nav.setNavigationRoutes(routes)
@@ -230,12 +218,12 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
                 ) {
                     val msg = reasons.firstOrNull()?.message ?: "Unknown error"
                     Log.e(TAG, "Route request failed: $msg")
-                    sendEvent("onRoutesFailed", mapOf("message" to msg))
+                    emitEvent("onRoutesFailed", mapOf("message" to msg))
                 }
 
                 override fun onCanceled(
                     routeOptions: RouteOptions,
-                    routerOrigin: com.mapbox.navigation.base.route.RouterOrigin
+                    @RouterOrigin routerOrigin: String
                 ) {
                     Log.d(TAG, "Route request cancelled")
                 }
@@ -243,15 +231,22 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         )
     }
 
-    // ─────────────────────────────────────────────────────────────────────────
-    // Prop setters
-    // ─────────────────────────────────────────────────────────────────────────
+    // ── Expo event emitter (SDK 53 compatible) ────────────────────────────────
+    private fun emitEvent(name: String, data: Map<String, Any>) {
+        try {
+            // Expo modules core SDK 53: use appContext.eventEmitter
+            val emitter = appContext.eventEmitter
+            emitter?.emit(name, data)
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to emit event $name: ${e.message}")
+        }
+    }
 
+    // ── Prop setters ──────────────────────────────────────────────────────────
     fun setCoordinates(coords: List<Map<String, Double>>) {
         coordinates = coords
         if (coords.size >= 2) fetchRoutes()
     }
-
     fun setWaypointIndices(indices: List<Int>?) { waypointIndices = indices }
     fun setLanguage(lang: String?) { language = lang }
     fun setVoiceUnits(units: String?) { voiceUnits = units }
@@ -265,28 +260,13 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     fun setCustomRasterTileUrl(url: String?) { customRasterTileUrl = url }
     fun setCustomRasterAboveLayerId(layerId: String?) { customRasterAboveLayerId = layerId }
 
-    // ─────────────────────────────────────────────────────────────────────────
-    // Helpers
-    // ─────────────────────────────────────────────────────────────────────────
-
-    private fun getAccessToken(): String? {
-        return try {
-            val resId = context.resources.getIdentifier(
-                "mapbox_access_token", "string", context.packageName
-            )
-            if (resId != 0) context.getString(resId) else null
-        } catch (e: Exception) { null }
-    }
-
-    private fun sendEvent(name: String, data: Map<String, Any>) {
-        appContext.eventEmitter?.emit(name, data)
-    }
-
+    // ── Lifecycle ─────────────────────────────────────────────────────────────
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
+        routeLineApi?.cancel()
+        routeLineView?.cancel()
         mapboxNavigation?.stopTripSession()
         MapboxNavigationProvider.destroy()
-        routeLineApi?.cancel()
         mapView.onStop()
         mapView.onDestroy()
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacques_gordon/expo-mapbox-navigation",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "Expo module for Mapbox Navigation SDK with 16KB page size support, NDK27, and Mapbox Maps v11.11.0+",
   "main": "build/index.js",
   "types": "build/index.d.ts",