wip

Author: RingerJK

instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/NavigationRouteTests.kt

@@ -0,0 +1,65 @@
+package com.mapbox.navigation.instrumentation_tests.core
+
+import android.location.Location
+import com.google.gson.Gson
+import com.mapbox.api.directions.v5.models.DirectionsResponse
+import com.mapbox.api.directions.v5.models.DirectionsRoute
+import com.mapbox.api.directions.v5.models.RouteOptions
+import com.mapbox.geojson.Point
+import com.mapbox.navigation.base.extensions.applyDefaultNavigationOptions
+import com.mapbox.navigation.base.internal.route.createNavigationRoutes
+import com.mapbox.navigation.base.internal.utils._waypoints
+import com.mapbox.navigation.base.route.NavigationRoute
+import com.mapbox.navigation.base.route.RouterOrigin
+import com.mapbox.navigation.instrumentation_tests.R
+import com.mapbox.navigation.instrumentation_tests.activity.EmptyTestActivity
+import com.mapbox.navigation.instrumentation_tests.utils.readRawFileText
+import com.mapbox.navigation.testing.ui.BaseTest
+import junit.framework.Assert.assertTrue
+import org.junit.Assert
+import org.junit.Test
+
+class NavigationRouteTests : BaseTest<EmptyTestActivity>(EmptyTestActivity::class.java) {
+
+    override fun setupMockLocation(): Location = mockLocationUpdatesRule.generateLocationUpdate {
+        latitude = 0.0
+        longitude = 0.0
+    }
+
+    @Test
+    fun mapDirectionsResponseToNavigationRoutes() {
+        val jsonResponse = readRawFileText(activity, R.raw.route_response_dc_very_short)
+
+        val navRoutes = NavigationRoute.create(
+            DirectionsResponse.fromJson(jsonResponse), provideRouteOptions(), RouterOrigin.Onboard
+        )
+
+        assertTrue(navRoutes.isNotEmpty())
+        navRoutes.forEach {
+            assertTrue(it._waypoints().isNotEmpty())
+        }
+    }
+
+    @Test
+    fun mapDirectionsRoutesToNavigationRoutes() {
+        val directionsRoute = DirectionsRoute.fromJson(readRawFileText(activity, R.raw.short_route))
+
+        val navRoutes = createNavigationRoutes(
+            listOf(directionsRoute),
+            provideRouteOptions(),
+            RouterOrigin.Onboard,
+        )
+
+        assertTrue(navRoutes.isNotEmpty())
+    }
+
+    private fun provideRouteOptions(): RouteOptions =
+        RouteOptions.builder().applyDefaultNavigationOptions()
+            .coordinatesList(
+                listOf(
+                    Point.fromLngLat(1.1, 2.2),
+                    Point.fromLngLat(3.3, 4.4),
+                )
+            )
+            .build()
+}

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

@@ -8,6 +8,7 @@ import com.mapbox.api.directions.v5.models.DirectionsRoute
 import com.mapbox.api.directions.v5.models.Incident
 import com.mapbox.api.directions.v5.models.LegAnnotation
 import com.mapbox.api.directions.v5.models.RouteOptions
+import com.mapbox.navigation.base.internal.NativeRouteParserWrapper
 import com.mapbox.navigation.base.internal.SDKRouteParser
 import com.mapbox.navigation.base.route.NavigationRoute
 import com.mapbox.navigation.base.route.toNavigationRoute
@@ -87,6 +88,20 @@ fun createNavigationRoutes(
 ): List<NavigationRoute> =
     NavigationRoute.create(directionsResponse, routeOptions, routeParser, routerOrigin)
 
+@VisibleForTesting
+fun createNavigationRoutes(
+    directionsRoutes: List<DirectionsRoute>,
+    routeOptions: RouteOptions,
+    routerOrigin: com.mapbox.navigation.base.route.RouterOrigin,
+    routeParser: SDKRouteParser = NativeRouteParserWrapper
+): List<NavigationRoute> =
+    NavigationRoute.create(
+        directionsRoutes,
+        routeOptions,
+        routerOrigin,
+        routeParser,
+    )
+
 /**
  * Internal API to create a new [NavigationRoute] from a native peer.
  */

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

@@ -18,16 +18,18 @@ import com.mapbox.navigation.base.internal.SDKRouteParser
 import com.mapbox.navigation.base.internal.factory.RoadObjectFactory.toUpcomingRoadObjects
 import com.mapbox.navigation.base.internal.route.RouteCompatibilityCache
 import com.mapbox.navigation.base.internal.route.Waypoint
+import com.mapbox.navigation.base.internal.route.toNavigationRoute
 import com.mapbox.navigation.base.internal.utils.mapToSdkRouteOrigin
-import com.mapbox.navigation.base.trip.model.roadobject.UpcomingRoadObject
 import com.mapbox.navigation.base.internal.utils.mapToSkd
+import com.mapbox.navigation.base.trip.model.roadobject.UpcomingRoadObject
 import com.mapbox.navigation.utils.internal.ThreadController
 import com.mapbox.navigation.utils.internal.logD
 import com.mapbox.navigation.utils.internal.logE
 import com.mapbox.navigation.utils.internal.logI
 import com.mapbox.navigator.RouteInterface
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
+import org.json.JSONArray
 import java.net.URL
 
 /**
@@ -205,6 +207,34 @@ class NavigationRoute internal constructor(
             }
         }
 
+        internal fun create(
+            directionsRoutes: List<DirectionsRoute>,
+            routeOptions: RouteOptions,
+            routerOrigin: RouterOrigin,
+            routeParser: SDKRouteParser = NativeRouteParserWrapper
+        ): List<NavigationRoute> {
+            val directionsRoutesJson = JSONArray(directionsRoutes.map { it.toJson() }).toString()
+            return create(
+                directionsRoutesJson,
+                routeOptions.toUrl("").toString(),
+                routerOrigin,
+                routeParser
+            )
+        }
+
+        private fun create(
+            directionsRoutesJson: String,
+            routeOptionsUrlString: String,
+            routerOrigin: RouterOrigin,
+            routeParser: SDKRouteParser = NativeRouteParserWrapper
+        ): List<NavigationRoute> {
+            return routeParser.parseDirectionsRoutes(
+                directionsRoutesJson, routeOptionsUrlString, routerOrigin
+            ).run {
+                create(this)
+            }
+        }
+
         internal fun create(
             directionsResponse: DirectionsResponse,
             routeOptions: RouteOptions,
@@ -255,6 +285,19 @@ class NavigationRoute internal constructor(
                 )
             }.cache()
         }
+
+        private fun create(
+            expected: Expected<String, List<RouteInterface>>
+        ): List<NavigationRoute> {
+            return expected.fold({ error ->
+                logE("NavigationRoute", "Failed to parse a route. Reason: $error")
+                listOf()
+            }, { value ->
+                value
+            }).map { routeInterface ->
+                routeInterface.toNavigationRoute()
+            }.cache()
+        }
     }
 
     /**