Skip to content

Commit

Permalink
Update style spec to glnative/11.10.0-beta.2 (#2918)
Browse files Browse the repository at this point in the history
  • Loading branch information
pengdev authored Jan 17, 2025
1 parent 969f007 commit 4d0e61a
Show file tree
Hide file tree
Showing 23 changed files with 737 additions and 267 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ Mapbox welcomes participation and contributions from everyone.
* 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`.
* 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.
* [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`.
* Remove `@MapboxExperimental` from `ClipLayer.clipLayerTypes` and `ClipLayer.clipLayerScope`.
* 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`.
* Introduce experimental `ModelLayer.modelElevationReference` property.
* Introduce experimental `LocationPuck3D.modelElevationReference` property.

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

# 11.9.0 December 18, 2024
## Breaking changes ⚠️
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import androidx.core.content.ContextCompat
import com.mapbox.geojson.Point
import com.mapbox.geojson.Polygon
import com.mapbox.maps.MapView
import com.mapbox.maps.MapboxExperimental
import com.mapbox.maps.MapboxMap
import com.mapbox.maps.Style
import com.mapbox.maps.dsl.cameraOptions
Expand All @@ -24,7 +23,6 @@ import com.mapbox.maps.testapp.R
/**
* Example showcasing the usage of [com.mapbox.maps.extension.style.layers.generated.ClipLayer].
*/
@OptIn(MapboxExperimental::class)
class ClipLayerActivity : AppCompatActivity() {

private lateinit var mapboxMap: MapboxMap
Expand Down Expand Up @@ -88,7 +86,6 @@ class ClipLayerActivity : AppCompatActivity() {
}
}

@OptIn(MapboxExperimental::class)
private fun updateClipLayerTypes(vararg clipLayerTypes: String) {
mapboxMap.getStyle { style ->
style.getLayerAs<ClipLayer>(CLIP_LAYER_ID)?.visibility(Visibility.VISIBLE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import androidx.compose.ui.unit.dp
import com.mapbox.geojson.Feature
import com.mapbox.geojson.Point
import com.mapbox.geojson.Polygon
import com.mapbox.maps.MapboxExperimental
import com.mapbox.maps.Style
import com.mapbox.maps.compose.testapp.ExampleScaffold
import com.mapbox.maps.compose.testapp.ui.theme.MapboxMapComposeTheme
Expand All @@ -40,7 +39,6 @@ import com.mapbox.maps.extension.compose.style.sources.generated.rememberGeoJson
/**
* Example showcasing the usage of [com.mapbox.maps.extension.style.layers.generated.ClipLayer].
*/
@OptIn(MapboxExperimental::class)
public class ClipLayerActivity : ComponentActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
Expand Down
23 changes: 21 additions & 2 deletions extension-compose/api/Release/metalava.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1883,7 +1883,7 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
property public final com.mapbox.maps.extension.compose.style.layers.generated.VisibilityValue visibility;
}

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

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

@androidx.compose.runtime.Immutable @com.mapbox.maps.MapboxExperimental public final class ModelElevationReferenceValue {
ctor public ModelElevationReferenceValue(com.mapbox.bindgen.Value value);
ctor public ModelElevationReferenceValue(com.mapbox.maps.extension.style.expressions.generated.Expression expression);
method public com.mapbox.bindgen.Value component1();
method public com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue copy(com.mapbox.bindgen.Value value);
method public com.mapbox.bindgen.Value getValue();
property public final com.mapbox.bindgen.Value value;
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue.Companion Companion;
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue DEFAULT;
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue GROUND;
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue SEA;
}

public static final class ModelElevationReferenceValue.Companion {
}

public final class ModelLayerKt {
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({
return generateRandomLayerId("model")
Expand All @@ -2857,6 +2873,7 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
method public com.mapbox.maps.extension.compose.style.Transition getModelColorMixIntensityTransition();
method public com.mapbox.maps.extension.compose.style.Transition getModelColorTransition();
method public com.mapbox.maps.extension.compose.style.DoubleValue getModelCutoffFadeRange();
method public com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue getModelElevationReference();
method public com.mapbox.maps.extension.compose.style.DoubleValue getModelEmissiveStrength();
method public com.mapbox.maps.extension.compose.style.Transition getModelEmissiveStrengthTransition();
method public com.mapbox.maps.extension.compose.style.DoubleListValue getModelHeightBasedEmissiveStrengthMultiplier();
Expand Down Expand Up @@ -2889,6 +2906,7 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
method public void setModelColorMixIntensityTransition(com.mapbox.maps.extension.compose.style.Transition);
method public void setModelColorTransition(com.mapbox.maps.extension.compose.style.Transition);
method public void setModelCutoffFadeRange(com.mapbox.maps.extension.compose.style.DoubleValue);
method public void setModelElevationReference(com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue);
method public void setModelEmissiveStrength(com.mapbox.maps.extension.compose.style.DoubleValue);
method public void setModelEmissiveStrengthTransition(com.mapbox.maps.extension.compose.style.Transition);
method public void setModelHeightBasedEmissiveStrengthMultiplier(com.mapbox.maps.extension.compose.style.DoubleListValue);
Expand Down Expand Up @@ -2921,6 +2939,7 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
property public final com.mapbox.maps.extension.compose.style.Transition modelColorMixIntensityTransition;
property public final com.mapbox.maps.extension.compose.style.Transition modelColorTransition;
property public final com.mapbox.maps.extension.compose.style.DoubleValue modelCutoffFadeRange;
property public final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue modelElevationReference;
property public final com.mapbox.maps.extension.compose.style.DoubleValue modelEmissiveStrength;
property public final com.mapbox.maps.extension.compose.style.Transition modelEmissiveStrengthTransition;
property public final com.mapbox.maps.extension.compose.style.DoubleListValue modelHeightBasedEmissiveStrengthMultiplier;
Expand Down
21 changes: 21 additions & 0 deletions extension-compose/api/extension-compose.api
Original file line number Diff line number Diff line change
Expand Up @@ -2379,6 +2379,25 @@ public final class com/mapbox/maps/extension/compose/style/layers/generated/Loca
public final fun setVisibility (Lcom/mapbox/maps/extension/compose/style/layers/generated/VisibilityValue;)V
}

public final class com/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue {
public static final field Companion Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue$Companion;
public static final field DEFAULT Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
public static final field GROUND Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
public static final field SEA Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
public fun <init> (Lcom/mapbox/bindgen/Value;)V
public fun <init> (Lcom/mapbox/maps/extension/style/expressions/generated/Expression;)V
public final fun component1 ()Lcom/mapbox/bindgen/Value;
public final fun copy (Lcom/mapbox/bindgen/Value;)Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
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;
public fun equals (Ljava/lang/Object;)Z
public final fun getValue ()Lcom/mapbox/bindgen/Value;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}

public final class com/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue$Companion {
}

public final class com/mapbox/maps/extension/compose/style/layers/generated/ModelLayerKt {
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
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
Expand All @@ -2398,6 +2417,7 @@ public final class com/mapbox/maps/extension/compose/style/layers/generated/Mode
public final fun getModelColorMixIntensityTransition ()Lcom/mapbox/maps/extension/compose/style/Transition;
public final fun getModelColorTransition ()Lcom/mapbox/maps/extension/compose/style/Transition;
public final fun getModelCutoffFadeRange ()Lcom/mapbox/maps/extension/compose/style/DoubleValue;
public final fun getModelElevationReference ()Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
public final fun getModelEmissiveStrength ()Lcom/mapbox/maps/extension/compose/style/DoubleValue;
public final fun getModelEmissiveStrengthTransition ()Lcom/mapbox/maps/extension/compose/style/Transition;
public final fun getModelHeightBasedEmissiveStrengthMultiplier ()Lcom/mapbox/maps/extension/compose/style/DoubleListValue;
Expand Down Expand Up @@ -2430,6 +2450,7 @@ public final class com/mapbox/maps/extension/compose/style/layers/generated/Mode
public final fun setModelColorMixIntensityTransition (Lcom/mapbox/maps/extension/compose/style/Transition;)V
public final fun setModelColorTransition (Lcom/mapbox/maps/extension/compose/style/Transition;)V
public final fun setModelCutoffFadeRange (Lcom/mapbox/maps/extension/compose/style/DoubleValue;)V
public final fun setModelElevationReference (Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;)V
public final fun setModelEmissiveStrength (Lcom/mapbox/maps/extension/compose/style/DoubleValue;)V
public final fun setModelEmissiveStrengthTransition (Lcom/mapbox/maps/extension/compose/style/Transition;)V
public final fun setModelHeightBasedEmissiveStrengthMultiplier (Lcom/mapbox/maps/extension/compose/style/DoubleListValue;)V
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4d0e61a

Please sign in to comment.