@jacques_gordon/expo-mapbox-navigation 2.0.7 → 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

@@ -7,8 +7,7 @@ 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        // ← correct import for .camera extension
-import com.mapbox.maps.plugin.locationcomponent.location
+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
@@ -28,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
 
@@ -36,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
@@ -43,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
@@ -68,22 +78,17 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         val navigationOptions = NavigationOptions.Builder(context).build()
         mapboxNavigation = MapboxNavigationProvider.create(navigationOptions)
 
-        mapView.mapboxMap.loadStyle(mapStyle ?: Style.MAPBOX_STREETS) { style ->
-            // Route line components
+        mapView.mapboxMap.loadStyle(mapStyle ?: Style.MAPBOX_STREETS) { _ ->
             routeLineApi = MapboxRouteLineApi(MapboxRouteLineApiOptions.Builder().build())
             routeLineView = MapboxRouteLineView(
                 MapboxRouteLineViewOptions.Builder(context).build()
             )
-
-            // 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)
+                mapView.camera,
                 viewportDataSource!!
             )
-
             registerObservers()
         }
     }
@@ -91,7 +96,6 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     private fun registerObservers() {
         val nav = mapboxNavigation ?: return
 
-        // Routes observer
         nav.registerRoutesObserver(object : RoutesObserver {
             override fun onRoutesChanged(result: RoutesUpdatedResult) {
                 val routes = result.navigationRoutes
@@ -101,14 +105,11 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
                             routeLineView?.renderRouteDrawData(style, value)
                         }
                     }
-                    // Update viewport data source with the route
                     viewportDataSource?.onRouteChanged(routes.first())
                     viewportDataSource?.evaluate()
-
-                    // Issue #43 fix: safe camera following transition
                     safeCameraFollowing()
 
-                    emitEvent("onRoutesReady", mapOf(
+                    onRoutesReady(mapOf(
                         "routeCount" to routes.size,
                         "distanceMeters" to (routes.first().directionsRoute.distance() ?: 0.0),
                         "durationSeconds" to (routes.first().directionsRoute.duration() ?: 0.0)
@@ -125,13 +126,11 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
             }
         })
 
-        // Route progress observer
         nav.registerRouteProgressObserver(RouteProgressObserver { routeProgress ->
-            // Update viewport data source with progress
             viewportDataSource?.onRouteProgressChanged(routeProgress)
             viewportDataSource?.evaluate()
 
-            emitEvent("onRouteProgressChanged", mapOf(
+            onRouteProgressChanged(mapOf(
                 "distanceRemaining" to routeProgress.distanceRemaining,
                 "durationRemaining" to routeProgress.durationRemaining,
                 "distanceTraveled" to routeProgress.distanceTraveled,
@@ -143,7 +142,7 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         })
     }
 
-    // ── Issue #43: safe camera transition ────────────────────────────────────
+    // ── Issue #43: safe camera ────────────────────────────────────────────────
     private fun safeCameraFollowing() {
         try {
             navigationCamera?.requestNavigationCameraToFollowing(
@@ -163,8 +162,7 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
             "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"
             }
         }
     }
@@ -183,7 +181,7 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         val builder = RouteOptions.builder()
             .applyDefaultNavigationOptions()
             .language(locale.toLanguageTag())
-            .voiceUnits(resolveVoiceUnits())   // Issue #31 fix
+            .voiceUnits(resolveVoiceUnits())
             .coordinatesList(points)
 
         waypointIndices?.let { builder.waypointIndicesList(it) }
@@ -196,7 +194,6 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         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 {
@@ -205,7 +202,7 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
                     @RouterOrigin routerOrigin: String
                 ) {
                     if (routes.isEmpty()) {
-                        emitEvent("onRoutesFailed", mapOf("message" to "No routes returned"))
+                        onRoutesFailed(mapOf("message" to "No routes returned"))
                         return
                     }
                     nav.setNavigationRoutes(routes)
@@ -218,7 +215,7 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
                 ) {
                     val msg = reasons.firstOrNull()?.message ?: "Unknown error"
                     Log.e(TAG, "Route request failed: $msg")
-                    emitEvent("onRoutesFailed", mapOf("message" to msg))
+                    onRoutesFailed(mapOf("message" to msg))
                 }
 
                 override fun onCanceled(
@@ -231,17 +228,6 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         )
     }
 
-    // ── 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacques_gordon/expo-mapbox-navigation",
-  "version": "2.0.7",
+  "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",