Skip to content

Commit 777f4d3

Browse files
holussgithub-actions[bot]
holuss
authored and
github-actions[bot]
committed
Bump NavSDK Core 3.10.0-rc.1 dependencies (#9376)
GitOrigin-RevId: 100f86b60cd55ee8ff843b3275b7d4c45ae2a84f
1 parent 5ecce0e commit 777f4d3

File tree

6 files changed

+48
-45
lines changed

6 files changed

+48
-45
lines changed

‎changelog/unreleased/bugfixes/9376.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- Fixed incorrect route request with user added charging station
2+
- Fixed incorrect edge expansion during simulation by teleporting
3+
- Improved behavior on roundabouts: avoid cases when the vehicle position circles around the roundabout in case of matching errors
4+
- Fixed re-enabling route refresh after leg change
5+
- Removed caching of mapbox access token

‎changelog/unreleased/features/9376.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- Introduced performance trace points for navigation
2+
- Added filtering inaccurate wheel speed for Dead Reckoning to reduce possible location jumps in case of wheel slippage
3+
- Added provide the latest tiles version when tileset descriptors requested with empty version.
4+
- Added support for delta updates for routing and ADAS tiles
5+
- Added reading of life-traffic-service and reporting them to ADASIS traffic events
6+
- Improved heading interpolation

‎gradle/dependencies.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ ext {
1313
// version which we should use in this build
1414
def mapboxNavigatorVersion = System.getenv("FORCE_MAPBOX_NAVIGATION_NATIVE_VERSION")
1515
if (mapboxNavigatorVersion == null || mapboxNavigatorVersion == '') {
16-
mapboxNavigatorVersion = '324.13.0-beta.1'
16+
mapboxNavigatorVersion = '324.13.0-rc.1'
1717
}
1818
if (!project.hasProperty("hasPrintedNavigatorVersion")) {
1919
println("Navigation Native version: " + mapboxNavigatorVersion)
2020
project.ext.hasPrintedNavigatorVersion = true
2121
}
2222

2323
version = [
24-
mapboxMapSdk : '11.13.0-beta.1',
24+
mapboxMapSdk : '11.13.0-rc.1',
2525
mapboxSdkServices : '7.4.0',
2626
mapboxNavigator : "${mapboxNavigatorVersion}",
27-
mapboxCommonNative : '24.13.0-beta.1',
28-
mapboxNavSdkCpp : '0.13.0-beta.1',
29-
mapboxSearch : '2.13.0-beta.1',
27+
mapboxCommonNative : '24.13.0-rc.1',
28+
mapboxNavSdkCpp : '0.13.0-rc.1',
29+
mapboxSearch : '2.13.0-rc.1',
3030
mapboxBaseAndroid : '0.11.0',
3131
androidXActivity : '1.7.1',
3232
androidXActivityCompose : '1.9.2',

‎instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/utils/NavigationTilesDownloader.kt‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@ class NavigationTilesDownloader {
2828
}
2929

3030
@Test
31-
fun run() {
31+
fun runWithAdas() = run(includeAdas = true)
32+
33+
@Test
34+
fun runWithoutAdas() = run(includeAdas = false)
35+
36+
private fun run(includeAdas: Boolean) {
3237
val tileStoreDir = File(context.filesDir, ".mapbox/tile_store").apply {
3338
deleteRecursively()
3439
mkdirs()
@@ -38,7 +43,7 @@ class NavigationTilesDownloader {
3843
val region = getDownloadPolygon()
3944
if (region != null) {
4045
try {
41-
loadRegion(navigation, region)
46+
loadRegion(navigation, region, includeAdas)
4247
println("Navigation tiles have been downloaded")
4348
} catch (e: Exception) {
4449
System.err.println("Failed to download navigation tiles: ${e.message}")
@@ -100,8 +105,12 @@ class NavigationTilesDownloader {
100105
}
101106
}
102107

103-
private suspend fun loadRegion(navigation: MapboxNavigation, region: Geometry) {
104-
val navTilesetDescriptor = navigation.tilesetDescriptorFactory.getLatest()
108+
private suspend fun loadRegion(
109+
navigation: MapboxNavigation,
110+
region: Geometry,
111+
includeAdas: Boolean,
112+
) {
113+
val navTilesetDescriptor = navigation.tilesetDescriptorFactory.getLatest(includeAdas)
105114

106115
val tileRegionLoadOptions = TileRegionLoadOptions.Builder()
107116
.geometry(region)

‎navigation/src/main/java/com/mapbox/navigation/core/navigator/TilesetDescriptorFactory.kt‎

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class TilesetDescriptorFactory internal constructor(
3737
nativeFactoryWrapper.build(
3838
combineDatasetWithProfile(tilesDataset, tilesProfile),
3939
tilesVersion ?: routingTilesOptions.tilesVersion,
40+
false,
4041
)
4142

4243
/**
@@ -72,7 +73,7 @@ class TilesetDescriptorFactory internal constructor(
7273
* @param tilesVersion TilesetDescriptor version
7374
*/
7475
fun getSpecificVersion(tilesVersion: String): TilesetDescriptor =
75-
nativeFactoryWrapper.getSpecificVersion(cache, tilesVersion)
76+
nativeFactoryWrapper.getSpecificVersion(cache, tilesVersion, false)
7677

7778
/**
7879
* Gets TilesetDescriptor which corresponds to the currently used routing tiles dataset
@@ -87,7 +88,17 @@ class TilesetDescriptorFactory internal constructor(
8788
/**
8889
* Gets TilesetDescriptor which corresponds to the latest available version of routing tiles.
8990
*/
90-
fun getLatest(): TilesetDescriptor = nativeFactoryWrapper.getLatest(cache)
91+
fun getLatest(): TilesetDescriptor = nativeFactoryWrapper.getLatest(cache, false)
92+
93+
/**
94+
* Gets TilesetDescriptor which corresponds to the latest available version of routing tiles.
95+
* @param includeAdas Whether to include ADAS tiles.
96+
*/
97+
@ExperimentalPreviewMapboxNavigationAPI
98+
fun getLatest(includeAdas: Boolean): TilesetDescriptor = nativeFactoryWrapper.getLatest(
99+
cache,
100+
includeAdas,
101+
)
91102

92103
private fun combineDatasetWithProfile(tilesDataset: String?, tilesProfile: String?): String {
93104
val dataset: String = tilesDataset ?: routingTilesOptions.tilesDataset
@@ -102,23 +113,14 @@ class TilesetDescriptorFactory internal constructor(
102113

103114
// need the wrapper to avoid UnsatisfiedLinkError in unit tests
104115
internal interface NativeFactoryWrapper {
105-
fun getSpecificVersion(
106-
cache: CacheHandle,
107-
tilesVersion: String,
108-
): TilesetDescriptor
109116

110117
fun getSpecificVersion(
111118
cache: CacheHandle,
112119
tilesVersion: String,
113120
includeAdas: Boolean,
114121
): TilesetDescriptor
115122

116-
fun getLatest(cache: CacheHandle): TilesetDescriptor
117-
118-
fun build(
119-
tilesDatasetAndProfile: String,
120-
tilesVersion: String,
121-
): TilesetDescriptor
123+
fun getLatest(cache: CacheHandle, includeAdas: Boolean): TilesetDescriptor
122124

123125
fun build(
124126
tilesDatasetAndProfile: String,
@@ -129,16 +131,6 @@ class TilesetDescriptorFactory internal constructor(
129131

130132
internal class NativeFactoryWrapperImpl : NativeFactoryWrapper {
131133

132-
override fun getSpecificVersion(
133-
cache: CacheHandle,
134-
tilesVersion: String,
135-
): TilesetDescriptor {
136-
return NativeTilesetDescriptorFactory.getSpecificVersion(
137-
cache,
138-
tilesVersion,
139-
)
140-
}
141-
142134
override fun getSpecificVersion(
143135
cache: CacheHandle,
144136
tilesVersion: String,
@@ -151,18 +143,8 @@ class TilesetDescriptorFactory internal constructor(
151143
)
152144
}
153145

154-
override fun getLatest(cache: CacheHandle): TilesetDescriptor {
155-
return NativeTilesetDescriptorFactory.getLatest(cache)
156-
}
157-
158-
override fun build(
159-
tilesDatasetAndProfile: String,
160-
tilesVersion: String,
161-
): TilesetDescriptor {
162-
return NativeTilesetDescriptorFactory.build(
163-
tilesDatasetAndProfile,
164-
tilesVersion,
165-
)
146+
override fun getLatest(cache: CacheHandle, includeAdas: Boolean): TilesetDescriptor {
147+
return NativeTilesetDescriptorFactory.getLatest(cache, includeAdas)
166148
}
167149

168150
override fun build(

‎navigation/src/test/java/com/mapbox/navigation/core/navigator/TilesDescriptorFactoryTest.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class TilesDescriptorFactoryTest {
8484
)
8585

8686
verify {
87-
nativeFactoryWrapper.build("$DATASET/$PROFILE", VERSION)
87+
nativeFactoryWrapper.build("$DATASET/$PROFILE", VERSION, ADASIS)
8888
}
8989
}
9090

@@ -93,14 +93,15 @@ class TilesDescriptorFactoryTest {
9393
tilesetDescriptorFactory.build()
9494

9595
verify {
96-
nativeFactoryWrapper.build("$OPTIONS_DATASET/$OPTIONS_PROFILE", OPTIONS_VERSION)
96+
nativeFactoryWrapper.build("$OPTIONS_DATASET/$OPTIONS_PROFILE", OPTIONS_VERSION, ADASIS)
9797
}
9898
}
9999

100100
private companion object {
101101
private const val DATASET = "dataset"
102102
private const val PROFILE = "profile"
103103
private const val VERSION = "version"
104+
private const val ADASIS = false
104105

105106
private const val OPTIONS_DATASET = "options_dataset"
106107
private const val OPTIONS_PROFILE = "options_profile"

0 commit comments

Comments
 (0)