@@ -39,35 +39,10 @@ class CarRouteLine(
3939 .build()
4040 }
4141
42- private val options: MapboxRouteLineOptions by lazy {
43- MapboxRouteLineOptions .Builder (mainCarContext.carContext)
44- .withRouteLineResources(routeLineResources)
45- .withRouteLineBelowLayerId(" road-label"
46- .withVanishingRouteLineEnabled(true )
47- .build()
48- }
49-
50- private val routeLineView by lazy {
51- MapboxRouteLineView (options)
52- }
53-
54- private val routeLineApi: MapboxRouteLineApi by lazy {
55- MapboxRouteLineApi (options)
56- }
57-
58- private val routeArrowApi: MapboxRouteArrowApi by lazy {
59- MapboxRouteArrowApi ()
60- }
61-
62- private val routeArrowOptions by lazy {
63- RouteArrowOptions .Builder (mainCarContext.carContext)
64- .withAboveLayerId(TOP_LEVEL_ROUTE_LINE_LAYER_ID )
65- .build()
66- }
67-
68- private val routeArrowView: MapboxRouteArrowView by lazy {
69- MapboxRouteArrowView (routeArrowOptions)
70- }
42+ private lateinit var routeLineView: MapboxRouteLineView
43+ private lateinit var routeLineApi: MapboxRouteLineApi
44+ private lateinit var routeArrowApi: MapboxRouteArrowApi
45+ private lateinit var routeArrowView: MapboxRouteArrowView
7146
7247 private val onPositionChangedListener = OnIndicatorPositionChangedListener { point ->
7348 val result = routeLineApi.updateTraveledRouteLine(point)
@@ -107,12 +82,23 @@ class CarRouteLine(
10782 override fun loaded (mapboxCarMapSurface : MapboxCarMapSurface ) {
10883 logAndroidAuto(" CarRouteLine carMapSurface loaded $mapboxCarMapSurface "
10984 val locationPlugin = mapboxCarMapSurface.mapSurface.location
110- routeLineView.initializeLayers(mapboxCarMapSurface.style)
85+
86+ val routeLineOptions = getMapboxRouteLineOptions(mapboxCarMapSurface)
87+ routeLineView = MapboxRouteLineView (routeLineOptions)
88+ routeLineApi = MapboxRouteLineApi (routeLineOptions).also {
89+ routeLineView.initializeLayers(mapboxCarMapSurface.style)
90+ }
91+ routeArrowApi = MapboxRouteArrowApi ()
92+ routeArrowView = MapboxRouteArrowView (
93+ RouteArrowOptions .Builder (mainCarContext.carContext)
94+ .withAboveLayerId(TOP_LEVEL_ROUTE_LINE_LAYER_ID )
95+ .build()
96+ )
97+
11198 locationPlugin.addOnIndicatorPositionChangedListener(onPositionChangedListener)
11299 mainCarContext.mapboxNavigation.apply {
113100 registerRouteProgressObserver(routeProgressObserver)
114101 registerRoutesObserver(routesObserver)
115- historyRecorder.startRecording()
116102 }
117103 }
118104
@@ -124,12 +110,21 @@ class CarRouteLine(
124110 unregisterRouteProgressObserver(routeProgressObserver)
125111 unregisterRoutesObserver(routesObserver)
126112 }
113+ }
127114
128- mainCarContext.mapboxNavigation.historyRecorder.stopRecording {
129- logAndroidAuto(" CarRouteLine saved history $it "
130- }
115+ private fun getMapboxRouteLineOptions (
116+ mapboxCarMapSurface : MapboxCarMapSurface
117+ ): MapboxRouteLineOptions {
118+ return MapboxRouteLineOptions .Builder (mainCarContext.carContext)
119+ .withRouteLineResources(routeLineResources)
120+ .withRouteLineBelowLayerId(findRoadLabelsLayerId(mapboxCarMapSurface))
121+ .withVanishingRouteLineEnabled(true )
122+ .build()
123+ }
131124
132- routeLineApi.cancel()
133- routeLineView.cancel()
125+ private fun findRoadLabelsLayerId (mapboxCarMapSurface : MapboxCarMapSurface ): String {
126+ return mapboxCarMapSurface.style.styleLayers.firstOrNull { layer ->
127+ layer.id.contains(" road-label"
128+ }?.id ? : " road-label-navigation"
134129 }
135130}
0 commit comments