-
Notifications
You must be signed in to change notification settings - Fork 319
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added new experimental API for requesting a route
- Loading branch information
1 parent
a1ac57f
commit 5db5746
Showing
16 changed files
with
1,363 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
...roidTest/java/com/mapbox/navigation/instrumentation_tests/core/RouteOptionsBuilderTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package com.mapbox.navigation.instrumentation_tests.core | ||
|
|
||
| import android.location.Location | ||
| import androidx.test.platform.app.InstrumentationRegistry | ||
| import com.mapbox.api.directions.v5.DirectionsCriteria | ||
| import com.mapbox.geojson.Point | ||
| import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI | ||
| import com.mapbox.navigation.base.options.NavigationOptions | ||
| import com.mapbox.navigation.core.MapboxNavigationProvider | ||
| import com.mapbox.navigation.core.RequestRoutesResult | ||
| import com.mapbox.navigation.instrumentation_tests.R | ||
| import com.mapbox.navigation.instrumentation_tests.activity.EmptyTestActivity | ||
| import com.mapbox.navigation.instrumentation_tests.utils.MapboxNavigationRule | ||
| import com.mapbox.navigation.instrumentation_tests.utils.http.MockDirectionsRequestHandler | ||
| import com.mapbox.navigation.instrumentation_tests.utils.readRawFileText | ||
| import com.mapbox.navigation.instrumentation_tests.utils.runOnMainSync | ||
| import com.mapbox.navigation.testing.ui.BaseTest | ||
| import com.mapbox.navigation.testing.ui.utils.getMapboxAccessTokenFromResources | ||
| import junit.framework.Assert.assertEquals | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.runBlocking | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
|
|
||
| @OptIn(ExperimentalPreviewMapboxNavigationAPI::class) | ||
| class RouteOptionsBuilderTest : BaseTest<EmptyTestActivity>(EmptyTestActivity::class.java) { | ||
|
|
||
| @get:Rule | ||
| val mapboxNavigationRule = MapboxNavigationRule() | ||
|
|
||
| @Test | ||
| fun navigateFromCurrentLocation() { | ||
| mockWebServerRule.requestHandlers.add( | ||
| MockDirectionsRequestHandler( | ||
| profile = DirectionsCriteria.PROFILE_DRIVING, | ||
| jsonResponse = readRawFileText(activity, R.raw.reroute_response_dc_very_short), | ||
| expectedCoordinates = null, | ||
| relaxedExpectedCoordinates = true | ||
| ) | ||
| ) | ||
|
|
||
| val mapboxNavigation = runOnMainSync { | ||
| val context = InstrumentationRegistry.getInstrumentation().getTargetContext() | ||
| MapboxNavigationProvider.create( | ||
| NavigationOptions.Builder(context) | ||
| .accessToken(getMapboxAccessTokenFromResources(context)) | ||
| .build() | ||
| ) | ||
| } | ||
|
|
||
| val routeRequest = runBlocking(Dispatchers.Main) { | ||
| mapboxNavigation.startTripSession() | ||
| mapboxNavigation.requestRoutes { builder -> | ||
| builder | ||
| .fromCurrentLocation() | ||
| .toDestination( | ||
| coordinate = Point.fromLngLat(2.0, 2.0) | ||
| ) | ||
| .profileDriving() | ||
| .baseUrl(mockWebServerRule.baseUrl) | ||
| } as RequestRoutesResult.Successful | ||
| } | ||
|
|
||
| val routeOptions = routeRequest.routes.first().routeOptions | ||
| assertEquals( | ||
| listOf( | ||
| Point.fromLngLat(1.0, 1.0), | ||
| Point.fromLngLat(2.0, 2.0), | ||
| ), | ||
| routeOptions.coordinatesList() | ||
| ) | ||
| } | ||
|
|
||
| override fun setupMockLocation(): Location { | ||
| return mockLocationUpdatesRule.generateLocationUpdate { | ||
| longitude = 1.0 | ||
| latitude = 1.0 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
libnavigation-core/src/main/java/com/mapbox/navigation/core/RequestRoutesResult.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package com.mapbox.navigation.core | ||
|
|
||
| import com.mapbox.api.directions.v5.models.RouteOptions | ||
| import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI | ||
| import com.mapbox.navigation.base.route.NavigationRoute | ||
| import com.mapbox.navigation.base.route.RouterFailure | ||
| import com.mapbox.navigation.base.route.RouterOrigin | ||
|
|
||
| @ExperimentalPreviewMapboxNavigationAPI | ||
| sealed class RequestRoutesResult { | ||
| @ExperimentalPreviewMapboxNavigationAPI | ||
| data class Successful( | ||
| val routes: List<NavigationRoute>, | ||
| val routerOrigin: RouterOrigin, | ||
| ) : RequestRoutesResult() | ||
|
|
||
| @ExperimentalPreviewMapboxNavigationAPI | ||
| data class Failed( | ||
| val reasons: List<RouterFailure>, | ||
| val routeOptions: RouteOptions | ||
| ) : RequestRoutesResult() | ||
| } |
74 changes: 74 additions & 0 deletions
74
...on-core/src/main/java/com/mapbox/navigation/core/routeoptions/builder/LocationProvider.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| package com.mapbox.navigation.core.routeoptions.builder | ||
|
|
||
| import android.location.Location | ||
| import com.mapbox.geojson.Point | ||
| import com.mapbox.navigation.core.trip.session.LocationMatcherResult | ||
| import com.mapbox.navigation.core.trip.session.LocationObserver | ||
| import com.mapbox.navigation.core.trip.session.TripSessionLocationProvider | ||
| import com.mapbox.navigation.utils.internal.toPoint | ||
| import kotlinx.coroutines.suspendCancellableCoroutine | ||
| import kotlinx.coroutines.withTimeout | ||
| import kotlin.coroutines.resume | ||
|
|
||
| internal interface LocationProvider { | ||
| suspend fun getCurrentLocation(): CurrentLocation | ||
| } | ||
|
|
||
| internal data class CurrentLocation( | ||
| val point: Point, | ||
| val bearing: Double?, | ||
| val zLevel: Int? | ||
| ) | ||
|
|
||
| internal class LocationFromTripSessionProvider( | ||
| private val tripSessionLocationProvider: TripSessionLocationProvider | ||
| ) : LocationProvider { | ||
| override suspend fun getCurrentLocation(): CurrentLocation { | ||
| val currentLocation = tripSessionLocationProvider.locationMatcherResult | ||
| return currentLocation?.toCurrentLocation() ?: waitForTheFirstLocationEventWithTimeout() | ||
| } | ||
|
|
||
| private suspend fun waitForTheFirstLocationEventWithTimeout() = | ||
| withTimeout(GETTING_LOCATION_TIMEOUT_MILLISECONDS) { | ||
| waitForTheFirstLocationEvent() | ||
| } | ||
|
|
||
| private suspend fun waitForTheFirstLocationEvent(): CurrentLocation { | ||
| val (result, cleanup) = suspendCancellableCoroutine<Pair<CurrentLocation, () -> Unit>> | ||
| { continuation -> | ||
| val observer = object : LocationObserver { | ||
| override fun onNewRawLocation(rawLocation: Location) { | ||
| } | ||
|
|
||
| override fun onNewLocationMatcherResult( | ||
| locationMatcherResult: LocationMatcherResult | ||
| ) { | ||
| continuation.resume( | ||
| Pair( | ||
| locationMatcherResult.toCurrentLocation(), | ||
| { | ||
| tripSessionLocationProvider.unregisterLocationObserver(this) | ||
| } | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
| tripSessionLocationProvider.registerLocationObserver(observer) | ||
| continuation.invokeOnCancellation { | ||
| tripSessionLocationProvider.unregisterLocationObserver(observer) | ||
| } | ||
| } | ||
| cleanup() | ||
| return result | ||
| } | ||
|
|
||
| private fun LocationMatcherResult.toCurrentLocation() = CurrentLocation( | ||
| point = enhancedLocation.toPoint(), | ||
| bearing = enhancedLocation.bearing.toDouble(), | ||
| zLevel = zLevel | ||
| ) | ||
|
|
||
| private companion object { | ||
| private const val GETTING_LOCATION_TIMEOUT_MILLISECONDS = 30_000L | ||
| } | ||
| } |
Oops, something went wrong.