@jacques_gordon/expo-mapbox-navigation 2.0.4 → 2.0.6

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

@@ -2,66 +2,49 @@ package expo.modules.mapboxnavigation
 
 import android.content.Context
 import android.util.Log
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
 import com.mapbox.api.directions.v5.models.RouteOptions
-import com.mapbox.common.location.AccuracyLevel
-import com.mapbox.common.location.DeviceLocationProviderFactory
-import com.mapbox.common.location.IntervalSettings
-import com.mapbox.common.location.LocationProviderRequest
 import com.mapbox.geojson.Point
 import com.mapbox.maps.MapView
 import com.mapbox.maps.Style
-import com.mapbox.navigation.base.TimeFormat
 import com.mapbox.navigation.base.extensions.applyDefaultNavigationOptions
-import com.mapbox.navigation.base.extensions.applyLanguageAndVoiceUnitOptions
-import com.mapbox.navigation.base.formatter.DistanceFormatterOptions
-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.lifecycle.MapboxNavigationApp
-import com.mapbox.navigation.core.replay.MapboxReplayer
+import com.mapbox.navigation.core.directions.session.RoutesUpdatedResult
 import com.mapbox.navigation.core.trip.session.RouteProgressObserver
-import com.mapbox.navigation.core.trip.session.VoiceInstructionsObserver
-import com.mapbox.navigation.dropin.NavigationView
-import com.mapbox.navigation.dropin.NavigationViewListener
-import com.mapbox.navigation.ui.base.util.MapboxNavigationConsumer
+import com.mapbox.navigation.ui.maps.camera.NavigationCamera
+import com.mapbox.navigation.ui.maps.camera.data.MapboxNavigationViewportDataSource
+import com.mapbox.navigation.ui.maps.camera.transition.NavigationCameraTransitionOptions
+import com.mapbox.navigation.ui.maps.route.line.api.MapboxRouteLineApi
+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.views.ExpoView
 import java.util.Locale
 
 private const val TAG = "ExpoMapboxNavigation"
 
-/**
- * ExpoMapboxNavigationView — Full-featured navigation view wrapping the Mapbox Drop-In UI.
- *
- * Fixes:
- *  - Issue #43: CameraAnimationsUtils.calculateCameraAnimationHint NoSuchMethodError
- *    Root cause: version mismatch between Navigation SDK and Maps SDK.
- *    Fix: build.gradle now pins mapbox-maps-android to ≥ 11.11.0 and navigation to 3.7.0,
- *    which ensures the method signature exists at runtime. The camera call is also wrapped
- *    in a try/catch to degrade gracefully if ever encountered.
- *
- *  - Issue #31: Voice units always imperial regardless of device locale
- *    Fix: new `voiceUnits` prop ("metric" | "imperial" | null) exposed via module.
- *    The value is forwarded to RouteOptions via applyLanguageAndVoiceUnitOptions
- *    with an explicit UnitType override.
- */
 class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     ExpoView(context, appContext) {
 
-    private var navigationView: NavigationView? = null
+    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
     private var mapboxNavigation: MapboxNavigation? = null
 
     // Props
     private var coordinates: List<Map<String, Double>> = emptyList()
     private var waypointIndices: List<Int>? = null
     private var language: String? = null
-    private var voiceUnits: String? = null   // "metric" | "imperial" | null
+    private var voiceUnits: String? = null
     private var navigationProfile: String? = null
     private var excludeTypes: List<String>? = null
     private var mapStyle: String? = null
@@ -73,230 +56,191 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     private var customRasterAboveLayerId: String? = null
 
     init {
-        setupNavigationView()
+        mapView.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        addView(mapView)
+        setupNavigation()
     }
 
-    private fun setupNavigationView() {
-        val accessToken = getAccessToken() ?: run {
-            Log.e(TAG, "Mapbox access token not found. Set it via the config plugin.")
-            return
-        }
+    private fun setupNavigation() {
+        val navigationOptions = NavigationOptions.Builder(context).build()
+        mapboxNavigation = MapboxNavigationProvider.create(navigationOptions)
 
-        navigationView = NavigationView(context, accessToken).also { navView ->
-            navView.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
-            addView(navView)
+        mapView.getMapboxMap().loadStyle(mapStyle ?: Style.MAPBOX_STREETS) { style ->
+            routeLineApi = MapboxRouteLineApi(MapboxRouteLineApiOptions.Builder().build())
+            routeLineView = MapboxRouteLineView(MapboxRouteLineViewOptions.Builder(context).build())
 
-            navView.addNavigationViewListener(object : NavigationViewListener() {
-                override fun onDestinationPreviewOptionsVisible(visible: Boolean) {}
+            viewportDataSource = MapboxNavigationViewportDataSource(mapView.getMapboxMap())
+            navigationCamera = NavigationCamera(
+                mapView.getMapboxMap(),
+                mapView.camera,
+                viewportDataSource!!
+            )
+            registerObservers()
+        }
+    }
 
-                override fun onFreeDrive() {
-                    sendEvent("onNavigationCancelled", mapOf<String, Any>())
-                }
+    private fun registerObservers() {
+        val nav = mapboxNavigation ?: return
 
-                override fun onArrival() {
-                    sendEvent("onArrival", mapOf<String, Any>())
+        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 ->
+                            routeLineView?.renderRouteDrawData(style, value)
+                        }
+                    }
+                    safeCameraFollowing()
+                    emit("onRoutesReady", mapOf(
+                        "routeCount" to routes.size,
+                        "distanceMeters" to (routes.firstOrNull()?.directionsRoute?.distance() ?: 0.0),
+                        "durationSeconds" to (routes.firstOrNull()?.directionsRoute?.duration() ?: 0.0)
+                    ))
                 }
+            }
+        })
 
-                override fun onActiveNavigation() {}
-                override fun onPassiveNavigation() {}
-                override fun onPreview() {}
-                override fun onRoutePreview() {}
-            })
-        }
+        nav.registerRouteProgressObserver(RouteProgressObserver { progress ->
+            emit("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)
+            ))
+        })
     }
 
-    // ─────────────────────────────────────────────────────────────────────────
-    // ISSUE #43 FIX: Safe camera request
-    // Wraps requestNavigationCameraToFollowing in try/catch to handle any
-    // residual version mismatch at runtime without crashing the app.
-    // The real fix is the version pinning in build.gradle.
-    // ─────────────────────────────────────────────────────────────────────────
-    private fun safeCameraFollowing(mapboxNavigation: MapboxNavigation) {
+    // ── Issue #43: safe camera transition ────────────────────────────────────
+    private fun safeCameraFollowing() {
         try {
-            mapboxNavigation.navigationCamera?.requestNavigationCameraToFollowing()
-        } catch (e: NoSuchMethodError) {
-            Log.e(TAG, """
-                [Issue #43] CameraAnimationsUtils.calculateCameraAnimationHint not found.
-                This indicates a Mapbox Maps SDK version mismatch.
-                Ensure mapbox-maps-android >= 11.11.0 is resolved in your gradle dependencies.
-                Error: ${e.message}
-            """.trimIndent())
+            navigationCamera?.requestNavigationCameraToFollowing(
+                stateTransitionOptions = NavigationCameraTransitionOptions.Builder()
+                    .maxDuration(0)
+                    .build()
+            )
         } catch (e: Exception) {
-            Log.e(TAG, "Unexpected error requesting navigation camera to following: ${e.message}")
+            Log.e(TAG, "Camera transition error (issue #43): ${e.message}")
         }
     }
 
-    // ─────────────────────────────────────────────────────────────────────────
-    // ISSUE #31 FIX: voiceUnits / distance units
-    // Maps the string prop value to the Mapbox UnitType enum and applies it
-    // to RouteOptions via applyLanguageAndVoiceUnitOptions.
-    // ─────────────────────────────────────────────────────────────────────────
-    private fun resolveUnitType(): UnitType {
+    // ── Issue #31: voice units ────────────────────────────────────────────────
+    private fun resolveUnitType(): String {
         return when (voiceUnits?.lowercase()) {
-            "metric" -> UnitType.METRIC
-            "imperial" -> UnitType.IMPERIAL
+            "metric" -> "metric"
+            "imperial" -> "imperial"
             else -> {
-                // Auto-detect from device locale (default behaviour)
                 val locale = language?.let { Locale.forLanguageTag(it) } ?: Locale.getDefault()
-                // Countries that primarily use imperial: US, UK, Liberia, Myanmar
                 val imperialCountries = setOf("US", "GB", "LR", "MM")
-                if (locale.country in imperialCountries) UnitType.IMPERIAL else UnitType.METRIC
+                if (locale.country in imperialCountries) "imperial" else "metric"
             }
         }
     }
 
-    private fun buildRouteOptions(): RouteOptions? {
-        if (coordinates.size < 2) return null
+    private fun fetchRoutes() {
+        val nav = mapboxNavigation ?: return
+        if (coordinates.size < 2) return
 
         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()
-            .applyLanguageAndVoiceUnitOptions(context)
             .language(locale.toLanguageTag())
-            .voiceUnits(unitType.value)   // Issue #31 fix
+            .voiceUnits(resolveUnitType())
             .coordinatesList(points)
 
-        // Waypoints
-        waypointIndices?.let { indices ->
-            builder.waypointIndicesList(indices)
-        }
-
-        // Navigation profile
+        waypointIndices?.let { builder.waypointIndicesList(it) }
         navigationProfile?.let {
-            val profile = if (it.startsWith("mapbox/")) it else "mapbox/$it"
-            builder.profile(profile)
-        }
-
-        // Exclude road types
-        excludeTypes?.takeIf { it.isNotEmpty() }?.let {
-            builder.exclude(it.joinToString(","))
+            builder.profile(if (it.startsWith("mapbox/")) it else "mapbox/$it")
         }
-
-        // Vehicle restrictions
+        excludeTypes?.takeIf { it.isNotEmpty() }?.let { builder.exclude(it.joinToString(",")) }
         maxHeight?.let { builder.maxHeight(it) }
         maxWidth?.let { builder.maxWidth(it) }
 
-        return builder.build()
-    }
-
-    private fun fetchAndStartRoutes() {
-        val nav = mapboxNavigation ?: return
-        val options = buildRouteOptions() ?: return
-
-        nav.requestRoutes(options, object : MapboxNavigationConsumer<List<NavigationRoute>> {
-            override fun accept(value: List<NavigationRoute>) {
-                if (value.isEmpty()) {
-                    sendEvent("onRoutesFailed", mapOf("message" to "No routes returned"))
-                    return
+        // Nav SDK v3: NavigationRouterCallback uses @RouterOrigin String (not enum)
+        nav.requestRoutes(
+            builder.build(),
+            object : NavigationRouterCallback {
+                override fun onRoutesReady(
+                    routes: List<NavigationRoute>,
+                    @RouterOrigin routerOrigin: String
+                ) {
+                    if (routes.isEmpty()) {
+                        emit("onRoutesFailed", mapOf("message" to "No routes returned"))
+                        return
+                    }
+                    nav.setNavigationRoutes(routes)
+                    nav.startTripSession()
                 }
 
-                sendEvent("onRoutesReady", mapOf(
-                    "routeCount" to value.size,
-                    "distanceMeters" to (value.firstOrNull()?.directionsRoute?.distance() ?: 0.0),
-                    "durationSeconds" to (value.firstOrNull()?.directionsRoute?.duration() ?: 0.0)
-                ))
-
-                nav.setNavigationRoutes(value)
-
-                // Issue #43 fix: safe camera transition
-                safeCameraFollowing(nav)
-            }
+                override fun onFailure(
+                    reasons: List<RouterFailure>,
+                    routeOptions: RouteOptions
+                ) {
+                    val msg = reasons.firstOrNull()?.message ?: "Unknown error"
+                    Log.e(TAG, "Route request failed: $msg")
+                    emit("onRoutesFailed", mapOf("message" to msg))
+                }
 
-            override fun accept(error: Exception) {
-                Log.e(TAG, "Route request failed: ${error.message}")
-                sendEvent("onRoutesFailed", mapOf("message" to (error.message ?: "Unknown error")))
+                override fun onCanceled(
+                    routeOptions: RouteOptions,
+                    @RouterOrigin routerOrigin: String
+                ) {
+                    Log.d(TAG, "Route request cancelled")
+                }
             }
-        })
+        )
     }
 
-    // ─────────────────────────────────────────────────────────────────────────
-    // Prop setters
-    // ─────────────────────────────────────────────────────────────────────────
-
+    // ── Prop setters ──────────────────────────────────────────────────────────
     fun setCoordinates(coords: List<Map<String, Double>>) {
         coordinates = coords
-        if (coords.size >= 2) fetchAndStartRoutes()
-    }
-
-    fun setWaypointIndices(indices: List<Int>?) {
-        waypointIndices = indices
-    }
-
-    fun setLanguage(lang: String?) {
-        language = lang
-    }
-
-    /** Issue #31 — Set voice/distance units: "metric", "imperial", or null for auto */
-    fun setVoiceUnits(units: String?) {
-        voiceUnits = units
-    }
-
-    fun setNavigationProfile(profile: String?) {
-        navigationProfile = profile
-    }
-
-    fun setExcludeTypes(types: List<String>?) {
-        excludeTypes = types
-    }
-
-    fun setMapStyle(style: String?) {
-        mapStyle = style
-    }
-
-    fun setMute(shouldMute: Boolean) {
-        mute = shouldMute
-        navigationView?.customizeViewStyles {
-            // Audio mute is handled by the NavigationView API
-        }
-    }
-
-    fun setMaxHeight(height: Double?) {
-        maxHeight = height
-    }
-
-    fun setMaxWidth(width: Double?) {
-        maxWidth = width
-    }
-
-    fun setUseMapMatching(use: Boolean) {
-        useMapMatching = use
-    }
-
-    fun setCustomRasterTileUrl(url: String?) {
-        customRasterTileUrl = url
-    }
-
-    fun setCustomRasterAboveLayerId(layerId: String?) {
-        customRasterAboveLayerId = layerId
-    }
-
-    // ─────────────────────────────────────────────────────────────────────────
-    // Helpers
-    // ─────────────────────────────────────────────────────────────────────────
-
+        if (coords.size >= 2) fetchRoutes()
+    }
+    fun setWaypointIndices(indices: List<Int>?) { waypointIndices = indices }
+    fun setLanguage(lang: String?) { language = lang }
+    fun setVoiceUnits(units: String?) { voiceUnits = units }
+    fun setNavigationProfile(profile: String?) { navigationProfile = profile }
+    fun setExcludeTypes(types: List<String>?) { excludeTypes = types }
+    fun setMapStyle(style: String?) { mapStyle = style }
+    fun setMute(shouldMute: Boolean) { mute = shouldMute }
+    fun setMaxHeight(height: Double?) { maxHeight = height }
+    fun setMaxWidth(width: Double?) { maxWidth = width }
+    fun setUseMapMatching(use: Boolean) { useMapMatching = use }
+    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
-        }
+        } catch (e: Exception) { null }
     }
 
-    private fun sendEvent(name: String, data: Map<String, Any>) {
-        appContext.eventEmitter?.emit(name, data)
+    // 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}")
+        }
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        mapboxNavigation?.onDestroy()
+        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.4",
+  "version": "2.0.6",
   "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",