bump sdk dependencies

Author: korshaknn

CHANGELOG.md

@@ -30,6 +30,9 @@ Mapbox welcomes participation and contributions from everyone.
 - Each newly instantiated MapboxRouteArrowView class will initialize the layers with the provided options on the first render call. Previously this would only be done if the layers hadn't already been initialized.  [#6466](https://github.com/mapbox/mapbox-navigation-android/pull/6466)
 - Fixed an issue where the first voice instruction might have been played twice. [#6766](https://github.com/mapbox/mapbox-navigation-android/pull/6766)
 - Changed distance formatting: now all the imperial distances down to 0.1 miles will be represented in miles, while the smaller ones - in feet. [#6775](https://github.com/mapbox/mapbox-navigation-android/pull/6775)
+- Added `RoadComponent.language` value. [#6827](https://github.com/mapbox/mapbox-navigation-android/pull/6827)
+- Changed `EHorizonEdgeMetadata.names` class from `RoadName` to `RoadComponent`. [#6827](https://github.com/mapbox/mapbox-navigation-android/pull/6827)
+- Removed `RoadName` class. [#6827](https://github.com/mapbox/mapbox-navigation-android/pull/6827)
 
 ## Mapbox Navigation SDK 2.10.0-rc.2 - 12 January, 2023
 ### Changelog

gradle/dependencies.gradle

@@ -13,15 +13,15 @@ ext {
   // version which we should use in this build
   def mapboxNavigatorVersion = System.getenv("FORCE_MAPBOX_NAVIGATION_NATIVE_VERSION")
   if (mapboxNavigatorVersion == null || mapboxNavigatorVersion == '') {
-      mapboxNavigatorVersion = '123.1.0'
+      mapboxNavigatorVersion = '124.0.0'
   }
   println("Navigation Native version: " + mapboxNavigatorVersion)
 
   version = [
-      mapboxMapSdk              : '10.10.0',
+      mapboxMapSdk              : '10.11.0-beta.1',
       mapboxSdkServices         : '6.10.0-beta.3',
       mapboxNavigator           : "${mapboxNavigatorVersion}",
-      mapboxCommonNative        : '23.2.1',
+      mapboxCommonNative        : '23.3.0-beta.1',
       mapboxCrashMonitor        : '2.0.0',
       mapboxAnnotationPlugin    : '0.8.0',
       mapboxBaseAndroid         : '0.8.0',

libnavigation-base/api/current.txt

@@ -615,9 +615,11 @@ package com.mapbox.navigation.base.road.model {
 
   public final class RoadComponent {
     method public String? getImageBaseUrl();
+    method public String getLanguage();
     method public com.mapbox.api.directions.v5.models.MapboxShield? getShield();
     method public String getText();
     property public final String? imageBaseUrl;
+    property public final String language;
     property public final com.mapbox.api.directions.v5.models.MapboxShield? shield;
     property public final String text;
   }
@@ -1020,7 +1022,7 @@ package com.mapbox.navigation.base.trip.model.eh {
     method public double getLength();
     method public Double? getMeanElevation();
     method public boolean getMotorway();
-    method public java.util.List<com.mapbox.navigation.base.trip.model.eh.RoadName> getNames();
+    method public java.util.List<com.mapbox.navigation.base.road.model.RoadComponent> getNames();
     method public boolean getRamp();
     method public String getRoadSurface();
     method public double getSpeed();
@@ -1044,7 +1046,7 @@ package com.mapbox.navigation.base.trip.model.eh {
     property public final double length;
     property public final Double? meanElevation;
     property public final boolean motorway;
-    property public final java.util.List<com.mapbox.navigation.base.trip.model.eh.RoadName> names;
+    property public final java.util.List<com.mapbox.navigation.base.road.model.RoadComponent> names;
     property public final boolean ramp;
     property public final String roadSurface;
     property public final double speed;
@@ -1156,13 +1158,6 @@ package com.mapbox.navigation.base.trip.model.eh {
   @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 {
   }
 
-  public final class RoadName {
-    method public String getName();
-    method public boolean getShielded();
-    property public final String name;
-    property public final boolean shielded;
-  }
-
   public final class RoadSurface {
     field public static final String COMPACTED = "COMPACTED";
     field public static final String DIRT = "DIRT";

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

@@ -18,6 +18,7 @@ object RoadFactory {
                 text = road.text,
                 shield = road.shield.toMapboxShield(),
                 imageBaseUrl = road.imageBaseUrl,
+                language = road.language,
             )
         }
         return Road(

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

@@ -4,12 +4,14 @@ import com.mapbox.api.directions.v5.models.MapboxShield
 
 /**
  * Object that holds road components
- * @property text of the road
+ * @property text name of the road. May be '/' if used for separation of road names
+ * @property language 2 letters language code or "Unspecified" or empty string
  * @property shield mapbox designed shield if available otherwise null
  * @property imageBaseUrl url for the route shield if available otherwise null
  */
 class RoadComponent internal constructor(
     val text: String,
+    val language: String,
     val shield: MapboxShield? = null,
     val imageBaseUrl: String? = null
 ) {
@@ -23,6 +25,7 @@ class RoadComponent internal constructor(
         other as RoadComponent
 
         if (text != other.text) return false
+        if (language != other.language) return false
         if (shield != other.shield) return false
         if (imageBaseUrl != other.imageBaseUrl) return false
 
@@ -34,6 +37,7 @@ class RoadComponent internal constructor(
      */
     override fun hashCode(): Int {
         var result = text.hashCode()
+        result = 31 * result + language.hashCode()
         result = 31 * result + (shield?.hashCode() ?: 0)
         result = 31 * result + (imageBaseUrl?.hashCode() ?: 0)
         return result
@@ -43,6 +47,11 @@ class RoadComponent internal constructor(
      * Returns a string representation of the object.
      */
     override fun toString(): String {
-        return "RoadComponent(text='$text', shield=$shield, imageBaseUrl=$imageBaseUrl)"
+        return "RoadComponent(" +
+            "text='$text', " +
+            "language='$language', " +
+            "shield=$shield, " +
+            "imageBaseUrl=$imageBaseUrl" +
+            ")"
     }
 }

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

@@ -1,5 +1,7 @@
 package com.mapbox.navigation.base.trip.model.eh
 
+import com.mapbox.navigation.base.road.model.RoadComponent
+
 /**
  * Edge metadata
  *
@@ -45,7 +47,7 @@ class EHorizonEdgeMetadata internal constructor(
     val bridge: Boolean,
     val tunnel: Boolean,
     val toll: Boolean,
-    val names: List<RoadName>,
+    val names: List<RoadComponent>,
     val laneCount: Byte?,
     val meanElevation: Double?,
     val curvature: Byte,

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

@@ -1,5 +1,7 @@
 package com.mapbox.navigation.base.trip.model.eh
 
+import com.mapbox.navigation.base.internal.extensions.toMapboxShield
+import com.mapbox.navigation.base.road.model.RoadComponent
 import com.mapbox.navigation.base.trip.model.roadobject.RoadObjectPosition
 import com.mapbox.navigation.base.trip.model.roadobject.distanceinfo.GantryDistanceInfo
 import com.mapbox.navigation.base.trip.model.roadobject.distanceinfo.Gate
@@ -408,18 +410,20 @@ private fun FunctionalRoadClass.mapToRoadClass(): String {
     }
 }
 
-private fun mapNames(names: List<com.mapbox.navigator.RoadName>): List<RoadName> {
-    val namesNames = mutableListOf<RoadName>()
+private fun mapNames(names: List<com.mapbox.navigator.RoadName>): List<RoadComponent> {
+    val roadComponents = mutableListOf<RoadComponent>()
     names.forEach {
-        namesNames.add(it.mapToRoadName())
+        roadComponents.add(it.mapToRoadComponent())
     }
-    return namesNames.toList()
+    return roadComponents.toList()
 }
 
-private fun com.mapbox.navigator.RoadName.mapToRoadName(): RoadName {
-    return RoadName(
-        name,
-        shielded
+private fun com.mapbox.navigator.RoadName.mapToRoadComponent(): RoadComponent {
+    return RoadComponent(
+        text,
+        language,
+        shield.toMapboxShield(),
+        imageBaseUrl,
     )
 }