Skip to content

Commit 2b7b890

Browse files
korshaknnkorshaknn
committed
bump sdk dependencies
1 parent 38c986e commit 2b7b890

13 files changed

Lines changed: 52 additions & 101 deletions

File tree

‎changelog/unreleased/features/6833.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- Added `RoadComponent.language` value.
2+
- Changed `EHorizonEdgeMetadata.names` class from `RoadName` to `RoadComponent`.
3+
- Removed `RoadName` class.

‎gradle/dependencies.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ 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 = '123.1.0'
16+
mapboxNavigatorVersion = '124.0.0'
1717
}
1818
println("Navigation Native version: " + mapboxNavigatorVersion)
1919

2020
version = [
21-
mapboxMapSdk : '10.10.0',
21+
mapboxMapSdk : '10.11.0-beta.1',
2222
mapboxSdkServices : '6.10.0-beta.3',
2323
mapboxNavigator : "${mapboxNavigatorVersion}",
24-
mapboxCommonNative : '23.2.1',
24+
mapboxCommonNative : '23.3.0-beta.1',
2525
mapboxCrashMonitor : '2.0.0',
2626
mapboxAnnotationPlugin : '0.8.0',
2727
mapboxBaseAndroid : '0.8.0',

‎libnavigation-base/api/current.txt‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -615,9 +615,11 @@ package com.mapbox.navigation.base.road.model {
615615

616616
public final class RoadComponent {
617617
method public String? getImageBaseUrl();
618+
method public String getLanguage();
618619
method public com.mapbox.api.directions.v5.models.MapboxShield? getShield();
619620
method public String getText();
620621
property public final String? imageBaseUrl;
622+
property public final String language;
621623
property public final com.mapbox.api.directions.v5.models.MapboxShield? shield;
622624
property public final String text;
623625
}
@@ -1020,7 +1022,7 @@ package com.mapbox.navigation.base.trip.model.eh {
10201022
method public double getLength();
10211023
method public Double? getMeanElevation();
10221024
method public boolean getMotorway();
1023-
method public java.util.List<com.mapbox.navigation.base.trip.model.eh.RoadName> getNames();
1025+
method public java.util.List<com.mapbox.navigation.base.road.model.RoadComponent> getNames();
10241026
method public boolean getRamp();
10251027
method public String getRoadSurface();
10261028
method public double getSpeed();
@@ -1044,7 +1046,7 @@ package com.mapbox.navigation.base.trip.model.eh {
10441046
property public final double length;
10451047
property public final Double? meanElevation;
10461048
property public final boolean motorway;
1047-
property public final java.util.List<com.mapbox.navigation.base.trip.model.eh.RoadName> names;
1049+
property public final java.util.List<com.mapbox.navigation.base.road.model.RoadComponent> names;
10481050
property public final boolean ramp;
10491051
property public final String roadSurface;
10501052
property public final double speed;
@@ -1156,13 +1158,6 @@ package com.mapbox.navigation.base.trip.model.eh {
11561158
@StringDef({com.mapbox.navigation.base.trip.model.eh.RoadClass.MOTORWAY, com.mapbox.navigation.base.trip.model.eh.RoadClass.TRUNK, com.mapbox.navigation.base.trip.model.eh.RoadClass.PRIMARY, com.mapbox.navigation.base.trip.model.eh.RoadClass.SECONDARY, com.mapbox.navigation.base.trip.model.eh.RoadClass.TERTIARY, com.mapbox.navigation.base.trip.model.eh.RoadClass.UNCLASSIFIED, com.mapbox.navigation.base.trip.model.eh.RoadClass.RESIDENTIAL, com.mapbox.navigation.base.trip.model.eh.RoadClass.SERVICE_OTHER}) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public static @interface RoadClass.Type {
11571159
}
11581160

1159-
public final class RoadName {
1160-
method public String getName();
1161-
method public boolean getShielded();
1162-
property public final String name;
1163-
property public final boolean shielded;
1164-
}
1165-
11661161
public final class RoadSurface {
11671162
field public static final String COMPACTED = "COMPACTED";
11681163
field public static final String DIRT = "DIRT";

‎libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/factory/RoadFactory.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ object RoadFactory {
1818
text = road.text,
1919
shield = road.shield.toMapboxShield(),
2020
imageBaseUrl = road.imageBaseUrl,
21+
language = road.language,
2122
)
2223
}
2324
return Road(

‎libnavigation-base/src/main/java/com/mapbox/navigation/base/road/model/RoadComponent.kt‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ import com.mapbox.api.directions.v5.models.MapboxShield
44

55
/**
66
* Object that holds road components
7-
* @property text of the road
7+
* @property text name of the road. May be '/' if used for separation of road names
8+
* @property language 2 letters language code or "Unspecified" or empty string
89
* @property shield mapbox designed shield if available otherwise null
910
* @property imageBaseUrl url for the route shield if available otherwise null
1011
*/
1112
class RoadComponent internal constructor(
1213
val text: String,
14+
val language: String,
1315
val shield: MapboxShield? = null,
1416
val imageBaseUrl: String? = null
1517
) {
@@ -23,6 +25,7 @@ class RoadComponent internal constructor(
2325
other as RoadComponent
2426

2527
if (text != other.text) return false
28+
if (language != other.language) return false
2629
if (shield != other.shield) return false
2730
if (imageBaseUrl != other.imageBaseUrl) return false
2831

@@ -34,6 +37,7 @@ class RoadComponent internal constructor(
3437
*/
3538
override fun hashCode(): Int {
3639
var result = text.hashCode()
40+
result = 31 * result + language.hashCode()
3741
result = 31 * result + (shield?.hashCode() ?: 0)
3842
result = 31 * result + (imageBaseUrl?.hashCode() ?: 0)
3943
return result
@@ -43,6 +47,11 @@ class RoadComponent internal constructor(
4347
* Returns a string representation of the object.
4448
*/
4549
override fun toString(): String {
46-
return "RoadComponent(text='$text', shield=$shield, imageBaseUrl=$imageBaseUrl)"
50+
return "RoadComponent(" +
51+
"text='$text', " +
52+
"language='$language', " +
53+
"shield=$shield, " +
54+
"imageBaseUrl=$imageBaseUrl" +
55+
")"
4756
}
4857
}

‎libnavigation-base/src/main/java/com/mapbox/navigation/base/trip/model/eh/EHorizonEdgeMetadata.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.mapbox.navigation.base.trip.model.eh
22

3+
import com.mapbox.navigation.base.road.model.RoadComponent
4+
35
/**
46
* Edge metadata
57
*
@@ -45,7 +47,7 @@ class EHorizonEdgeMetadata internal constructor(
4547
val bridge: Boolean,
4648
val tunnel: Boolean,
4749
val toll: Boolean,
48-
val names: List<RoadName>,
50+
val names: List<RoadComponent>,
4951
val laneCount: Byte?,
5052
val meanElevation: Double?,
5153
val curvature: Byte,

‎libnavigation-base/src/main/java/com/mapbox/navigation/base/trip/model/eh/EHorizonMapper.kt‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.mapbox.navigation.base.trip.model.eh
22

3+
import com.mapbox.navigation.base.internal.extensions.toMapboxShield
4+
import com.mapbox.navigation.base.road.model.RoadComponent
35
import com.mapbox.navigation.base.trip.model.roadobject.RoadObjectPosition
46
import com.mapbox.navigation.base.trip.model.roadobject.distanceinfo.GantryDistanceInfo
57
import com.mapbox.navigation.base.trip.model.roadobject.distanceinfo.Gate
@@ -408,18 +410,20 @@ private fun FunctionalRoadClass.mapToRoadClass(): String {
408410
}
409411
}
410412

411-
private fun mapNames(names: List<com.mapbox.navigator.RoadName>): List<RoadName> {
412-
val namesNames = mutableListOf<RoadName>()
413+
private fun mapNames(names: List<com.mapbox.navigator.RoadName>): List<RoadComponent> {
414+
val roadComponents = mutableListOf<RoadComponent>()
413415
names.forEach {
414-
namesNames.add(it.mapToRoadName())
416+
roadComponents.add(it.mapToRoadComponent())
415417
}
416-
return namesNames.toList()
418+
return roadComponents.toList()
417419
}
418420

419-
private fun com.mapbox.navigator.RoadName.mapToRoadName(): RoadName {
420-
return RoadName(
421-
name,
422-
shielded
421+
private fun com.mapbox.navigator.RoadName.mapToRoadComponent(): RoadComponent {
422+
return RoadComponent(
423+
text,
424+
language,
425+
shield.toMapboxShield(),
426+
imageBaseUrl,
423427
)
424428
}
425429

‎libnavigation-base/src/main/java/com/mapbox/navigation/base/trip/model/eh/RoadName.kt‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎libnavigation-base/src/test/java/com/mapbox/navigation/base/internal/factory/RoadFactoryTest.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ class RoadFactoryTest {
4444

4545
private fun createNavigationStatus(): NavigationStatus = mockk {
4646
every { roads } returns listOf(
47-
com.mapbox.navigator.Road(
47+
com.mapbox.navigator.RoadName(
4848
"roadName1",
49+
"en",
4950
"legacyUrl1",
5051
com.mapbox.navigator.Shield(
5152
"designUrl",
@@ -54,8 +55,9 @@ class RoadFactoryTest {
5455
"color"
5556
)
5657
),
57-
com.mapbox.navigator.Road(
58+
com.mapbox.navigator.RoadName(
5859
"roadName2",
60+
"en",
5961
null,
6062
null
6163
)

‎libnavigation-core/src/test/java/com/mapbox/navigation/core/navigator/NavigatorMapperTest.kt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class NavigatorMapperTest {
4848
private val route: NavigationRoute = mockk(relaxed = true) {
4949
every { directionsRoute } returns this@NavigatorMapperTest.directionsRoute
5050
}
51+
private val roadName = com.mapbox.navigator.RoadName("Central Av", "en", null, null)
5152

5253
@OptIn(ExperimentalMapboxNavigationAPI::class)
5354
@Test
@@ -128,7 +129,7 @@ class NavigatorMapperTest {
128129
)
129130
}
130131
every { layer } returns null
131-
every { roads } returns listOf(com.mapbox.navigator.Road("Central Av", null, null))
132+
every { roads } returns listOf(roadName)
132133
every { isFallback } returns false
133134
every { inTunnel } returns false
134135
}
@@ -174,7 +175,7 @@ class NavigatorMapperTest {
174175
)
175176
}
176177
every { layer } returns null
177-
every { roads } returns listOf(com.mapbox.navigator.Road("Central Av", null, null))
178+
every { roads } returns listOf(roadName)
178179
every { isFallback } returns false
179180
every { inTunnel } returns false
180181
}
@@ -220,7 +221,7 @@ class NavigatorMapperTest {
220221
)
221222
}
222223
every { layer } returns null
223-
every { roads } returns listOf(com.mapbox.navigator.Road("Central Av", null, null))
224+
every { roads } returns listOf(roadName)
224225
every { isFallback } returns true
225226
every { inTunnel } returns false
226227
}
@@ -266,7 +267,7 @@ class NavigatorMapperTest {
266267
)
267268
}
268269
every { layer } returns null
269-
every { roads } returns listOf(com.mapbox.navigator.Road("Central Av", null, null))
270+
every { roads } returns listOf(roadName)
270271
every { isFallback } returns false
271272
every { inTunnel } returns false
272273
}
@@ -305,7 +306,7 @@ class NavigatorMapperTest {
305306
every { matches } returns listOf()
306307
}
307308
every { layer } returns null
308-
every { roads } returns listOf(com.mapbox.navigator.Road("Central Av", null, null))
309+
every { roads } returns listOf(roadName)
309310
every { isFallback } returns false
310311
every { inTunnel } returns false
311312
}
@@ -355,7 +356,7 @@ class NavigatorMapperTest {
355356
)
356357
}
357358
every { layer } returns 2
358-
every { roads } returns listOf(com.mapbox.navigator.Road("Central Av", null, null))
359+
every { roads } returns listOf(roadName)
359360
every { isFallback } returns false
360361
every { inTunnel } returns false
361362
}
@@ -401,7 +402,7 @@ class NavigatorMapperTest {
401402
)
402403
}
403404
every { layer } returns null
404-
every { roads } returns listOf(com.mapbox.navigator.Road("Central Av", null, null))
405+
every { roads } returns listOf(roadName)
405406
every { isFallback } returns false
406407
every { inTunnel } returns true
407408
}
@@ -608,7 +609,7 @@ class NavigatorMapperTest {
608609
every { voiceInstruction } returns nativeVoiceInstructions
609610
every { inTunnel } returns true
610611
every { upcomingRouteAlerts } returns emptyList()
611-
every { roads } returns listOf(com.mapbox.navigator.Road("Central Av", null, null))
612+
every { roads } returns listOf(roadName)
612613
every { locatedAlternativeRouteId } returns "alternative_id"
613614
every { geometryIndex } returns routeGeometryIndex
614615
every { shapeIndex } returns legGeometryIndex

0 commit comments

Comments
 (0)