-
Notifications
You must be signed in to change notification settings - Fork 319
NAVAND-960: allow different PredictiveCacheLocationOptions for different zooms #6868
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 @@ | ||
| - Introduced `PredictiveCacheOptions.Builder#predictiveCacheMapsOptionsList` as an alternative for deprecated `PredictiveCacheOptions.Builder#predictiveCacheMapsOptions`. This allows to use different `PredictiveCacheLocationOptions` for different zoom level ranges. |
This file contains hidden or 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 hidden or 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
57 changes: 57 additions & 0 deletions
57
...ase/src/test/java/com/mapbox/navigation/base/options/PredictiveCacheOptionsBuilderTest.kt
This file contains hidden or 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,57 @@ | ||
| package com.mapbox.navigation.base.options | ||
|
|
||
| import com.mapbox.navigation.testing.BuilderTest | ||
| import org.junit.Test | ||
| import kotlin.reflect.KClass | ||
|
|
||
| class PredictiveCacheOptionsBuilderTest : | ||
| BuilderTest<PredictiveCacheOptions, PredictiveCacheOptions.Builder>() { | ||
| override fun getImplementationClass(): KClass<PredictiveCacheOptions> = | ||
| PredictiveCacheOptions::class | ||
|
|
||
| override fun getFilledUpBuilder(): PredictiveCacheOptions.Builder = | ||
| PredictiveCacheOptions.Builder().apply { | ||
| predictiveCacheNavigationOptions( | ||
| PredictiveCacheNavigationOptions.Builder().apply { | ||
| predictiveCacheLocationOptions( | ||
| PredictiveCacheLocationOptions.Builder().apply { | ||
| currentLocationRadiusInMeters(300) | ||
| routeBufferRadiusInMeters(50) | ||
| destinationLocationRadiusInMeters(20) | ||
| }.build() | ||
| ) | ||
| }.build() | ||
| ) | ||
| predictiveCacheMapsOptionsList( | ||
| listOf( | ||
| PredictiveCacheMapsOptions.Builder().apply { | ||
| predictiveCacheLocationOptions( | ||
| PredictiveCacheLocationOptions.Builder().apply { | ||
| currentLocationRadiusInMeters(100) | ||
| routeBufferRadiusInMeters(2) | ||
| destinationLocationRadiusInMeters(15) | ||
| }.build() | ||
| ) | ||
| minZoom(1) | ||
| maxZoom(3) | ||
| }.build(), | ||
| PredictiveCacheMapsOptions.Builder().apply { | ||
| predictiveCacheLocationOptions( | ||
| PredictiveCacheLocationOptions.Builder().apply { | ||
| currentLocationRadiusInMeters(200) | ||
| routeBufferRadiusInMeters(3) | ||
| destinationLocationRadiusInMeters(18) | ||
| }.build() | ||
| ) | ||
| minZoom(7) | ||
| maxZoom(9) | ||
| }.build(), | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| override fun trigger() { | ||
| // trigger, see KDoc | ||
| } | ||
| } |
45 changes: 45 additions & 0 deletions
45
...st/java/com/mapbox/navigation/base/options/PredictiveCacheOptionsDeprecatedBuilderTest.kt
This file contains hidden or 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,45 @@ | ||
| package com.mapbox.navigation.base.options | ||
|
|
||
| import com.mapbox.navigation.testing.BuilderTest | ||
| import org.junit.Test | ||
| import kotlin.reflect.KClass | ||
|
|
||
| class PredictiveCacheOptionsDeprecatedBuilderTest : | ||
| BuilderTest<PredictiveCacheOptions, PredictiveCacheOptions.Builder>() { | ||
|
|
||
| override fun getImplementationClass(): KClass<PredictiveCacheOptions> = | ||
| PredictiveCacheOptions::class | ||
|
|
||
| override fun getFilledUpBuilder(): PredictiveCacheOptions.Builder = | ||
| PredictiveCacheOptions.Builder().apply { | ||
| predictiveCacheNavigationOptions( | ||
| PredictiveCacheNavigationOptions.Builder().apply { | ||
| predictiveCacheLocationOptions( | ||
| PredictiveCacheLocationOptions.Builder().apply { | ||
| currentLocationRadiusInMeters(300) | ||
| routeBufferRadiusInMeters(50) | ||
| destinationLocationRadiusInMeters(20) | ||
| }.build() | ||
| ) | ||
| }.build() | ||
| ) | ||
| predictiveCacheMapsOptions( | ||
| PredictiveCacheMapsOptions.Builder().apply { | ||
| predictiveCacheLocationOptions( | ||
| PredictiveCacheLocationOptions.Builder().apply { | ||
| currentLocationRadiusInMeters(100) | ||
| routeBufferRadiusInMeters(2) | ||
| destinationLocationRadiusInMeters(15) | ||
| }.build() | ||
| ) | ||
| minZoom(1) | ||
| maxZoom(3) | ||
| }.build() | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| override fun trigger() { | ||
| // trigger, see KDoc | ||
| } | ||
| } |
110 changes: 73 additions & 37 deletions
110
...ation-base/src/test/java/com/mapbox/navigation/base/options/PredictiveCacheOptionsTest.kt
This file contains hidden or 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 |
|---|---|---|
| @@ -1,44 +1,80 @@ | ||
| package com.mapbox.navigation.base.options | ||
|
|
||
| import com.mapbox.navigation.testing.BuilderTest | ||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Test | ||
| import kotlin.reflect.KClass | ||
|
|
||
| class PredictiveCacheOptionsTest : | ||
| BuilderTest<PredictiveCacheOptions, PredictiveCacheOptions.Builder>() { | ||
| override fun getImplementationClass(): KClass<PredictiveCacheOptions> = | ||
| PredictiveCacheOptions::class | ||
|
|
||
| override fun getFilledUpBuilder(): PredictiveCacheOptions.Builder = | ||
| PredictiveCacheOptions.Builder().apply { | ||
| predictiveCacheNavigationOptions( | ||
| PredictiveCacheNavigationOptions.Builder().apply { | ||
| predictiveCacheLocationOptions( | ||
| PredictiveCacheLocationOptions.Builder().apply { | ||
| currentLocationRadiusInMeters(300) | ||
| routeBufferRadiusInMeters(50) | ||
| destinationLocationRadiusInMeters(20) | ||
| }.build() | ||
| ) | ||
| }.build() | ||
| ) | ||
| predictiveCacheMapsOptions( | ||
| PredictiveCacheMapsOptions.Builder().apply { | ||
| predictiveCacheLocationOptions( | ||
| PredictiveCacheLocationOptions.Builder().apply { | ||
| currentLocationRadiusInMeters(100) | ||
| routeBufferRadiusInMeters(2) | ||
| destinationLocationRadiusInMeters(15) | ||
| }.build() | ||
| ) | ||
| minZoom(1) | ||
| maxZoom(3) | ||
| }.build() | ||
| ) | ||
| } | ||
|
|
||
| class PredictiveCacheOptionsTest { | ||
|
|
||
| @Test | ||
| fun defaultMapsOptionsList() { | ||
| val expected = PredictiveCacheMapsOptions.Builder().build() | ||
| val actual = PredictiveCacheOptions.Builder().build() | ||
|
|
||
| assertEquals(expected, actual.predictiveCacheMapsOptions) | ||
| assertEquals(listOf(expected), actual.predictiveCacheMapsOptionsList) | ||
| } | ||
|
|
||
| @Test | ||
| fun deprecatedMapsOptions() { | ||
| val mapsOptions = PredictiveCacheMapsOptions.Builder().minZoom(12).maxZoom(14).build() | ||
| val actual = PredictiveCacheOptions.Builder() | ||
| .predictiveCacheMapsOptions(mapsOptions) | ||
| .build() | ||
|
|
||
| assertEquals(mapsOptions, actual.predictiveCacheMapsOptions) | ||
| assertEquals(listOf(mapsOptions), actual.predictiveCacheMapsOptionsList) | ||
| } | ||
|
|
||
| @Test | ||
| fun customMapsOptionsList() { | ||
| val mapsOptions1 = PredictiveCacheMapsOptions.Builder().minZoom(12).maxZoom(14).build() | ||
| val mapsOptions2 = PredictiveCacheMapsOptions.Builder().minZoom(11).maxZoom(13).build() | ||
| val actual = PredictiveCacheOptions.Builder() | ||
| .predictiveCacheMapsOptionsList(listOf(mapsOptions1, mapsOptions2)) | ||
| .build() | ||
|
|
||
| assertEquals(mapsOptions1, actual.predictiveCacheMapsOptions) | ||
| assertEquals(listOf(mapsOptions1, mapsOptions2), actual.predictiveCacheMapsOptionsList) | ||
| } | ||
|
|
||
| @Test(expected = IllegalArgumentException::class) | ||
| fun customEmptyMapsOptionsList() { | ||
| PredictiveCacheOptions.Builder() | ||
| .predictiveCacheMapsOptionsList(emptyList()) | ||
| .build() | ||
| } | ||
|
|
||
| @Test | ||
| override fun trigger() { | ||
| // trigger, see KDoc | ||
| fun customMapsOptionsAfterDeprecatedMapsOptions() { | ||
| val deprecatedMapsOptions = PredictiveCacheMapsOptions.Builder() | ||
| .minZoom(7) | ||
| .maxZoom(9) | ||
| .build() | ||
| val mapsOptions1 = PredictiveCacheMapsOptions.Builder().minZoom(12).maxZoom(14).build() | ||
| val mapsOptions2 = PredictiveCacheMapsOptions.Builder().minZoom(11).maxZoom(13).build() | ||
| val actual = PredictiveCacheOptions.Builder() | ||
| .predictiveCacheMapsOptions(deprecatedMapsOptions) | ||
| .predictiveCacheMapsOptionsList(listOf(mapsOptions1, mapsOptions2)) | ||
| .build() | ||
|
|
||
| assertEquals(mapsOptions1, actual.predictiveCacheMapsOptions) | ||
| assertEquals(listOf(mapsOptions1, mapsOptions2), actual.predictiveCacheMapsOptionsList) | ||
| } | ||
|
|
||
| @Test | ||
| fun deprecatedMapsOptionsAfterCustomMapsOptionsList() { | ||
| val deprecatedMapsOptions = PredictiveCacheMapsOptions.Builder() | ||
| .minZoom(7) | ||
| .maxZoom(9) | ||
| .build() | ||
| val mapsOptions1 = PredictiveCacheMapsOptions.Builder().minZoom(12).maxZoom(14).build() | ||
| val mapsOptions2 = PredictiveCacheMapsOptions.Builder().minZoom(11).maxZoom(13).build() | ||
| val actual = PredictiveCacheOptions.Builder() | ||
| .predictiveCacheMapsOptionsList(listOf(mapsOptions1, mapsOptions2)) | ||
| .predictiveCacheMapsOptions(deprecatedMapsOptions) | ||
| .build() | ||
|
|
||
| assertEquals(deprecatedMapsOptions, actual.predictiveCacheMapsOptions) | ||
| assertEquals(listOf(deprecatedMapsOptions), actual.predictiveCacheMapsOptionsList) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.