@baeckerherz/expo-mapbox-navigation 1.0.4 → 1.0.5

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

@@ -13,6 +13,7 @@ import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.OffRouteObserver
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.dropin.NavigationView
+import com.mapbox.navigation.core.directions.session.RoutesSetCallback
 import com.mapbox.api.directions.v5.DirectionsCriteria
 import com.mapbox.api.directions.v5.models.RouteOptions
 
@@ -45,12 +46,40 @@ class ExpoMapboxNavigationView(
   private var hasStartedNavigation = false
 
   fun setCoordinates(raw: List<Map<String, Double>>) {
-    coordinates = raw.mapNotNull { map ->
+    val newCoords = raw.mapNotNull { map ->
       val lat = map["latitude"] ?: return@mapNotNull null
       val lng = map["longitude"] ?: return@mapNotNull null
       Point.fromLngLat(lng, lat)
     }
-    startNavigationIfReady()
+    val isRouteChange = hasStartedNavigation && coordinatesChanged(newCoords)
+    if (isRouteChange) {
+      removeCurrentNavigationView { startNavigationIfReady() }
+    }
+    coordinates = newCoords
+    if (!isRouteChange) {
+      startNavigationIfReady()
+    }
+  }
+
+  private fun coordinatesChanged(newCoords: List<Point>): Boolean {
+    if (coordinates.size != newCoords.size) return true
+    return coordinates.zip(newCoords).any { (a, b) ->
+      a.latitude() != b.latitude() || a.longitude() != b.longitude()
+    }
+  }
+
+  private fun removeCurrentNavigationView(onCleared: (() -> Unit)? = null) {
+    navigationView?.let { removeView(it) }
+    navigationView = null
+    hasStartedNavigation = false
+    val nav = MapboxNavigationApp.current()
+    if (nav != null) {
+      nav.setNavigationRoutes(emptyList(), 0, RoutesSetCallback { _ ->
+        post { onCleared?.invoke() }
+      })
+    } else {
+      post { onCleared?.invoke() }
+    }
   }
 
   private fun startNavigationIfReady() {
@@ -158,7 +187,6 @@ class ExpoMapboxNavigationView(
 
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    navigationView?.let { removeView(it) }
-    navigationView = null
+    removeCurrentNavigationView()
   }
 }

package/ios/ExpoMapboxNavigationView.swift

@@ -156,13 +156,39 @@ class ExpoMapboxNavigationView: ExpoView {
   // MARK: Props
 
   func setCoordinates(_ raw: [[String: Double]]) {
-    coordinates = raw.compactMap { dict in
+    let newCoords = raw.compactMap { dict -> CLLocationCoordinate2D? in
       guard let lat = dict["latitude"], let lng = dict["longitude"] else {
         return nil
       }
       return CLLocationCoordinate2D(latitude: lat, longitude: lng)
     }
-    startNavigationIfReady()
+    let isRouteChange = hasStartedNavigation && coordinatesDiffer(from: newCoords)
+    if isRouteChange {
+      removeCurrentNavigation()
+    }
+    coordinates = newCoords
+    if isRouteChange {
+      DispatchQueue.main.async { [weak self] in
+        self?.startNavigationIfReady()
+      }
+    } else {
+      startNavigationIfReady()
+    }
+  }
+
+  private func coordinatesDiffer(from newCoords: [CLLocationCoordinate2D]) -> Bool {
+    guard coordinates.count == newCoords.count else { return true }
+    return zip(coordinates, newCoords).contains { a, b in
+      a.latitude != b.latitude || a.longitude != b.longitude
+    }
+  }
+
+  private func removeCurrentNavigation() {
+    navigationViewController?.willMove(toParent: nil)
+    navigationViewController?.view.removeFromSuperview()
+    navigationViewController?.removeFromParent()
+    navigationViewController = nil
+    hasStartedNavigation = false
   }
 
   // MARK: Layout
@@ -308,9 +334,7 @@ class ExpoMapboxNavigationView: ExpoView {
   // MARK: Cleanup
 
   deinit {
-    navigationViewController?.willMove(toParent: nil)
-    navigationViewController?.view.removeFromSuperview()
-    navigationViewController?.removeFromParent()
+    removeCurrentNavigation()
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baeckerherz/expo-mapbox-navigation",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Expo module for turn-by-turn navigation (Mapbox Navigation SDK v3) on iOS and Android. Alpha. Single MapboxNavigation component, Expo config plugin.",
   "main": "src/index.ts",
   "types": "src/index.ts",