Skip to content

Commit 4d0e61a

Browse files
pengdevpengdev
authored
Update style spec to glnative/11.10.0-beta.2 (#2918)
1 parent 969f007 commit 4d0e61a

File tree

23 files changed

+737
-267
lines changed

23 files changed

+737
-267
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ Mapbox welcomes participation and contributions from everyone.
1010
* Introduce `SymbolLayer.iconSizeScaleRange`, `SymbolLayer.textSizeScaleRange`, `FillLayer.fillElevationReference`, `LineLayer.lineCrossSlope`, `LineLayer.lineWidthUnit`, `LineLayer.lineCrossSlope`, `LineLayer.lineElevationReference`, `DirectionalLight.shadowQuality`, `Rain.distortionStrength`, `Rain.distortionStrengthTransition`, `Rain.dropletSize`, `Rain.dropletSizeTransition`, `Rain.vignetteColor`, `Rain.vignetteColorTransition`, `Snow.flakeSize`, `Snow.flakeSizeTransition`, `Snow.vignetteColor`, `Snow.vignetteColorTransition`.
1111
* Change default value of experimental `Rain.opacity` to 0.19, default `Rain.vignette` to 0.3, `Snow.opacity` to 0.19, default `Snow.vignette` to 0.3.
1212
* [compose] Introduce experimental `SymbolLayerState.iconSizeScaleRange`, `SymbolLayerState.textSizeScaleRange`, `FillLayerState.fillElevationReference`, `LineLayerState.lineCrossSlope`, `LineLayerState.lineWidthUnit`, `LineLayerState.lineCrossSlope`, `LineLayerState.lineElevationReference`, `DirectionalLightState.shadowQuality`, `RainState.distortionStrength`, `RainState.distortionStrengthTransition`, `RainState.dropletSize`, `RainState.dropletSizeTransition`, `RainState.vignetteColor`, `RainState.vignetteColorTransition`, `SnowState.flakeSize`, `SnowState.flakeSizeTransition`, `SnowState.vignetteColor`, `SnowState.vignetteColorTransition`.
13+
* Remove `@MapboxExperimental` from `ClipLayer.clipLayerTypes` and `ClipLayer.clipLayerScope`.
14+
* Update the default value of experimental properties: default `Snow.density` is updated to `["interpolate",["linear"],["zoom"],11,0,13,0.85]`; default `Snow.opacity` is updated to `1.0`; default `Snow.vignette` is updated to `["interpolate",["linear"],["zoom"],11,0,13,0.3]`; default `Snow.centerThinning` is updated to `0.4`, default `Snow.direction` is updated to `listOf(0.0, 50.0)`; default `Snow.flakeSize` is updated to `0.71`; default `Rain.density` is updated to `["interpolate",["linear"],["zoom"],11,0,13,0.85]`; default `Rain.color` is updated to `["interpolate",["linear"],["measure-light","brightness"],0,"#03113d",0.3,"#a8adbc"]`; default `Rain.opacity` is updated to `["interpolate",["linear"],["measure-light","brightness"],0,0.88,1,0.7]`; default `Rain.vignette` is updated to `["interpolate",["linear"],["zoom"],11,0,13,0.3]`; default `Rain.vignetteColor` is updated to `["interpolate",["linear"],["measure-light","brightness"],0,"#001736",0.3,"#464646"]`; default `Rain.centerThinning` is updated to `0.57`; default `Rain.dropletSize` is updated to `listOf(2.6, 18.2)`; default `Rain.distortionStrength` is updated to `0.7`.
15+
* Introduce experimental `ModelLayer.modelElevationReference` property.
16+
* Introduce experimental `LocationPuck3D.modelElevationReference` property.
1317

1418
## Bug fixes 🐞
1519
* Mark `BackgroundLayer.backgroundPitchAlignment` as experimental.
1620
* Skip any map scroll (panning) if shove gesture is already in progress preventing camera flying away.
17-
* Introduce experimental `LocationPuck3D.modelElevationReference` property.
1821

1922
# 11.9.0 December 18, 2024
2023
## Breaking changes ⚠️

‎app/src/main/java/com/mapbox/maps/testapp/examples/ClipLayerActivity.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import androidx.core.content.ContextCompat
88
import com.mapbox.geojson.Point
99
import com.mapbox.geojson.Polygon
1010
import com.mapbox.maps.MapView
11-
import com.mapbox.maps.MapboxExperimental
1211
import com.mapbox.maps.MapboxMap
1312
import com.mapbox.maps.Style
1413
import com.mapbox.maps.dsl.cameraOptions
@@ -24,7 +23,6 @@ import com.mapbox.maps.testapp.R
2423
/**
2524
* Example showcasing the usage of [com.mapbox.maps.extension.style.layers.generated.ClipLayer].
2625
*/
27-
@OptIn(MapboxExperimental::class)
2826
class ClipLayerActivity : AppCompatActivity() {
2927

3028
private lateinit var mapboxMap: MapboxMap
@@ -88,7 +86,6 @@ class ClipLayerActivity : AppCompatActivity() {
8886
}
8987
}
9088

91-
@OptIn(MapboxExperimental::class)
9289
private fun updateClipLayerTypes(vararg clipLayerTypes: String) {
9390
mapboxMap.getStyle { style ->
9491
style.getLayerAs<ClipLayer>(CLIP_LAYER_ID)?.visibility(Visibility.VISIBLE)

‎compose-app/src/main/java/com/mapbox/maps/compose/testapp/examples/style/ClipLayerActivity.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import androidx.compose.ui.unit.dp
1919
import com.mapbox.geojson.Feature
2020
import com.mapbox.geojson.Point
2121
import com.mapbox.geojson.Polygon
22-
import com.mapbox.maps.MapboxExperimental
2322
import com.mapbox.maps.Style
2423
import com.mapbox.maps.compose.testapp.ExampleScaffold
2524
import com.mapbox.maps.compose.testapp.ui.theme.MapboxMapComposeTheme
@@ -40,7 +39,6 @@ import com.mapbox.maps.extension.compose.style.sources.generated.rememberGeoJson
4039
/**
4140
* Example showcasing the usage of [com.mapbox.maps.extension.style.layers.generated.ClipLayer].
4241
*/
43-
@OptIn(MapboxExperimental::class)
4442
public class ClipLayerActivity : ComponentActivity() {
4543

4644
override fun onCreate(savedInstanceState: Bundle?) {

‎extension-compose/api/Release/metalava.txt‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1883,7 +1883,7 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
18831883
property public final com.mapbox.maps.extension.compose.style.layers.generated.VisibilityValue visibility;
18841884
}
18851885

1886-
@androidx.compose.runtime.Immutable @com.mapbox.maps.MapboxExperimental public final class ClipLayerTypes {
1886+
@androidx.compose.runtime.Immutable public final class ClipLayerTypes {
18871887
method public com.mapbox.bindgen.Value component1();
18881888
method public com.mapbox.maps.extension.compose.style.layers.generated.ClipLayerTypes copy(com.mapbox.bindgen.Value value);
18891889
method public com.mapbox.bindgen.Value getValue();
@@ -1896,7 +1896,7 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
18961896
public static final class ClipLayerTypes.Companion {
18971897
}
18981898

1899-
@androidx.compose.runtime.Immutable @com.mapbox.maps.MapboxExperimental public final class ClipLayerTypesListValue {
1899+
@androidx.compose.runtime.Immutable public final class ClipLayerTypesListValue {
19001900
ctor public ClipLayerTypesListValue(com.mapbox.bindgen.Value value);
19011901
ctor public ClipLayerTypesListValue(java.util.List<com.mapbox.maps.extension.compose.style.layers.generated.ClipLayerTypes> value);
19021902
ctor public ClipLayerTypesListValue(com.mapbox.maps.extension.style.expressions.generated.Expression expression);
@@ -2832,6 +2832,22 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
28322832
property public final com.mapbox.maps.extension.compose.style.layers.generated.VisibilityValue visibility;
28332833
}
28342834

2835+
@androidx.compose.runtime.Immutable @com.mapbox.maps.MapboxExperimental public final class ModelElevationReferenceValue {
2836+
ctor public ModelElevationReferenceValue(com.mapbox.bindgen.Value value);
2837+
ctor public ModelElevationReferenceValue(com.mapbox.maps.extension.style.expressions.generated.Expression expression);
2838+
method public com.mapbox.bindgen.Value component1();
2839+
method public com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue copy(com.mapbox.bindgen.Value value);
2840+
method public com.mapbox.bindgen.Value getValue();
2841+
property public final com.mapbox.bindgen.Value value;
2842+
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue.Companion Companion;
2843+
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue DEFAULT;
2844+
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue GROUND;
2845+
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue SEA;
2846+
}
2847+
2848+
public static final class ModelElevationReferenceValue.Companion {
2849+
}
2850+
28352851
public final class ModelLayerKt {
28362852
method @androidx.compose.runtime.Composable @com.mapbox.maps.MapboxExperimental @com.mapbox.maps.extension.compose.MapboxMapComposable public static void ModelLayer(com.mapbox.maps.extension.compose.style.sources.SourceState sourceState, String layerId = remember({
28372853
return generateRandomLayerId("model")
@@ -2857,6 +2873,7 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
28572873
method public com.mapbox.maps.extension.compose.style.Transition getModelColorMixIntensityTransition();
28582874
method public com.mapbox.maps.extension.compose.style.Transition getModelColorTransition();
28592875
method public com.mapbox.maps.extension.compose.style.DoubleValue getModelCutoffFadeRange();
2876+
method public com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue getModelElevationReference();
28602877
method public com.mapbox.maps.extension.compose.style.DoubleValue getModelEmissiveStrength();
28612878
method public com.mapbox.maps.extension.compose.style.Transition getModelEmissiveStrengthTransition();
28622879
method public com.mapbox.maps.extension.compose.style.DoubleListValue getModelHeightBasedEmissiveStrengthMultiplier();
@@ -2889,6 +2906,7 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
28892906
method public void setModelColorMixIntensityTransition(com.mapbox.maps.extension.compose.style.Transition);
28902907
method public void setModelColorTransition(com.mapbox.maps.extension.compose.style.Transition);
28912908
method public void setModelCutoffFadeRange(com.mapbox.maps.extension.compose.style.DoubleValue);
2909+
method public void setModelElevationReference(com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue);
28922910
method public void setModelEmissiveStrength(com.mapbox.maps.extension.compose.style.DoubleValue);
28932911
method public void setModelEmissiveStrengthTransition(com.mapbox.maps.extension.compose.style.Transition);
28942912
method public void setModelHeightBasedEmissiveStrengthMultiplier(com.mapbox.maps.extension.compose.style.DoubleListValue);
@@ -2921,6 +2939,7 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
29212939
property public final com.mapbox.maps.extension.compose.style.Transition modelColorMixIntensityTransition;
29222940
property public final com.mapbox.maps.extension.compose.style.Transition modelColorTransition;
29232941
property public final com.mapbox.maps.extension.compose.style.DoubleValue modelCutoffFadeRange;
2942+
property public final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue modelElevationReference;
29242943
property public final com.mapbox.maps.extension.compose.style.DoubleValue modelEmissiveStrength;
29252944
property public final com.mapbox.maps.extension.compose.style.Transition modelEmissiveStrengthTransition;
29262945
property public final com.mapbox.maps.extension.compose.style.DoubleListValue modelHeightBasedEmissiveStrengthMultiplier;

‎extension-compose/api/extension-compose.api‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2379,6 +2379,25 @@ public final class com/mapbox/maps/extension/compose/style/layers/generated/Loca
23792379
public final fun setVisibility (Lcom/mapbox/maps/extension/compose/style/layers/generated/VisibilityValue;)V
23802380
}
23812381

2382+
public final class com/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue {
2383+
public static final field Companion Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue$Companion;
2384+
public static final field DEFAULT Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
2385+
public static final field GROUND Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
2386+
public static final field SEA Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
2387+
public fun <init> (Lcom/mapbox/bindgen/Value;)V
2388+
public fun <init> (Lcom/mapbox/maps/extension/style/expressions/generated/Expression;)V
2389+
public final fun component1 ()Lcom/mapbox/bindgen/Value;
2390+
public final fun copy (Lcom/mapbox/bindgen/Value;)Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
2391+
public static synthetic fun copy$default (Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;Lcom/mapbox/bindgen/Value;ILjava/lang/Object;)Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
2392+
public fun equals (Ljava/lang/Object;)Z
2393+
public final fun getValue ()Lcom/mapbox/bindgen/Value;
2394+
public fun hashCode ()I
2395+
public fun toString ()Ljava/lang/String;
2396+
}
2397+
2398+
public final class com/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue$Companion {
2399+
}
2400+
23822401
public final class com/mapbox/maps/extension/compose/style/layers/generated/ModelLayerKt {
23832402
public static final fun ModelLayer (Lcom/mapbox/maps/extension/compose/style/sources/SourceState;Ljava/lang/String;Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelLayerState;Landroidx/compose/runtime/Composer;II)V
23842403
public static final fun ModelLayer (Lcom/mapbox/maps/extension/compose/style/sources/SourceState;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
@@ -2398,6 +2417,7 @@ public final class com/mapbox/maps/extension/compose/style/layers/generated/Mode
23982417
public final fun getModelColorMixIntensityTransition ()Lcom/mapbox/maps/extension/compose/style/Transition;
23992418
public final fun getModelColorTransition ()Lcom/mapbox/maps/extension/compose/style/Transition;
24002419
public final fun getModelCutoffFadeRange ()Lcom/mapbox/maps/extension/compose/style/DoubleValue;
2420+
public final fun getModelElevationReference ()Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
24012421
public final fun getModelEmissiveStrength ()Lcom/mapbox/maps/extension/compose/style/DoubleValue;
24022422
public final fun getModelEmissiveStrengthTransition ()Lcom/mapbox/maps/extension/compose/style/Transition;
24032423
public final fun getModelHeightBasedEmissiveStrengthMultiplier ()Lcom/mapbox/maps/extension/compose/style/DoubleListValue;
@@ -2430,6 +2450,7 @@ public final class com/mapbox/maps/extension/compose/style/layers/generated/Mode
24302450
public final fun setModelColorMixIntensityTransition (Lcom/mapbox/maps/extension/compose/style/Transition;)V
24312451
public final fun setModelColorTransition (Lcom/mapbox/maps/extension/compose/style/Transition;)V
24322452
public final fun setModelCutoffFadeRange (Lcom/mapbox/maps/extension/compose/style/DoubleValue;)V
2453+
public final fun setModelElevationReference (Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;)V
24332454
public final fun setModelEmissiveStrength (Lcom/mapbox/maps/extension/compose/style/DoubleValue;)V
24342455
public final fun setModelEmissiveStrengthTransition (Lcom/mapbox/maps/extension/compose/style/Transition;)V
24352456
public final fun setModelHeightBasedEmissiveStrengthMultiplier (Lcom/mapbox/maps/extension/compose/style/DoubleListValue;)V

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

Lines changed: 0 additions & 4 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/LayerProperties.kt‎

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

0 commit comments

Comments
 (0)