@@ -110,7 +110,7 @@ class RouteViewModel @Inject constructor(
110
110
name = getRouteItemName(index, route),
111
111
coordinate = route.start.coordinate,
112
112
mode = getRouteItemMode(route),
113
- distance = route.distance ,
113
+ distance = getRouteItemDistance( route) ,
114
114
travelTime = route.sectionTime.toInt(),
115
115
lastTime = tempLastTime[index],
116
116
beforeColor = getRouteItemColor(route, false ),
@@ -145,6 +145,21 @@ class RouteViewModel @Inject constructor(
145
145
}
146
146
}
147
147
148
+ private fun getRouteItemDistance (route : Route ): Double {
149
+ return if (route.mode == MoveType .TRANSFER ) {
150
+ val startPoint = android.location.Location (" Start" )
151
+ val endPoint = android.location.Location (" End" )
152
+
153
+ startPoint.latitude = route.start.coordinate.latitude.toDouble()
154
+ startPoint.longitude = route.start.coordinate.longitude.toDouble()
155
+ endPoint.latitude = route.end.coordinate.latitude.toDouble()
156
+ endPoint.longitude = route.end.coordinate.longitude.toDouble()
157
+ startPoint.distanceTo(endPoint).toDouble()
158
+ } else {
159
+ route.distance
160
+ }
161
+ }
162
+
148
163
private fun getRouteItemColor (route : Route , isCurrent : Boolean ): Int {
149
164
return if (isCurrent) {
150
165
routeItemColor = if (route is TransportRoute ) {
0 commit comments