NAVAND-940: fix buildings highlighting

Author: dzinad

CHANGELOG.md

@@ -13,6 +13,7 @@ Mapbox welcomes participation and contributions from everyone.
 - Fixed the `NavigationView` issue where route arrows are being rendered above navigation puck after device rotation. [#6747](https://github.com/mapbox/mapbox-navigation-android/pull/6747)
 - Fixed an issue where a refresh of the routes or a change in alternatives that occurred while user was off-route would call `RerouteController#interrupt` and interrupt the potentially ongoing reroute process without recovery. [#6719](https://github.com/mapbox/mapbox-navigation-android/pull/6719)
 - Improved OpenLR matching rate. Updates take lowest FRC to next point into account during path generation. [#6750](https://github.com/mapbox/mapbox-navigation-android/pull/6750)
+- Fixed an issue where `MapboxBuildingsApi` would fail to highlight buildings. [#6749](https://github.com/mapbox/mapbox-navigation-android/pull/6749)
 
 ## Mapbox Navigation SDK 2.9.5 - 13 December, 2022
 ### Changelog

libnavigation-base/api/current.txt

@@ -854,9 +854,15 @@ package com.mapbox.navigation.base.speed.model {
     enum_constant public static final com.mapbox.navigation.base.speed.model.SpeedLimitSign VIENNA;
   }
 
-  public enum SpeedLimitUnit {
-    enum_constant public static final com.mapbox.navigation.base.speed.model.SpeedLimitUnit KILOMETRES_PER_HOUR;
-    enum_constant public static final com.mapbox.navigation.base.speed.model.SpeedLimitUnit MILES_PER_HOUR;
+  @Deprecated public enum SpeedLimitUnit {
+    enum_constant @Deprecated public static final com.mapbox.navigation.base.speed.model.SpeedLimitUnit KILOMETRES_PER_HOUR;
+    enum_constant @Deprecated public static final com.mapbox.navigation.base.speed.model.SpeedLimitUnit MILES_PER_HOUR;
+  }
+
+  public enum SpeedUnit {
+    enum_constant public static final com.mapbox.navigation.base.speed.model.SpeedUnit KILOMETERS_PER_HOUR;
+    enum_constant public static final com.mapbox.navigation.base.speed.model.SpeedUnit METERS_PER_SECOND;
+    enum_constant public static final com.mapbox.navigation.base.speed.model.SpeedUnit MILES_PER_HOUR;
   }
 
 }

libnavigation-core/api/current.txt

@@ -596,6 +596,7 @@ package com.mapbox.navigation.core.replay.route {
     method public String getEncodedPath();
     method public boolean hasNext();
     method public com.mapbox.geojson.Point next();
+    method public void skip(int count);
     property public final com.mapbox.geojson.Point? current;
     property public final String encodedPath;
   }
@@ -607,6 +608,9 @@ package com.mapbox.navigation.core.replay.route {
     method @UiThread public com.mapbox.navigation.core.replay.route.ReplayProgressObserver updateOptions(com.mapbox.navigation.core.replay.route.ReplayRouteOptions options);
   }
 
+  public final class ReplayProgressObserverKt {
+  }
+
   public final class ReplayRouteMapper {
     ctor public ReplayRouteMapper(com.mapbox.navigation.core.replay.route.ReplayRouteOptions options = ReplayRouteOptions.<init>().build());
     ctor public ReplayRouteMapper();

libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/building/BuildingProcessor.kt

@@ -1,9 +1,12 @@
 package com.mapbox.navigation.ui.maps.building
 
 import com.mapbox.bindgen.ExpectedFactory
+import com.mapbox.geojson.Point
 import com.mapbox.maps.RenderedQueryOptions
 import com.mapbox.navigation.base.internal.extensions.isLegWaypoint
+import com.mapbox.navigation.base.internal.extensions.isRequestedWaypoint
 import com.mapbox.navigation.base.internal.utils.internalWaypoints
+import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.ui.maps.building.model.BuildingError
 import com.mapbox.navigation.ui.maps.building.model.BuildingValue
 import kotlin.coroutines.resume
@@ -48,18 +51,34 @@ internal object BuildingProcessor {
     fun queryBuildingOnWaypoint(
         action: BuildingAction.QueryBuildingOnWaypoint
     ): BuildingResult.GetDestination {
-        val waypoints = action.progress.navigationRoute.internalWaypoints()
         val waypointIndex = action.progress.currentLegProgress?.legIndex!! + 1
-        val waypoint = waypoints.filter { it.isLegWaypoint() }.getOrNull(waypointIndex)
-        return BuildingResult.GetDestination(waypoint?.target ?: waypoint?.location)
+        val buildingLocation = getBuildingLocation(waypointIndex, action.progress)
+        return BuildingResult.GetDestination(buildingLocation)
     }
 
     fun queryBuildingOnFinalDestination(
         action: BuildingAction.QueryBuildingOnFinalDestination
     ): BuildingResult.GetDestination {
-        val lastWaypoint = action.progress.navigationRoute
-            .internalWaypoints()
-            .lastOrNull()
-        return BuildingResult.GetDestination(lastWaypoint?.target ?: lastWaypoint?.location)
+        val waypointIndex = action.progress.navigationRoute.internalWaypoints()
+            .indexOfLast { it.isLegWaypoint() }
+        val buildingLocation = getBuildingLocation(waypointIndex, action.progress)
+        return BuildingResult.GetDestination(buildingLocation)
+    }
+
+    private fun getBuildingLocation(legWaypointIndex: Int, progress: RouteProgress): Point? {
+        val waypoints = progress.navigationRoute.internalWaypoints()
+        val legWaypoints = waypoints.filter { it.isLegWaypoint() }
+        val waypoint = legWaypoints.getOrNull(legWaypointIndex)
+        if (waypoint == null) return null
+        if (waypoint.target != null) {
+            return waypoint.target
+        }
+        if (!waypoint.isRequestedWaypoint()) {
+            return waypoint.location
+        }
+        val nonRequestedWaypointsCount = legWaypoints.take(legWaypointIndex + 1)
+            .count { !it.isRequestedWaypoint() }
+        return progress.navigationRoute.routeOptions.coordinatesList()
+            .getOrNull(legWaypointIndex - nonRequestedWaypointsCount)
     }
 }