Skip to content

Commit b3f3944

Browse files
stephanheiglpersidskiy
authored andcommitted
[MAPS3D-1645] StyleSpec: model source definition (#6204)
This PR extends **style specification** with full definition of **model source** as well as **model-elevation-reference**. Groundwork for removal of _non-experimental_ status of model layer targeted at end of year x.17 gl-js/maps releases (MAPS3D-1645, MAPS3D-1958). The actual functionality on - gl-native side is **already there** - gl-js side missing features are implemented as part of #5567. **Changes in this PR** - definition of `model source` - documentation / preparation for style-spec docs in [docs-root PR](mapbox/subdomain-docs-root#486) - moved `model-elevation-reference` from gl-native-only to v8.json > [!NOTE] > Experimental/private flags are kept until functionality is available in main. **Public GL-JS commit message** <public>Extended style specification with model source definition.</public> cc @mapbox/gl-js cc @mapbox/gl-native cc @mapbox/maps-ios cc @mapbox/maps-android --------- Co-authored-by: Ivan Persidskii <[email protected]> GitOrigin-RevId: 3b7ba4d838b739216a72a833e979dbf5278cc36f
1 parent 33f79ac commit b3f3944

File tree

9 files changed

+115
-95
lines changed

9 files changed

+115
-95
lines changed

extension-compose/api/Release/metalava.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3176,6 +3176,7 @@ package com.mapbox.maps.extension.compose.style.layers.generated {
31763176
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue.Companion Companion;
31773177
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue DEFAULT;
31783178
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue GROUND;
3179+
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue HD_ROAD_MARKUP;
31793180
field public static final com.mapbox.maps.extension.compose.style.layers.generated.ModelElevationReferenceValue SEA;
31803181
}
31813182

extension-compose/api/extension-compose.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2635,6 +2635,7 @@ public final class com/mapbox/maps/extension/compose/style/layers/generated/Mode
26352635
public static final field Companion Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue$Companion;
26362636
public static final field DEFAULT Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
26372637
public static final field GROUND Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
2638+
public static final field HD_ROAD_MARKUP Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
26382639
public static final field SEA Lcom/mapbox/maps/extension/compose/style/layers/generated/ModelElevationReferenceValue;
26392640
public fun <init> (Lcom/mapbox/bindgen/Value;)V
26402641
public fun <init> (Lcom/mapbox/maps/extension/style/expressions/generated/Expression;)V

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

Lines changed: 8 additions & 2 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/ModelLayerState.kt

Lines changed: 6 additions & 6 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/ModelLayerTest.kt

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

extension-style/api/Release/metalava.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6534,6 +6534,7 @@ package com.mapbox.maps.extension.style.layers.properties.generated {
65346534
property public String value;
65356535
field public static final com.mapbox.maps.extension.style.layers.properties.generated.ModelElevationReference.Companion Companion;
65366536
field public static final com.mapbox.maps.extension.style.layers.properties.generated.ModelElevationReference GROUND;
6537+
field public static final com.mapbox.maps.extension.style.layers.properties.generated.ModelElevationReference HD_ROAD_MARKUP;
65376538
field public static final com.mapbox.maps.extension.style.layers.properties.generated.ModelElevationReference SEA;
65386539
}
65396540

extension-style/api/extension-style.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5339,6 +5339,7 @@ public final class com/mapbox/maps/extension/style/layers/properties/generated/L
53395339
public final class com/mapbox/maps/extension/style/layers/properties/generated/ModelElevationReference : com/mapbox/maps/extension/style/layers/properties/generated/LayerProperty {
53405340
public static final field Companion Lcom/mapbox/maps/extension/style/layers/properties/generated/ModelElevationReference$Companion;
53415341
public static final field GROUND Lcom/mapbox/maps/extension/style/layers/properties/generated/ModelElevationReference;
5342+
public static final field HD_ROAD_MARKUP Lcom/mapbox/maps/extension/style/layers/properties/generated/ModelElevationReference;
53425343
public static final field SEA Lcom/mapbox/maps/extension/style/layers/properties/generated/ModelElevationReference;
53435344
public fun equals (Ljava/lang/Object;)Z
53445345
public fun getValue ()Ljava/lang/String;

0 commit comments

Comments
 (0)