Skip to content

Commit 5add6ac

Browse files
evil159github-actions[bot]
authored andcommitted
Expose line cutout width (#6717)
This PR exposes `LineLayer.lineCutoutFadeWidth`. Addresses: https://mapbox.atlassian.net/browse/MAPSAND-2309 and https://mapbox.atlassian.net/browse/MAPSIOS-1960 cc @mapbox/maps-android cc @mapbox/maps-ios cc @mapbox/sdk-ci GitOrigin-RevId: f5b179023b9c3baed0765b9ce38688aa396fa28e
1 parent 6a4403e commit 5add6ac

File tree

15 files changed

+529
-2
lines changed

15 files changed

+529
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Mapbox welcomes participation and contributions from everyone.
1818
- **Road appearance**: Adjust road brightness, show/hide pedestrian roads and transit networks
1919
- **Administrative boundaries**: Toggle boundary visibility and customize colors
2020
- **3D objects**: Control visibility of buildings, landmarks, and trees with `show3dObjects`
21+
* Expose `LineLayer.lineCutoutFadeWidth` to control route line cutout fade width.
2122

2223
## Bug fixes 🐞
2324
* MapboxTracing was deprecated and moved to package com.mapbox.common.

app/src/androidTest/java/com/mapbox/maps/testapp/annotation/generated/PolylineAnnotationManagerAndroidTest.kt

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/mapbox/maps/testapp/examples/markersandcallouts/viewannotation/DynamicViewAnnotationActivity.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ class DynamicViewAnnotationActivity : AppCompatActivity() {
192192
lineColor(Color.parseColor("#FF999999"))
193193
// make map elements around (30m) route line visible through obstructing 3D buildings and other aboveground features
194194
lineCutoutWidth(30.0)
195-
lineCutoutOpacity(0.2)
195+
lineCutoutOpacity(0.0)
196+
lineCutoutFadeWidth(0.5)
196197
lineWidth(12.0)
197198
lineBorderWidth(2.0)
198199
lineBorderColor(Color.parseColor("#FF333333"))
@@ -202,7 +203,8 @@ class DynamicViewAnnotationActivity : AppCompatActivity() {
202203
lineColor(Color.parseColor("#FF57A9FB"))
203204
// make map elements around (30m) route line visible through obstructing 3D buildings and other aboveground features
204205
lineCutoutWidth(30.0)
205-
lineCutoutOpacity(0.2)
206+
lineCutoutOpacity(0.0)
207+
lineCutoutFadeWidth(0.5)
206208
lineWidth(12.0)
207209
lineCap(LineCap.ROUND)
208210
lineBorderWidth(2.0)

extension-compose/api/Release/metalava.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,7 @@ package com.mapbox.maps.extension.compose.annotation.generated {
959959
method public androidx.compose.ui.graphics.Color? getLineColor();
960960
method public String? getLineColorUseTheme();
961961
method public Double? getLineCrossSlope();
962+
method public Double? getLineCutoutFadeWidth();
962963
method public Double? getLineCutoutOpacity();
963964
method public Double? getLineCutoutWidth();
964965
method public java.util.List<java.lang.Double>? getLineDasharray();
@@ -996,6 +997,7 @@ package com.mapbox.maps.extension.compose.annotation.generated {
996997
method public void setLineColor(androidx.compose.ui.graphics.Color?);
997998
method public void setLineColorUseTheme(String?);
998999
method public void setLineCrossSlope(Double?);
1000+
method public void setLineCutoutFadeWidth(Double?);
9991001
method public void setLineCutoutOpacity(Double?);
10001002
method public void setLineCutoutWidth(Double?);
10011003
method public void setLineDasharray(java.util.List<java.lang.Double>?);
@@ -1033,6 +1035,7 @@ package com.mapbox.maps.extension.compose.annotation.generated {
10331035
property public final androidx.compose.ui.graphics.Color? lineColor;
10341036
property public final String? lineColorUseTheme;
10351037
property public final Double? lineCrossSlope;
1038+
property public final Double? lineCutoutFadeWidth;
10361039
property public final Double? lineCutoutOpacity;
10371040
property public final Double? lineCutoutWidth;
10381041
property public final java.util.List<java.lang.Double>? lineDasharray;
@@ -2850,6 +2853,8 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
28502853
method public com.mapbox.maps.extension.compose.style.Transition getLineColorTransition();
28512854
method public com.mapbox.maps.extension.compose.style.StringValue getLineColorUseTheme();
28522855
method public com.mapbox.maps.extension.compose.style.DoubleValue getLineCrossSlope();
2856+
method public com.mapbox.maps.extension.compose.style.DoubleValue getLineCutoutFadeWidth();
2857+
method public com.mapbox.maps.extension.compose.style.Transition getLineCutoutFadeWidthTransition();
28532858
method public com.mapbox.maps.extension.compose.style.DoubleValue getLineCutoutOpacity();
28542859
method public com.mapbox.maps.extension.compose.style.Transition getLineCutoutOpacityTransition();
28552860
method public com.mapbox.maps.extension.compose.style.DoubleValue getLineCutoutWidth();
@@ -2906,6 +2911,8 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
29062911
method public void setLineColorTransition(com.mapbox.maps.extension.compose.style.Transition);
29072912
method public void setLineColorUseTheme(com.mapbox.maps.extension.compose.style.StringValue);
29082913
method public void setLineCrossSlope(com.mapbox.maps.extension.compose.style.DoubleValue);
2914+
method public void setLineCutoutFadeWidth(com.mapbox.maps.extension.compose.style.DoubleValue);
2915+
method public void setLineCutoutFadeWidthTransition(com.mapbox.maps.extension.compose.style.Transition);
29092916
method public void setLineCutoutOpacity(com.mapbox.maps.extension.compose.style.DoubleValue);
29102917
method public void setLineCutoutOpacityTransition(com.mapbox.maps.extension.compose.style.Transition);
29112918
method public void setLineCutoutWidth(com.mapbox.maps.extension.compose.style.DoubleValue);
@@ -2962,6 +2969,8 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
29622969
property public final com.mapbox.maps.extension.compose.style.Transition lineColorTransition;
29632970
property public final com.mapbox.maps.extension.compose.style.StringValue lineColorUseTheme;
29642971
property public final com.mapbox.maps.extension.compose.style.DoubleValue lineCrossSlope;
2972+
property public final com.mapbox.maps.extension.compose.style.DoubleValue lineCutoutFadeWidth;
2973+
property public final com.mapbox.maps.extension.compose.style.Transition lineCutoutFadeWidthTransition;
29652974
property public final com.mapbox.maps.extension.compose.style.DoubleValue lineCutoutOpacity;
29662975
property public final com.mapbox.maps.extension.compose.style.Transition lineCutoutOpacityTransition;
29672976
property public final com.mapbox.maps.extension.compose.style.DoubleValue lineCutoutWidth;

extension-compose/api/extension-compose.api

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,7 @@ public final class com/mapbox/maps/extension/compose/annotation/generated/Polyli
768768
public final fun getLineColor-QN2ZGVo ()Landroidx/compose/ui/graphics/Color;
769769
public final fun getLineColorUseTheme ()Ljava/lang/String;
770770
public final fun getLineCrossSlope ()Ljava/lang/Double;
771+
public final fun getLineCutoutFadeWidth ()Ljava/lang/Double;
771772
public final fun getLineCutoutOpacity ()Ljava/lang/Double;
772773
public final fun getLineCutoutWidth ()Ljava/lang/Double;
773774
public final fun getLineDasharray ()Ljava/util/List;
@@ -805,6 +806,7 @@ public final class com/mapbox/maps/extension/compose/annotation/generated/Polyli
805806
public final fun setLineColor-Y2TPw74 (Landroidx/compose/ui/graphics/Color;)V
806807
public final fun setLineColorUseTheme (Ljava/lang/String;)V
807808
public final fun setLineCrossSlope (Ljava/lang/Double;)V
809+
public final fun setLineCutoutFadeWidth (Ljava/lang/Double;)V
808810
public final fun setLineCutoutOpacity (Ljava/lang/Double;)V
809811
public final fun setLineCutoutWidth (Ljava/lang/Double;)V
810812
public final fun setLineDasharray (Ljava/util/List;)V
@@ -2410,6 +2412,8 @@ public final class com/mapbox/maps/extension/compose/style/layers/generated/Line
24102412
public final fun getLineColorTransition ()Lcom/mapbox/maps/extension/compose/style/Transition;
24112413
public final fun getLineColorUseTheme ()Lcom/mapbox/maps/extension/compose/style/StringValue;
24122414
public final fun getLineCrossSlope ()Lcom/mapbox/maps/extension/compose/style/DoubleValue;
2415+
public final fun getLineCutoutFadeWidth ()Lcom/mapbox/maps/extension/compose/style/DoubleValue;
2416+
public final fun getLineCutoutFadeWidthTransition ()Lcom/mapbox/maps/extension/compose/style/Transition;
24132417
public final fun getLineCutoutOpacity ()Lcom/mapbox/maps/extension/compose/style/DoubleValue;
24142418
public final fun getLineCutoutOpacityTransition ()Lcom/mapbox/maps/extension/compose/style/Transition;
24152419
public final fun getLineCutoutWidth ()Lcom/mapbox/maps/extension/compose/style/DoubleValue;
@@ -2466,6 +2470,8 @@ public final class com/mapbox/maps/extension/compose/style/layers/generated/Line
24662470
public final fun setLineColorTransition (Lcom/mapbox/maps/extension/compose/style/Transition;)V
24672471
public final fun setLineColorUseTheme (Lcom/mapbox/maps/extension/compose/style/StringValue;)V
24682472
public final fun setLineCrossSlope (Lcom/mapbox/maps/extension/compose/style/DoubleValue;)V
2473+
public final fun setLineCutoutFadeWidth (Lcom/mapbox/maps/extension/compose/style/DoubleValue;)V
2474+
public final fun setLineCutoutFadeWidthTransition (Lcom/mapbox/maps/extension/compose/style/Transition;)V
24692475
public final fun setLineCutoutOpacity (Lcom/mapbox/maps/extension/compose/style/DoubleValue;)V
24702476
public final fun setLineCutoutOpacityTransition (Lcom/mapbox/maps/extension/compose/style/Transition;)V
24712477
public final fun setLineCutoutWidth (Lcom/mapbox/maps/extension/compose/style/DoubleValue;)V

extension-compose/src/main/java/com/mapbox/maps/extension/compose/annotation/generated/PolylineAnnotationGroupState.kt

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extension-compose/src/main/java/com/mapbox/maps/extension/compose/style/layers/generated/LineLayerState.kt

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extension-style-app/src/androidTest/java/com/mapbox/maps/testapp/style/layers/generated/LineLayerTest.kt

Lines changed: 61 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)