Skip to content

Minor refactoring of route line view #5631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cafesilencio wants to merge 1 commit into from
Closed

Minor refactoring of route line view #5631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 93 additions & 63 deletions ...ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvide
import com.mapbox.navigation.ui.maps.route.line.model.RouteLineUpdateValue
import com.mapbox.navigation.ui.maps.route.line.model.RouteSetValue
import com.mapbox.navigation.utils.internal.InternalJobControlFactory
import kotlinx.coroutines.CoroutineScope
import com.mapbox.navigation.utils.internal.ifNonNull
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.cancelChildren
Expand Down Expand Up @@ -83,87 +83,137 @@ class MapboxRouteLineView(var options: MapboxRouteLineOptions) {
Log.e(TAG, error.errorMessage)
},
{ value ->
val baseExpressionDeferred = jobControl.scope.async {
value.primaryRouteLineData
.dynamicData
.baseExpressionProvider
.generateExpression()
}
val casingExpressionDeferred = jobControl.scope.async {
value.primaryRouteLineData
.dynamicData
.casingExpressionProvider
.generateExpression()
}
val trafficExpressionDeferred = jobControl.scope.async {
value.primaryRouteLineData
.dynamicData
.trafficExpressionProvider
?.generateExpression()
}
val restrictedSectionExpressionDeferred = jobControl.scope.async {
value.primaryRouteLineData
.dynamicData
.restrictedSectionExpressionProvider
?.generateExpression()
}
val alternativeRouteLinesData1Deferred = jobControl.scope.async {
value.alternativeRouteLinesData[0]
.dynamicData
.trafficExpressionProvider
?.generateExpression()
}
val alternativeRouteLinesData2Deferred = jobControl.scope.async {
value.alternativeRouteLinesData[1]
.dynamicData
.trafficExpressionProvider
?.generateExpression()
}

jobControl.scope.launch(Dispatchers.Main) {
mutex.withLock {
// The gradients are set to transparent first so that when the route line
// layer sources are updated they don't initially reflect the wrong traffic
// gradient. The gradients are set on the layers not the feature collections.
// The set gradient call is asynchronous in the Maps SDK but the update source
// is not. Setting the gradients to transparent means the traffic isn't
// visible with the layer sources are updated. The traffic is calculated and
// applied later.
updateLineGradient(
style,
RouteLayerConstants.PRIMARY_ROUTE_TRAFFIC_LAYER_ID,
Expression.color(Color.TRANSPARENT)
)

updateLineGradient(
style,
RouteLayerConstants.ALTERNATIVE_ROUTE1_TRAFFIC_LAYER_ID,
Expression.color(Color.TRANSPARENT)
)

updateLineGradient(
style,
RouteLayerConstants.ALTERNATIVE_ROUTE2_TRAFFIC_LAYER_ID,
Expression.color(Color.TRANSPARENT)
)

updateLineGradient(
style,
RouteLayerConstants.RESTRICTED_ROAD_LAYER_ID,
Expression.color(Color.TRANSPARENT)
)

value.primaryRouteLineData.also {
updateSource(
style,
RouteLayerConstants.PRIMARY_ROUTE_SOURCE_ID,
it.featureCollection
)
updateLineGradientAsync(
jobControl.scope,
style,
RouteLayerConstants.PRIMARY_ROUTE_LAYER_ID,
it.dynamicData.baseExpressionProvider
)
updateLineGradientAsync(
jobControl.scope,
style,
RouteLayerConstants.PRIMARY_ROUTE_CASING_LAYER_ID,
it.dynamicData.casingExpressionProvider
)
updateLineGradientAsync(
jobControl.scope,
updateSource(
style,
RouteLayerConstants.PRIMARY_ROUTE_SOURCE_ID,
value.primaryRouteLineData.featureCollection
)

updateSource(
style,
RouteLayerConstants.ALTERNATIVE_ROUTE1_SOURCE_ID,
value.alternativeRouteLinesData[0].featureCollection
)

updateSource(
style,
RouteLayerConstants.ALTERNATIVE_ROUTE2_SOURCE_ID,
value.alternativeRouteLinesData[1].featureCollection
)

updateLineGradient(
style,
RouteLayerConstants.PRIMARY_ROUTE_LAYER_ID,
baseExpressionDeferred.await()
)

updateLineGradient(
style,
RouteLayerConstants.PRIMARY_ROUTE_CASING_LAYER_ID,
casingExpressionDeferred.await()
)

ifNonNull(trafficExpressionDeferred.await()) {
updateLineGradient(
style,
RouteLayerConstants.PRIMARY_ROUTE_TRAFFIC_LAYER_ID,
it.dynamicData.trafficExpressionProvider
it
)
updateLineGradientAsync(
jobControl.scope,
}

ifNonNull(restrictedSectionExpressionDeferred.await()) {
updateLineGradient(
style,
RouteLayerConstants.RESTRICTED_ROAD_LAYER_ID,
it.dynamicData.restrictedSectionExpressionProvider
it
)
}

// SBNOTE: In the future let's find a better way to
// match the items in the list with the alt. route layer ID's.
value.alternativeRouteLinesData[0].also {
updateSource(
style,
RouteLayerConstants.ALTERNATIVE_ROUTE1_SOURCE_ID,
it.featureCollection
)
updateLineGradientAsync(
jobControl.scope,
ifNonNull(alternativeRouteLinesData1Deferred.await()) {
updateLineGradient(
style,
RouteLayerConstants.ALTERNATIVE_ROUTE1_TRAFFIC_LAYER_ID,
it.dynamicData.trafficExpressionProvider
it
)
}

value.alternativeRouteLinesData[1].also {
updateSource(
style,
RouteLayerConstants.ALTERNATIVE_ROUTE2_SOURCE_ID,
it.featureCollection
)
updateLineGradientAsync(
jobControl.scope,
ifNonNull(alternativeRouteLinesData2Deferred.await()) {
updateLineGradient(
style,
RouteLayerConstants.ALTERNATIVE_ROUTE2_TRAFFIC_LAYER_ID,
it.dynamicData.trafficExpressionProvider
it
)
}

Expand Down Expand Up @@ -516,26 +566,6 @@ class MapboxRouteLineView(var options: MapboxRouteLineOptions) {
}
}

private suspend fun updateLineGradientAsync(
coroutineScope: CoroutineScope,
style: Style,
layerId: String,
expressionProvider: RouteLineExpressionProvider?
) {
if (expressionProvider != null) {
val gradientExpression = coroutineScope.async {
expressionProvider.generateExpression()
}
gradientExpression.await().apply {
updateLineGradient(
style,
layerId,
this
)
}
}
}

private fun updateLineGradient(
style: Style,
layerId: String,
Expand Down