@jacques_gordon/expo-mapbox-navigation 2.0.6 → 2.0.8

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

@@ -8,6 +8,7 @@ class ExpoMapboxNavigationModule : Module() {
         Name("ExpoMapboxNavigation")
 
         View(ExpoMapboxNavigationView::class) {
+            // Events must be declared here — they correspond to EventDispatcher fields in the View
             Events(
                 "onRouteProgressChanged",
                 "onRoutesReady",
@@ -17,70 +18,42 @@ class ExpoMapboxNavigationModule : Module() {
                 "onArrival"
             )
 
-            // Coordinates: Array of {latitude, longitude} objects
             Prop("coordinates") { view: ExpoMapboxNavigationView, coordinates: List<Map<String, Double>> ->
                 view.setCoordinates(coordinates)
             }
-
-            // Waypoint indices
             Prop("waypointIndices") { view: ExpoMapboxNavigationView, indices: List<Int>? ->
                 view.setWaypointIndices(indices)
             }
-
-            // Language/locale
             Prop("language") { view: ExpoMapboxNavigationView, language: String? ->
                 view.setLanguage(language)
             }
-
-            // ─────────────────────────────────────────────────────────────
-            // voiceUnits prop — fixes Issue #31 (metric/imperial selection)
-            // Accepts: "metric" | "imperial" | null (auto from locale)
-            // ─────────────────────────────────────────────────────────────
             Prop("voiceUnits") { view: ExpoMapboxNavigationView, units: String? ->
                 view.setVoiceUnits(units)
             }
-
-            // Navigation profile
             Prop("navigationProfile") { view: ExpoMapboxNavigationView, profile: String? ->
                 view.setNavigationProfile(profile)
             }
-
-            // Excluded road types
             Prop("excludeTypes") { view: ExpoMapboxNavigationView, types: List<String>? ->
                 view.setExcludeTypes(types)
             }
-
-            // Map style URL
             Prop("mapStyle") { view: ExpoMapboxNavigationView, style: String? ->
                 view.setMapStyle(style)
             }
-
-            // Mute navigation audio
             Prop("mute") { view: ExpoMapboxNavigationView, mute: Boolean ->
                 view.setMute(mute)
             }
-
-            // Vehicle height restriction (meters)
             Prop("maxHeight") { view: ExpoMapboxNavigationView, height: Double? ->
                 view.setMaxHeight(height)
             }
-
-            // Vehicle width restriction (meters)
             Prop("maxWidth") { view: ExpoMapboxNavigationView, width: Double? ->
                 view.setMaxWidth(width)
             }
-
-            // Map matching mode
             Prop("useMapMatching") { view: ExpoMapboxNavigationView, use: Boolean ->
                 view.setUseMapMatching(use)
             }
-
-            // Custom raster tile URL
             Prop("customRasterTileUrl") { view: ExpoMapboxNavigationView, url: String? ->
                 view.setCustomRasterTileUrl(url)
             }
-
-            // Layer ID above which custom raster goes
             Prop("customRasterAboveLayerId") { view: ExpoMapboxNavigationView, layerId: String? ->
                 view.setCustomRasterAboveLayerId(layerId)
             }

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

@@ -1,11 +1,13 @@
 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.Style
+import com.mapbox.maps.plugin.animation.camera
 import com.mapbox.navigation.base.extensions.applyDefaultNavigationOptions
 import com.mapbox.navigation.base.options.NavigationOptions
 import com.mapbox.navigation.base.route.NavigationRoute
@@ -25,6 +27,7 @@ import com.mapbox.navigation.ui.maps.route.line.api.MapboxRouteLineView
 import com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineApiOptions
 import com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineViewOptions
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
 import java.util.Locale
 
@@ -33,6 +36,16 @@ private const val TAG = "ExpoMapboxNavigation"
 class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     ExpoView(context, appContext) {
 
+    // ── EventDispatchers — the correct Expo Modules API for View events ───────
+    // Each event declared here must match the Events(...) list in ExpoMapboxNavigationModule
+    private val onRouteProgressChanged by EventDispatcher()
+    private val onRoutesReady by EventDispatcher()
+    private val onNavigationFinished by EventDispatcher()
+    private val onNavigationCancelled by EventDispatcher()
+    private val onRoutesFailed by EventDispatcher()
+    private val onArrival by EventDispatcher()
+
+    // ── Map & Navigation ──────────────────────────────────────────────────────
     private val mapView: MapView = MapView(context)
     private var navigationCamera: NavigationCamera? = null
     private var viewportDataSource: MapboxNavigationViewportDataSource? = null
@@ -40,7 +53,7 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     private var routeLineView: MapboxRouteLineView? = null
     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
@@ -65,13 +78,14 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         val navigationOptions = NavigationOptions.Builder(context).build()
         mapboxNavigation = MapboxNavigationProvider.create(navigationOptions)
 
-        mapView.getMapboxMap().loadStyle(mapStyle ?: Style.MAPBOX_STREETS) { style ->
+        mapView.mapboxMap.loadStyle(mapStyle ?: Style.MAPBOX_STREETS) { _ ->
             routeLineApi = MapboxRouteLineApi(MapboxRouteLineApiOptions.Builder().build())
-            routeLineView = MapboxRouteLineView(MapboxRouteLineViewOptions.Builder(context).build())
-
-            viewportDataSource = MapboxNavigationViewportDataSource(mapView.getMapboxMap())
+            routeLineView = MapboxRouteLineView(
+                MapboxRouteLineViewOptions.Builder(context).build()
+            )
+            viewportDataSource = MapboxNavigationViewportDataSource(mapView.mapboxMap)
             navigationCamera = NavigationCamera(
-                mapView.getMapboxMap(),
+                mapView.mapboxMap,
                 mapView.camera,
                 viewportDataSource!!
             )
@@ -87,33 +101,48 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
                 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)
                         }
                     }
+                    viewportDataSource?.onRouteChanged(routes.first())
+                    viewportDataSource?.evaluate()
                     safeCameraFollowing()
-                    emit("onRoutesReady", mapOf(
+
+                    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()
                 }
             }
         })
 
-        nav.registerRouteProgressObserver(RouteProgressObserver { progress ->
-            emit("onRouteProgressChanged", mapOf(
-                "distanceRemaining" to progress.distanceRemaining,
-                "durationRemaining" to progress.durationRemaining,
-                "distanceTraveled" to progress.distanceTraveled,
-                "fractionTraveled" to progress.fractionTraveled,
+        nav.registerRouteProgressObserver(RouteProgressObserver { routeProgress ->
+            viewportDataSource?.onRouteProgressChanged(routeProgress)
+            viewportDataSource?.evaluate()
+
+            onRouteProgressChanged(mapOf(
+                "distanceRemaining" to routeProgress.distanceRemaining,
+                "durationRemaining" to routeProgress.durationRemaining,
+                "distanceTraveled" to routeProgress.distanceTraveled,
+                "fractionTraveled" to routeProgress.fractionTraveled,
                 "currentStepDistanceRemaining" to
-                    (progress.currentLegProgress?.currentStepProgress?.distanceRemaining ?: 0f)
+                    (routeProgress.currentLegProgress
+                        ?.currentStepProgress?.distanceRemaining ?: 0f)
             ))
         })
     }
 
-    // ── Issue #43: safe camera transition ────────────────────────────────────
+    // ── Issue #43: safe camera ────────────────────────────────────────────────
     private fun safeCameraFollowing() {
         try {
             navigationCamera?.requestNavigationCameraToFollowing(
@@ -127,18 +156,19 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     }
 
     // ── Issue #31: voice units ────────────────────────────────────────────────
-    private fun resolveUnitType(): String {
+    private fun resolveVoiceUnits(): String {
         return when (voiceUnits?.lowercase()) {
             "metric" -> "metric"
             "imperial" -> "imperial"
             else -> {
                 val locale = language?.let { Locale.forLanguageTag(it) } ?: Locale.getDefault()
-                val imperialCountries = setOf("US", "GB", "LR", "MM")
-                if (locale.country in imperialCountries) "imperial" else "metric"
+                if (locale.country in setOf("US", "GB", "LR", "MM")) "imperial" else "metric"
             }
         }
     }
 
+    // ── Route request ─────────────────────────────────────────────────────────
+    @SuppressLint("MissingPermission")
     private fun fetchRoutes() {
         val nav = mapboxNavigation ?: return
         if (coordinates.size < 2) return
@@ -146,24 +176,24 @@ 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 builder = RouteOptions.builder()
             .applyDefaultNavigationOptions()
             .language(locale.toLanguageTag())
-            .voiceUnits(resolveUnitType())
+            .voiceUnits(resolveVoiceUnits())
             .coordinatesList(points)
 
         waypointIndices?.let { builder.waypointIndicesList(it) }
         navigationProfile?.let {
             builder.profile(if (it.startsWith("mapbox/")) it else "mapbox/$it")
         }
-        excludeTypes?.takeIf { it.isNotEmpty() }?.let { builder.exclude(it.joinToString(",")) }
+        excludeTypes?.takeIf { it.isNotEmpty() }?.let {
+            builder.exclude(it.joinToString(","))
+        }
         maxHeight?.let { builder.maxHeight(it) }
         maxWidth?.let { builder.maxWidth(it) }
 
-        // Nav SDK v3: NavigationRouterCallback uses @RouterOrigin String (not enum)
         nav.requestRoutes(
             builder.build(),
             object : NavigationRouterCallback {
@@ -172,7 +202,7 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
                     @RouterOrigin routerOrigin: String
                 ) {
                     if (routes.isEmpty()) {
-                        emit("onRoutesFailed", mapOf("message" to "No routes returned"))
+                        onRoutesFailed(mapOf("message" to "No routes returned"))
                         return
                     }
                     nav.setNavigationRoutes(routes)
@@ -185,7 +215,7 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
                 ) {
                     val msg = reasons.firstOrNull()?.message ?: "Unknown error"
                     Log.e(TAG, "Route request failed: $msg")
-                    emit("onRoutesFailed", mapOf("message" to msg))
+                    onRoutesFailed(mapOf("message" to msg))
                 }
 
                 override fun onCanceled(
@@ -216,30 +246,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 }
-    }
-
-    // Correct Expo SDK v53 event emitter API
-    private fun emit(name: String, data: Map<String, Any>) {
-        try {
-            appContext.eventEmitter?.emit(name, data)
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to emit event $name: ${e.message}")
-        }
-    }
-
+    // ── 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.6",
+  "version": "2.0.8",
   "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",