-
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
f39ba23
commit f371271
Showing
15 changed files
with
1,261 additions
and
50 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
62 changes: 62 additions & 0 deletions
62
...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,62 @@ | ||
| package com.mapbox.navigation.instrumentation_tests.core | ||
|
|
||
| import android.location.Location | ||
| import androidx.test.platform.app.InstrumentationRegistry | ||
| import com.mapbox.api.directions.v5.models.RouteOptions | ||
| 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.instrumentation_tests.activity.EmptyTestActivity | ||
| import com.mapbox.navigation.instrumentation_tests.utils.MapboxNavigationRule | ||
| 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() { | ||
| val mapboxNavigation = runOnMainSync { | ||
| val context = InstrumentationRegistry.getInstrumentation().getTargetContext() | ||
| MapboxNavigationProvider.create( | ||
| NavigationOptions.Builder(context) | ||
| .accessToken(getMapboxAccessTokenFromResources(context)) | ||
| .build() | ||
| ) | ||
| } | ||
| val routeOptions: RouteOptions = runBlocking(Dispatchers.Main) { | ||
| mapboxNavigation.buildRouteOptions { builder -> | ||
| builder | ||
| .fromCurrentLocation() | ||
| .toDestination( | ||
| coordinate = Point.fromLngLat(2.0, 2.0) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| 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
66 changes: 66 additions & 0 deletions
66
...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,66 @@ | ||
| 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.yield | ||
| 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() ?: 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) | ||
| } | ||
| } | ||
| yield() // you can't remove listener in the listener's callback | ||
| cleanup() | ||
| return result | ||
| } | ||
|
|
||
| private fun LocationMatcherResult.toCurrentLocation() = CurrentLocation( | ||
| point = enhancedLocation.toPoint(), | ||
| bearing = enhancedLocation.bearing.toDouble(), | ||
| zLevel = zLevel | ||
| ) | ||
| } |
Oops, something went wrong.