specify layers for route requests

Author: Zayankovsky

android-auto/build.gradle.kts

@@ -40,6 +40,7 @@ dependencies {
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.1")
     testImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.4.0-rc01")
     testImplementation("androidx.arch.core:core-testing:2.1.0")
+    testImplementation("org.jetbrains.kotlin:kotlin-reflect:1.5.21")
 }
 
 dependencies {

android-auto/src/main/java/com/mapbox/examples/androidauto/car/preview/CarRouteRequest.kt

@@ -74,6 +74,7 @@ class CarRouteRequest(
         .alternatives(true)
         .profile(DirectionsCriteria.PROFILE_DRIVING_TRAFFIC)
         .coordinatesList(listOf(origin, destination))
+        .layersList(listOf(mapboxNavigation.getZLevel(), null))
         .metadata(true)
         .build()
 

android-auto/src/test/java/com/mapbox/examples/androidauto/car/preview/CarRouteRequestTest.kt

@@ -2,9 +2,9 @@
 
 package com.mapbox.examples.androidauto.car.preview
 
+import com.mapbox.androidauto.testing.MapboxRobolectricTestRunner
 import com.mapbox.api.directions.v5.models.DirectionsRoute
 import com.mapbox.api.directions.v5.models.RouteOptions
-import com.mapbox.androidauto.testing.MapboxRobolectricTestRunner
 import com.mapbox.geojson.Point
 import com.mapbox.navigation.base.route.RouterCallback
 import com.mapbox.navigation.core.MapboxNavigation
@@ -15,9 +15,12 @@ import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
 import io.mockk.verify
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 
+private const val zLevel = 42
+
 class CarRouteRequestTest : MapboxRobolectricTestRunner() {
 
     private val routeOptionsSlot = CapturingSlot<RouteOptions>()
@@ -34,6 +37,7 @@ class CarRouteRequestTest : MapboxRobolectricTestRunner() {
         every { navigationOptions } returns mockk {
             every { applicationContext } returns RuntimeEnvironment.systemContext
         }
+        every { getZLevel() } returns zLevel
     }
 
     private val carRouteRequest = CarRouteRequest(mapboxNavigation, navigationLocationProvider)
@@ -150,4 +154,17 @@ class CarRouteRequestTest : MapboxRobolectricTestRunner() {
 
         verify(exactly = 1) { mapboxNavigation.cancelRouteRequest(0) }
     }
+
+    @Test
+    fun `z level is passed to route options`() {
+        every { navigationLocationProvider.lastLocation } returns mockk {
+            every { longitude } returns -121.4670161
+            every { latitude } returns 38.5630514
+        }
+        val callback = mockk<CarRouteRequestCallback>(relaxUnitFun = true)
+        val searchCoordinate = Point.fromLngLat(-121.467001, 38.568105)
+        carRouteRequest.request(mockk { every { coordinate } returns searchCoordinate }, callback)
+
+        assertEquals(listOf(zLevel, null), routeOptionsSlot.captured.layersList())
+    }
 }

app/src/main/java/com/mapbox/navigation/examples/basics/TurnByTurnExperienceActivity.kt

@@ -637,6 +637,7 @@ class TurnByTurnExperienceActivity : AppCompatActivity() {
                         null
                     )
                 )
+                .layersList(listOf(mapboxNavigation.getZLevel(), null))
                 .build(),
             object : RouterCallback {
                 override fun onRoutesReady(