NAVAND-713: meet code review

Author: dzinad

CHANGELOG.md

@@ -4,7 +4,7 @@ Mapbox welcomes participation and contributions from everyone.
 
 ## Unreleased
 #### Features
-- Supported EV route refresh. [#6511](https://github.com/mapbox/mapbox-navigation-android/pull/6511)
+- Added support for EV route refresh. [#6511](https://github.com/mapbox/mapbox-navigation-android/pull/6511)
 #### Bug fixes and improvements
 - Improved experience in tunnels and reduced the likelihood of losing road edge matching candidates. [#6510](https://github.com/mapbox/mapbox-navigation-android/pull/6510)
 - Fixed an issue with `NavigationView` that caused road label position to not update in some cases. [#6508](https://github.com/mapbox/mapbox-navigation-android/pull/6508)

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

@@ -10,13 +10,13 @@ import com.mapbox.api.directions.v5.models.DirectionsRoute
  * right in front of the user (see [DirectionsRoute.geometry]), null if unavailable.
  * @param legGeometryIndex leg-wise index representing the geometry point
  * right in front of the user (see [DirectionsRoute.geometry]), null if unavailable.
- * @param evData map containing EV related dynamic data.
+ * @param experimentalProperties map containing dynamic data.
  */
 class RouteRefreshRequestData(
     val legIndex: Int,
     val routeGeometryIndex: Int,
     val legGeometryIndex: Int?,
-    val evData: Map<String, String>,
+    val experimentalProperties: Map<String, String>,
 ) {
 
     /**
@@ -31,7 +31,7 @@ class RouteRefreshRequestData(
         if (legIndex != other.legIndex) return false
         if (routeGeometryIndex != other.routeGeometryIndex) return false
         if (legGeometryIndex != other.legGeometryIndex) return false
-        if (evData != other.evData) return false
+        if (experimentalProperties != other.experimentalProperties) return false
 
         return true
     }
@@ -43,7 +43,7 @@ class RouteRefreshRequestData(
         var result = legIndex
         result = 31 * result + routeGeometryIndex
         result = 31 * result + (legGeometryIndex ?: 0)
-        result = 31 * result + evData.hashCode()
+        result = 31 * result + experimentalProperties.hashCode()
         return result
     }
 
@@ -55,7 +55,7 @@ class RouteRefreshRequestData(
             "legIndex=$legIndex, " +
             "routeGeometryIndex=$routeGeometryIndex, " +
             "legGeometryIndex=$legGeometryIndex" +
-            "evData=$evData" +
+            "experimentalProperties=$experimentalProperties" +
             ")"
     }
 }

libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/route/AnnotationsRefresher.kt

@@ -108,7 +108,7 @@ internal object AnnotationsRefresher {
     }
 
     private fun List<JsonElement>.toJsonArray(): JsonArray {
-        return JsonArray().also { array ->
+        return JsonArray(this.size).also { array ->
             forEach { array.add(it) }
         }
     }

libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/route/NavigationRouteEx.kt

@@ -4,7 +4,6 @@ package com.mapbox.navigation.base.internal.route
 
 import androidx.annotation.VisibleForTesting
 import androidx.annotation.WorkerThread
-import com.google.gson.JsonElement
 import com.mapbox.api.directions.v5.models.Closure
 import com.mapbox.api.directions.v5.models.DirectionsResponse
 import com.mapbox.api.directions.v5.models.DirectionsRoute
@@ -15,7 +14,6 @@ import com.mapbox.api.directions.v5.models.LegStep
 import com.mapbox.api.directions.v5.models.RouteLeg
 import com.mapbox.api.directions.v5.models.RouteOptions
 import com.mapbox.navigation.base.internal.SDKRouteParser
-import com.mapbox.navigation.base.internal.utils.Constants
 import com.mapbox.navigation.base.route.NavigationRoute
 import com.mapbox.navigation.base.route.toNavigationRoute
 import com.mapbox.navigation.base.utils.DecodeUtils.stepGeometryToPoints
@@ -46,7 +44,7 @@ fun NavigationRoute.refreshRoute(
     legAnnotations: List<LegAnnotation?>?,
     incidents: List<List<Incident>?>?,
     closures: List<List<Closure>?>?,
-    unrecognizedProperties: Map<String, JsonElement>?,
+    waypoints: List<DirectionsWaypoint?>?,
 ): NavigationRoute {
     val updateLegs = directionsRoute.legs()?.mapIndexed { index, routeLeg ->
         if (index < initialLegIndex) {
@@ -95,19 +93,19 @@ fun NavigationRoute.refreshRoute(
                 .build()
         }
     }
-    return update(
-        {
-            toBuilder()
-                .legs(updateLegs)
-                .updateRouteDurationBasedOnLegsDuration(updateLegs)
-                .build()
-        }
-    ) {
+    val directionsRouteBlock: DirectionsRoute.() -> DirectionsRoute = {
+        toBuilder()
+            .legs(updateLegs)
+            .updateRouteDurationBasedOnLegsDuration(updateLegs)
+            .build()
+    }
+    val directionsResponseBlock: DirectionsResponse.Builder.() -> DirectionsResponse.Builder = {
         updateWaypoints(
             directionsResponse.waypoints(),
-            unrecognizedProperties
+            waypoints
         )
     }
+    return update(directionsRouteBlock, directionsResponseBlock)
 }
 
 private fun adjustedIndex(offsetIndex: Int, originalIndex: Int?): Int {
@@ -198,14 +196,11 @@ private fun List<LegStep>.updateSteps(
 
 private fun DirectionsResponse.Builder.updateWaypoints(
     oldWaypoints: List<DirectionsWaypoint>?,
-    newUnrecognizedProperties: Map<String, JsonElement>?,
+    updatedWaypoints: List<DirectionsWaypoint?>?,
 ): DirectionsResponse.Builder {
     if (oldWaypoints == null) {
         return this
     }
-    val updatedWaypoints = WaypointsParser.parse(
-        newUnrecognizedProperties?.get(Constants.KEY_WAYPOINTS)
-    )
     val newWaypoints = mutableListOf<DirectionsWaypoint>()
     if (updatedWaypoints != null) {
         oldWaypoints.forEachIndexed { index, oldWaypoint ->

libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/utils/Constants.java

@@ -1,6 +1,8 @@
 package com.mapbox.navigation.base.internal.utils;
 
-public class Constants {
+public final class Constants {
 
-    public static final String KEY_WAYPOINTS = "waypoints";
+    public static final class RouteResponse {
+        public static final String KEY_WAYPOINTS = "waypoints";
+    }
 }