wip

Author: RingerJK

libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/extensions/WaypointEx.kt

@@ -20,7 +20,8 @@ fun List<Waypoint>.legsWaypoints(): List<Waypoint> =
     this.filter { it.type != Waypoint.SILENT }
 
 fun indexOfNextCoordinate(
-    waypoints: List<Waypoint>, remainingWaypoints: Int
+    waypoints: List<Waypoint>,
+    remainingWaypoints: Int
 ): Int? {
     if (remainingWaypoints > waypoints.size) {
         return null

libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/route/Waypoint.kt

@@ -4,7 +4,10 @@ import androidx.annotation.IntDef
 import com.mapbox.geojson.Point
 
 data class Waypoint(
-    val location: Point, @Type val type: Int, val name: String, val target: Point?,
+    val location: Point,
+    @Type val type: Int,
+    val name: String,
+    val target: Point?,
 ) {
     companion object {
         const val REGULAR = 1
@@ -22,4 +25,3 @@ data class Waypoint(
     @IntDef(REGULAR, SILENT, EV_CHARGING)
     annotation class Type
 }
-

libnavigation-base/src/main/java/com/mapbox/navigation/base/route/NavigationRoute.kt

@@ -16,7 +16,9 @@ import com.mapbox.geojson.Point
 import com.mapbox.navigation.base.internal.NativeRouteParserWrapper
 import com.mapbox.navigation.base.internal.SDKRouteParser
 import com.mapbox.navigation.base.internal.route.RouteCompatibilityCache
+import com.mapbox.navigation.base.internal.route.Waypoint
 import com.mapbox.navigation.base.internal.utils.mapToSdkRouteOrigin
+import com.mapbox.navigation.base.internal.utils.mapToSkd
 import com.mapbox.navigation.utils.internal.ThreadController
 import com.mapbox.navigation.utils.internal.logE
 import com.mapbox.navigation.utils.internal.logI
@@ -273,6 +275,8 @@ class NavigationRoute internal constructor(
         .routeOptions(routeOptions)
         .build()
 
+    internal val waypoints: List<Waypoint> = nativeRoute.waypoints.mapToSkd()
+
     /**
      * Indicates whether some other object is "equal to" this one.
      *

libnavigation-base/src/test/java/com/mapbox/navigation/base/internal/extensions/WaypointExTest.kt

@@ -34,7 +34,7 @@ class WaypointExTest {
                         Waypoint.SILENT,
                         Waypoint.REGULAR
                     ),
-                    listOf(Waypoint.REGULAR, Waypoint.SILENT,  Waypoint.SILENT, Waypoint.REGULAR),
+                    listOf(Waypoint.REGULAR, Waypoint.SILENT, Waypoint.SILENT, Waypoint.REGULAR),
                     listOf(Waypoint.REGULAR, Waypoint.EV_CHARGING, Waypoint.REGULAR),
                 ),
                 arrayOf(
@@ -103,7 +103,6 @@ class WaypointExTest {
             checkWaypoints(requestedWaypointsExpected, waypoints.requestedWaypoints(), waypoints)
             checkWaypoints(legsWaypointsExpected, waypoints.legsWaypoints(), waypoints)
         }
-
     }
 
     @RunWith(Parameterized::class)

libnavigation-core/src/main/java/com/mapbox/navigation/core/history/model/HistoryEventMapper.kt

@@ -18,7 +18,6 @@ import com.mapbox.navigator.HistoryRecordType
 import com.mapbox.navigator.PushHistoryRecord
 import com.mapbox.navigator.SetRouteHistoryRecord
 import com.mapbox.navigator.UpdateLocationHistoryRecord
-import com.mapbox.navigator.WaypointType
 import kotlinx.coroutines.runBlocking
 import java.net.URL
 

libnavigation-core/src/main/java/com/mapbox/navigation/core/routeoptions/RouteOptionsUpdater.kt

@@ -217,7 +217,7 @@ class RouteOptionsUpdater {
             add(0)
             waypointIndicesList.forEach { value ->
                 val newVal = value - nextCoordinateIndex + 1
-                if (newVal > 0){
+                if (newVal > 0) {
                     add(newVal)
                 }
             }

libnavigation-core/src/test/java/com/mapbox/navigation/core/routeoptions/RouteOptionsUpdaterTest.kt

@@ -323,7 +323,7 @@ class RouteOptionsUpdaterTest {
             assertTrue(
                 message,
                 routeRefreshAdapter.update(routeOptions, routeProgress, locationMatcherResult)
-                    is RouteOptionsUpdater.RouteOptionsResult.Error
+                is RouteOptionsUpdater.RouteOptionsResult.Error
             )
         }
     }

libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/building/BuildingProcessorTest.kt

@@ -350,5 +350,4 @@ class BuildingProcessorTest {
                 every { location() } returns point
             }
         }
-
 }

libtesting-navigation-base/src/main/java/com/mapbox/navigation/testing/factories/NavigationRouteFactory.kt

@@ -65,6 +65,14 @@ fun createNavigationRoutes(
             )
             return ExpectedFactory.createValue(result)
         }
+
+        override fun parseDirectionsRoutes(
+            directionsRoutes: String,
+            request: String,
+            routerOrigin: RouterOrigin
+        ): Expected<String, List<RouteInterface>> {
+            throw IllegalStateException("parseDirectionsRoutes is not supported yet")
+        }
     }
     return com.mapbox.navigation.base.internal.route.createNavigationRoutes(
         response,