Use matched location from NN to calculate RouteProgress.distanceTraveled (#4043)

chezzdev · web-flow · commit cb394969372f · 2022-08-02T15:19:03.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@
 
 * Fixed an error when rerouting the user with `NavigationRouteOptions.profileIdentifier` set to `ProfileIdentifier.walking` or `ProfileIdentifier.cycling`. ([#4024](https://github.com/mapbox/mapbox-navigation-ios/pull/4024))
 * Fixed an issue where the user’s location continued to be snapped to a roadway even after the user’s course deviated significantly from that roadway, for example because the user was actually on a parallel road. ([#4012](https://github.com/mapbox/mapbox-navigation-ios/pull/4012))
+* Fixed an issue when `RouteController` didn't update `RouteProgress.distanceTraveled` property during simulation. ([#4043](https://github.com/mapbox/mapbox-navigation-ios/pull/4043))
 
 ### Other changes
 
diff --git a/Sources/MapboxCoreNavigation/LegacyRouteController.swift b/Sources/MapboxCoreNavigation/LegacyRouteController.swift
@@ -433,7 +433,7 @@ open class LegacyRouteController: NSObject, Router, InternalRouter, CLLocationMa
     }
     
     private func update(progress: RouteProgress, with location: CLLocation, rawLocation: CLLocation) {
-        progress.updateDistanceTraveled(with: rawLocation)
+        progress.updateDistanceTraveled(with: location)
         
         //Fire the delegate method
         delegate?.router(self, didUpdate: progress, with: location, rawLocation: rawLocation)
diff --git a/Sources/MapboxCoreNavigation/RouteController.swift b/Sources/MapboxCoreNavigation/RouteController.swift
@@ -518,7 +518,7 @@ open class RouteController: NSObject {
     }
     
     private func update(progress: RouteProgress, with location: CLLocation, rawLocation: CLLocation, upcomingRouteAlerts routeAlerts: [UpcomingRouteAlert], mapMatchingResult: MapMatchingResult) {
-        progress.updateDistanceTraveled(with: rawLocation)
+        progress.updateDistanceTraveled(with: location)
         progress.upcomingRouteAlerts = routeAlerts.map { RouteAlert($0) }
         
         //Fire the delegate method

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ open class LegacyRouteController: NSObject, Router, InternalRouter, CLLocationMa`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`private func update(progress: RouteProgress, with location: CLLocation, rawLocation: CLLocation) {`
`436`		`- progress.updateDistanceTraveled(with: rawLocation)`
	`436`	`+ progress.updateDistanceTraveled(with: location)`
`437`	`437`
`438`	`438`	`//Fire the delegate method`
`439`	`439`	`delegate?.router(self, didUpdate: progress, with: location, rawLocation: rawLocation)`
Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ open class RouteController: NSObject {`
`518`	`518`	`}`
`519`	`519`
`520`	`520`	`private func update(progress: RouteProgress, with location: CLLocation, rawLocation: CLLocation, upcomingRouteAlerts routeAlerts: [UpcomingRouteAlert], mapMatchingResult: MapMatchingResult) {`
`521`		`- progress.updateDistanceTraveled(with: rawLocation)`
	`521`	`+ progress.updateDistanceTraveled(with: location)`
`522`	`522`	`progress.upcomingRouteAlerts = routeAlerts.map { RouteAlert($0) }`
`523`	`523`
`524`	`524`	`//Fire the delegate method`