wip fixes and adjustments.

Author: Seth Bourget

examples/src/main/java/com/mapbox/navigation/examples/core/MapboxNavigationActivity.kt

@@ -236,7 +236,7 @@ class MapboxNavigationActivity : AppCompatActivity() {
             // update bottom trip progress summary
             binding.tripProgressView.render(tripProgressApi.getTripProgress(routeProgress))
 
-            //addPointToPixelMapPoints(routeLineAPI.getFillerPointsInTree())
+            addPointToPixelMapPoints(routeLineAPI.getFillerPointsInTree())
         }
 
     private val routesObserver = RoutesObserver { result ->

examples/src/main/java/com/mapbox/navigation/examples/core/MapboxRouteLineAndArrowActivity.kt

@@ -16,13 +16,19 @@ import com.mapbox.android.core.location.LocationEngineResult
 import com.mapbox.android.gestures.Utils
 import com.mapbox.api.directions.v5.models.DirectionsRoute
 import com.mapbox.api.directions.v5.models.RouteOptions
+import com.mapbox.geojson.Feature
+import com.mapbox.geojson.FeatureCollection
 import com.mapbox.geojson.Point
 import com.mapbox.maps.CameraOptions
 import com.mapbox.maps.EdgeInsets
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.Style
 import com.mapbox.maps.extension.observable.eventdata.MapLoadingErrorEventData
+import com.mapbox.maps.extension.style.layers.generated.CircleLayer
 import com.mapbox.maps.extension.style.layers.properties.generated.Visibility
+import com.mapbox.maps.extension.style.sources.generated.GeoJsonSource
+import com.mapbox.maps.extension.style.sources.generated.geoJsonSource
+import com.mapbox.maps.extension.style.sources.getSource
 import com.mapbox.maps.plugin.LocationPuck2D
 import com.mapbox.maps.plugin.animation.MapAnimationOptions
 import com.mapbox.maps.plugin.animation.camera
@@ -38,6 +44,7 @@ import com.mapbox.navigation.base.options.NavigationOptions
 import com.mapbox.navigation.base.route.RouterCallback
 import com.mapbox.navigation.base.route.RouterFailure
 import com.mapbox.navigation.base.route.RouterOrigin
+import com.mapbox.navigation.base.utils.DecodeUtils.completeGeometryToPoints
 import com.mapbox.navigation.core.MapboxNavigationProvider
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.replay.MapboxReplayer
@@ -260,6 +267,8 @@ class MapboxRouteLineAndArrowActivity : AppCompatActivity(), OnMapLongClickListe
             // Render the result to update the map.
             routeArrowView.renderManeuverUpdate(this, arrowUpdate)
         }
+
+        //addPointToPixelMapPoints(routeLineApi.getFillerPointsInTree())
     }
 
     // RouteLine: Below is a demonstration of selecting different routes. On a map click, a call
@@ -350,6 +359,7 @@ class MapboxRouteLineAndArrowActivity : AppCompatActivity(), OnMapLongClickListe
                     locationEngineCallback
                 )
                 viewBinding.mapView.gestures.addOnMapLongClickListener(this)
+                initPointLayer(style)
             },
             object : OnMapLoadErrorListener {
                 override fun onMapLoadError(eventData: MapLoadingErrorEventData) {
@@ -506,4 +516,30 @@ class MapboxRouteLineAndArrowActivity : AppCompatActivity(), OnMapLongClickListe
         override fun onFailure(exception: Exception) {
         }
     }
+
+    // todo remove this
+    private val LINE_END_LAYER_ID = "DRAW_UTIL_LINE_END_LAYER_ID"
+    private val LINE_END_SOURCE_ID = "DRAW_UTIL_LINE_END_SOURCE_ID"
+    private fun initPointLayer(style: Style) {
+        if (!style.styleSourceExists(LINE_END_SOURCE_ID)) {
+            geoJsonSource(LINE_END_SOURCE_ID) {}.bindTo(style)
+        }
+
+        if (!style.styleLayerExists(LINE_END_LAYER_ID)) {
+            CircleLayer(LINE_END_LAYER_ID, LINE_END_SOURCE_ID)
+                .circleRadius(2.0)
+                .circleOpacity(1.0)
+                .circleColor(Color.BLACK)
+                .bindTo(style)
+        }
+    }
+
+    // todo remove this
+    private fun addPointToPixelMapPoints(points: List<Point>) {
+        val features = points.map { Feature.fromGeometry(it) }
+
+        (mapboxMap.getStyle()!!.getSource(LINE_END_SOURCE_ID) as GeoJsonSource).apply {
+            this.featureCollection(FeatureCollection.fromFeatures(features))
+        }
+    }
 }

libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/api/VanishingRouteLine.kt

@@ -48,8 +48,11 @@ internal class VanishingRouteLine {
     private var indexOfLastStepPointsLoadedInTree = 0
     private val distanceToLastStepPointInMeters = 20.0
     private var stepPointRange: Range<Int>? = null
-    private val stepPointRangeSize = 5
-    private val maxAllowedFillerPointListsInTree = 3
+    private val stepPointRangeSize = 2
+    //private val maxAllowedFillerPointListsInTree = 3
+    private val maxTrailingFillerPoints = 10
+    private val treeAdjustmentFrequency = 10
+    private var treeAdjustmentCounter = 0
 
     fun setScope(scope: CoroutineScope) {
         this.scope = scope
@@ -183,6 +186,7 @@ internal class VanishingRouteLine {
                 fillerPointsInTree.clear()
                 indexOfLastStepPointsLoadedInTree = 0
                 vanishPointOffset = 0.0
+                treeAdjustmentCounter = 0
 
                 if (distances.flatStepDistances.isNotEmpty()) {
                     val endRange = if (distances.flatStepDistances.size > stepPointRangeSize) {
@@ -257,7 +261,7 @@ internal class VanishingRouteLine {
                             locationSearchTree.addAll(fillerPoints)
                             fillerPointsInTree.addAll(fillerPoints)
                         }
-                        indexOfLastStepPointsLoadedInTree = endOfRange
+                        indexOfLastStepPointsLoadedInTree = range.lower
                     }
                 }
             }
@@ -282,52 +286,60 @@ internal class VanishingRouteLine {
      * range are added to the search tree and the points passed are removed.
      */
     private fun adjustTree(point: Point, nearestNeighbor: RouteLineDistancesIndex?) {
-        scope?.launch(Dispatchers.Main.immediate) {
-            if (fillerPointsInTree.isNotEmpty()) {
-                val nearEndStepPoint = fillerPointsInTree.last()
-                val distanceToNearEndStepPoint = TurfMeasurement.distance(
-                    point,
-                    nearEndStepPoint.point,
-                    TurfConstants.UNIT_METERS
-                )
-                if (distanceToNearEndStepPoint <= distanceToLastStepPointInMeters) {
-                    stepPointRange = ifNonNull(stepPointRange, granularDistances)
-                    { currentStepPointRange, distances ->
-                        val endOfRange =
-                            if (
-                                currentStepPointRange.upper + stepPointRangeSize
-                                < distances.flatStepDistances.lastIndex
-                            ) {
-                                currentStepPointRange.upper + stepPointRangeSize
-                            } else {
-                                distances.flatStepDistances.lastIndex
-                            }
-                        Range(currentStepPointRange.upper - 1, endOfRange).also {
-                            val fillerPoints = getFillerPointsForRange(
-                                it,
-                                distances.flatStepDistances
-                            )
-                            if (fillerPoints.isNotEmpty()) {
-                                locationSearchTree.addAll(fillerPoints)
-                                fillerPointsInTree.addAll(fillerPoints)
-                            }
-                            indexOfLastStepPointsLoadedInTree = endOfRange
+        treeAdjustmentCounter++
+        if (treeAdjustmentCounter >= treeAdjustmentFrequency) {
+            treeAdjustmentCounter = 0
+            scope?.launch(Dispatchers.Main.immediate) {
+                loadNextRange(point)
+                trimTree(nearestNeighbor)
+            }
+        }
+    }
+
+    private fun loadNextRange(point: Point) {
+        if (fillerPointsInTree.isNotEmpty()) {
+            val nearEndStepPoint = fillerPointsInTree.last()
+            val distanceToNearEndStepPoint = TurfMeasurement.distance(
+                point,
+                nearEndStepPoint.point,
+                TurfConstants.UNIT_METERS
+            )
+            if (distanceToNearEndStepPoint <= distanceToLastStepPointInMeters) {
+                stepPointRange = ifNonNull(stepPointRange, granularDistances)
+                { currentStepPointRange, distances ->
+                    val endOfRange =
+                        if (
+                            currentStepPointRange.upper + stepPointRangeSize
+                            < distances.flatStepDistances.lastIndex
+                        ) {
+                            currentStepPointRange.upper + stepPointRangeSize
+                        } else {
+                            distances.flatStepDistances.lastIndex
                         }
+                    Range(currentStepPointRange.upper - 1, endOfRange).also {
+                        val fillerPoints = getFillerPointsForRange(
+                            it,
+                            distances.flatStepDistances
+                        )
+                        if (fillerPoints.isNotEmpty()) {
+                            locationSearchTree.addAll(fillerPoints)
+                            fillerPointsInTree.addAll(fillerPoints)
+                        }
+                        indexOfLastStepPointsLoadedInTree = endOfRange
                     }
-//                    if (fillerPointsInTree.size == maxAllowedFillerPointListsInTree) {
-//                        val pointsToDrop = fillerPointsInTree.removeFirst()
-//                        locationSearchTree.removeAll(pointsToDrop)
-//                    }
                 }
+            }
+        }
+    }
 
-                ifNonNull(nearestNeighbor) {
-                    val index = fillerPointsInTree.indexOf(it)
-                    if (index > 10) {
-                        fillerPointsInTree.take(index).apply {
-                            fillerPointsInTree.removeAll(this)
-                            locationSearchTree.removeAll(this)
-                        }
-                    }
+    private fun trimTree(nearestNeighbor: RouteLineDistancesIndex?) {
+        //Log.e("foobar", "trimming tree")
+        ifNonNull(nearestNeighbor) {
+            val index = fillerPointsInTree.indexOf(it)
+            if (index > maxTrailingFillerPoints) {
+                fillerPointsInTree.take(index).apply {
+                    fillerPointsInTree.removeAll(this)
+                    locationSearchTree.removeAll(this)
                 }
             }
         }