Skip to content

Commit 04c976b

Browse files
committed
chore: regenerate generated files (new style spec properties)
1 parent 84ee975 commit 04c976b

File tree

8 files changed

+244
-4
lines changed

8 files changed

+244
-4
lines changed

android/src/main/java/com/rnmapbox/rnmbx/components/styles/RNMBXStyleFactory.kt

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@ object RNMBXStyleFactory {
191191
setLineElevationReference(layer, styleValue)
192192
"lineCrossSlope" ->
193193
setLineCrossSlope(layer, styleValue)
194+
"lineElevationGroundScale" ->
195+
setLineElevationGroundScale(layer, styleValue)
196+
"lineElevationGroundScaleTransition" ->
197+
setLineElevationGroundScaleTransition(layer, styleValue)
194198
"linePatternCrossFade" ->
195199
style.addImage(styleValue!!, styleKey, object : OnAllImagesLoaded {
196200
override fun onAllImagesLoaded() {
@@ -709,6 +713,8 @@ object RNMBXStyleFactory {
709713
setRasterElevation(layer, styleValue)
710714
"rasterElevationTransition" ->
711715
setRasterElevationTransition(layer, styleValue)
716+
"rasterElevationReference" ->
717+
setRasterElevationReference(layer, styleValue)
712718
}
713719
} catch (e: MapboxStyleException) {
714720
Logger.e(LOG_TAG, "Failed to update: $styleKey ${e.message}")
@@ -1846,6 +1852,32 @@ object RNMBXStyleFactory {
18461852
}
18471853
}
18481854

1855+
fun setLineElevationGroundScale(layer: LineLayer, styleValue: RNMBXStyleValue ) {
1856+
if (styleValue.isExpression()) {
1857+
val expression = styleValue.getExpression()
1858+
if (expression != null) {
1859+
layer.lineElevationGroundScale(expression)
1860+
} else {
1861+
Logger.e("RNMBXLine", "Expression for lineElevationGroundScale is null")
1862+
}
1863+
} else {
1864+
val value = styleValue.getDouble(VALUE_KEY)
1865+
if (value != null) {
1866+
layer.lineElevationGroundScale(value)
1867+
} else {
1868+
Logger.e("RNMBXLine", "value for lineElevationGroundScale is null")
1869+
}
1870+
}
1871+
}
1872+
1873+
1874+
fun setLineElevationGroundScaleTransition(layer: LineLayer, styleValue: RNMBXStyleValue) {
1875+
val transition = styleValue.transition
1876+
if (transition != null) {
1877+
layer.lineElevationGroundScaleTransition(transition);
1878+
}
1879+
}
1880+
18491881
fun setLinePatternCrossFade(layer: LineLayer, styleValue: RNMBXStyleValue ) {
18501882
if (styleValue.isExpression()) {
18511883
val expression = styleValue.getExpression()
@@ -4571,6 +4603,19 @@ object RNMBXStyleFactory {
45714603
}
45724604
}
45734605

4606+
fun setRasterElevationReference(layer: RasterLayer, styleValue: RNMBXStyleValue ) {
4607+
if (styleValue.isExpression()) {
4608+
val expression = styleValue.getExpression()
4609+
if (expression != null) {
4610+
layer.rasterElevationReference(expression)
4611+
} else {
4612+
Logger.e("RNMBXRaster", "Expression for rasterElevationReference is null")
4613+
}
4614+
} else {
4615+
layer.rasterElevationReference(RasterElevationReference.valueOf(styleValue.getEnumName()))
4616+
}
4617+
}
4618+
45744619
fun setVisibility(layer: RasterParticleLayer, styleValue: RNMBXStyleValue ) {
45754620
layer.visibility(Visibility.valueOf(styleValue.getEnumName()));
45764621
}

docs/LineLayer.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ Customizable style attributes
145145
* <a href="#lineelevationreference">lineElevationReference</a><br/>
146146
* <a href="#linecrossslope">lineCrossSlope</a><br/>
147147
* <a href="#visibility">visibility</a><br/>
148+
* <a href="#lineelevationgroundscale">lineElevationGroundScale</a><br/>
148149
* <a href="#lineopacity">lineOpacity</a><br/>
149150
* <a href="#linecolor">lineColor</a><br/>
150151
* <a href="#linetranslate">lineTranslate</a><br/>
@@ -372,6 +373,54 @@ Whether this layer is displayed.
372373

373374
Parameters: ``
374375

376+
___
377+
378+
### lineElevationGroundScale
379+
Name: `lineElevationGroundScale`
380+
381+
Mapbox spec: [line-elevation-ground-scale](https://docs.mapbox.com/style-spec/reference/layers/#layout-line-line-elevation-ground-scale)
382+
383+
#### Description
384+
Controls how much the elevation of lines with `lineElevationReference` set to `sea` scales with terrain exaggeration. A value of 0 keeps the line at a fixed altitude above sea level. A value of 1 scales the elevation proportionally with terrain exaggeration.
385+
386+
#### Type
387+
`number`
388+
#### Default Value
389+
`0`
390+
391+
#### Minimum
392+
`0`
393+
394+
395+
#### Maximum
396+
`1`
397+
398+
#### Requires
399+
`lineZOffset`
400+
401+
#### Expression
402+
403+
Parameters: `zoom, feature, line-progress`
404+
___
405+
406+
### lineElevationGroundScaleTransition
407+
Name: `lineElevationGroundScaleTransition`
408+
409+
#### Description
410+
411+
The transition affecting any changes to this layer’s lineElevationGroundScale property.
412+
413+
#### Type
414+
415+
`{ duration, delay }`
416+
417+
#### Units
418+
`milliseconds`
419+
420+
#### Default Value
421+
`{duration: 300, delay: 0}`
422+
423+
375424
___
376425

377426
### lineOpacity

docs/Rain.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ Rain
1818
```tsx
1919
RainLayerStyleProps
2020
```
21-
FIX ME NO DESCRIPTION
21+
Rain particle effect style properties.
22+
23+
@note The default `color` and `vignetteColor` values use `measure-light("brightness")`
24+
expressions that are only available in Mapbox Standard-based styles
25+
(`mapbox://styles/mapbox/standard`, `mapbox://styles/mapbox/standard-satellite`).
26+
When using legacy or custom styles, set `color` and `vignetteColor` explicitly to
27+
avoid "Brightness is unavailable in the current evaluation context" warnings and
28+
invisible rain. For example: `color="#a8adbc" vignetteColor="#464646"`.
2229

2330

2431

docs/RasterLayer.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ Customizable style attributes
152152
* <a href="#rasteremissivestrength">rasterEmissiveStrength</a><br/>
153153
* <a href="#rasterarrayband">rasterArrayBand</a><br/>
154154
* <a href="#rasterelevation">rasterElevation</a><br/>
155+
* <a href="#rasterelevationreference">rasterElevationReference</a><br/>
155156

156157
___
157158

@@ -699,3 +700,27 @@ The transition affecting any changes to this layer’s rasterElevation property.
699700
`{duration: 300, delay: 0}`
700701

701702

703+
___
704+
705+
### rasterElevationReference
706+
Name: `rasterElevationReference`
707+
708+
Mapbox spec: [raster-elevation-reference](https://docs.mapbox.com/style-spec/reference/layers/#paint-raster-raster-elevation-reference)
709+
710+
#### Description
711+
Selects the base of rasterElevation.
712+
713+
#### Type
714+
`enum`
715+
#### Default Value
716+
`sea`
717+
718+
#### Supported Values
719+
**sea** - Use this mode to elevate raster layers relative to the sea level.<br />
720+
**ground** - Use this mode to elevate raster layers relative to the ground's height below them.<br />
721+
722+
723+
#### Expression
724+
725+
Parameters: ``
726+

docs/docs.json

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3945,6 +3945,34 @@
39453945
"namespace": "layout"
39463946
}
39473947
},
3948+
{
3949+
"name": "lineElevationGroundScale",
3950+
"type": "number",
3951+
"values": [],
3952+
"minimum": 0,
3953+
"maximum": 1,
3954+
"default": 0,
3955+
"description": "Controls how much the elevation of lines with `lineElevationReference` set to `sea` scales with terrain exaggeration. A value of 0 keeps the line at a fixed altitude above sea level. A value of 1 scales the elevation proportionally with terrain exaggeration.",
3956+
"requires": [
3957+
"lineZOffset"
3958+
],
3959+
"disabledBy": [],
3960+
"allowedFunctionTypes": [],
3961+
"expression": {
3962+
"interpolated": true,
3963+
"parameters": [
3964+
"zoom",
3965+
"feature",
3966+
"line-progress"
3967+
]
3968+
},
3969+
"transition": true,
3970+
"mbx": {
3971+
"fullName": "layout-line-line-elevation-ground-scale",
3972+
"name": "line-elevation-ground-scale",
3973+
"namespace": "layout"
3974+
}
3975+
},
39483976
{
39493977
"name": "lineOpacity",
39503978
"type": "number",
@@ -6467,7 +6495,7 @@
64676495
"required": false,
64686496
"type": "RainLayerStyleProps",
64696497
"default": "none",
6470-
"description": "FIX ME NO DESCRIPTION"
6498+
"description": "Rain particle effect style properties.\n\n@note The default `color` and `vignetteColor` values use `measure-light(\"brightness\")`\nexpressions that are only available in Mapbox Standard-based styles\n(`mapbox://styles/mapbox/standard`, `mapbox://styles/mapbox/standard-satellite`).\nWhen using legacy or custom styles, set `color` and `vignetteColor` explicitly to\navoid \"Brightness is unavailable in the current evaluation context\" warnings and\ninvisible rain. For example: `color=\"#a8adbc\" vignetteColor=\"#464646\"`."
64716499
}
64726500
],
64736501
"fileNameWithExt": "Rain.tsx",
@@ -7071,6 +7099,34 @@
70717099
"name": "raster-elevation",
70727100
"namespace": "paint"
70737101
}
7102+
},
7103+
{
7104+
"name": "rasterElevationReference",
7105+
"type": "enum",
7106+
"values": [
7107+
{
7108+
"value": "sea",
7109+
"doc": "Use this mode to elevate raster layers relative to the sea level."
7110+
},
7111+
{
7112+
"value": "ground",
7113+
"doc": "Use this mode to elevate raster layers relative to the ground's height below them."
7114+
}
7115+
],
7116+
"default": "sea",
7117+
"description": "Selects the base of rasterElevation.",
7118+
"requires": [],
7119+
"disabledBy": [],
7120+
"allowedFunctionTypes": [],
7121+
"expression": {
7122+
"interpolated": false
7123+
},
7124+
"transition": false,
7125+
"mbx": {
7126+
"fullName": "paint-raster-raster-elevation-reference",
7127+
"name": "raster-elevation-reference",
7128+
"namespace": "paint"
7129+
}
70747130
}
70757131
]
70767132
},

docs/examples.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,9 +602,11 @@
602602
"RasterDemSource",
603603
"Terrain",
604604
"Atmosphere",
605-
"SkyLayer"
605+
"SkyLayer",
606+
"Snow",
607+
"Rain"
606608
],
607-
"docs": "\nDemostrates use of Terrain, Atmosphere and SkyLayer.\n"
609+
"docs": "\nDemonstrates use of Terrain, Atmosphere and SkyLayer. Use the Snow/Rain buttons to toggle experimental particle weather effects.\n"
608610
},
609611
"fullPath": "example/src/examples/V10/TerrainSkyAtmosphere.tsx",
610612
"relPath": "V10/TerrainSkyAtmosphere.tsx",

ios/RNMBX/RNMBXStyle.swift

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,10 @@ func lineLayer(layer: inout LineLayer, reactStyle:Dictionary<String, Any>, oldRe
168168
self.setLineElevationReference(&layer, styleValue:styleValue);
169169
} else if (prop == "lineCrossSlope") {
170170
self.setLineCrossSlope(&layer, styleValue:styleValue);
171+
} else if (prop == "lineElevationGroundScale") {
172+
self.setLineElevationGroundScale(&layer, styleValue:styleValue);
173+
} else if (prop == "lineElevationGroundScaleTransition") {
174+
self.setLineElevationGroundScaleTransition(&layer, styleValue:styleValue);
171175
} else if (prop == "linePatternCrossFade") {
172176
styleValue.setImage(
173177
bridge: bridge!,
@@ -701,6 +705,8 @@ func rasterLayer(layer: inout RasterLayer, reactStyle:Dictionary<String, Any>, o
701705
self.setRasterElevation(&layer, styleValue:styleValue);
702706
} else if (prop == "rasterElevationTransition") {
703707
self.setRasterElevationTransition(&layer, styleValue:styleValue);
708+
} else if (prop == "rasterElevationReference") {
709+
self.setRasterElevationReference(&layer, styleValue:styleValue);
704710
} else {
705711
Logger.log(level:.error, message: "Unexpected property \(prop) for layer: raster")
706712
}
@@ -1556,6 +1562,20 @@ func setLineCrossSlope(_ layer: inout LineLayer, styleValue: RNMBXStyleValue)
15561562

15571563
}
15581564

1565+
func setLineElevationGroundScale(_ layer: inout LineLayer, styleValue: RNMBXStyleValue)
1566+
{
1567+
1568+
1569+
layer.lineElevationGroundScale = styleValue.mglStyleValueNumber();
1570+
1571+
1572+
}
1573+
1574+
func setLineElevationGroundScaleTransition(_ layer: inout LineLayer, styleValue: RNMBXStyleValue)
1575+
{
1576+
layer.lineElevationGroundScaleTransition = styleValue.getTransition();
1577+
}
1578+
15591579
func setLinePatternCrossFade(_ layer: inout LineLayer, styleValue: RNMBXStyleValue)
15601580
{
15611581

@@ -3052,6 +3072,15 @@ func setRasterElevationTransition(_ layer: inout RasterLayer, styleValue: RNMBXS
30523072
layer.rasterElevationTransition = styleValue.getTransition();
30533073
}
30543074

3075+
func setRasterElevationReference(_ layer: inout RasterLayer, styleValue: RNMBXStyleValue)
3076+
{
3077+
3078+
3079+
layer.rasterElevationReference = styleValue.mglStyleValueEnum();
3080+
3081+
3082+
}
3083+
30553084

30563085

30573086
func setRasterParticleStyleLayerVisibility(_ layer: inout RasterParticleLayer, styleValue: RNMBXStyleValue)

src/utils/MapboxStyles.ts

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,13 @@ enum RasterResamplingEnum {
452452
Nearest = 'nearest',
453453
}
454454
type RasterResamplingEnumValues = 'linear' | 'nearest';
455+
enum RasterElevationReferenceEnum {
456+
/** Use this mode to elevate raster layers relative to the sea level. */
457+
Sea = 'sea',
458+
/** Use this mode to elevate raster layers relative to the ground's height below them. */
459+
Ground = 'ground',
460+
}
461+
type RasterElevationReferenceEnumValues = 'sea' | 'ground';
455462
enum HillshadeIlluminationAnchorEnum {
456463
/** The hillshade illumination is relative to the north direction. */
457464
Map = 'map',
@@ -767,6 +774,20 @@ export interface LineLayerStyleProps {
767774
* @requires lineZOffset
768775
*/
769776
lineCrossSlope?: Value<number>;
777+
/**
778+
* Controls how much the elevation of lines with `lineElevationReference` set to `sea` scales with terrain exaggeration. A value of 0 keeps the line at a fixed altitude above sea level. A value of 1 scales the elevation proportionally with terrain exaggeration.
779+
*
780+
* @requires lineZOffset
781+
*/
782+
lineElevationGroundScale?: Value<
783+
number,
784+
['zoom', 'feature', 'line-progress']
785+
>;
786+
787+
/**
788+
* The transition affecting any changes to this layer’s lineElevationGroundScale property.
789+
*/
790+
lineElevationGroundScaleTransition?: Transition;
770791
/**
771792
* Controls the transition progress between the image variants of linePattern. Zero means the first variant is used, one is the second, and in between they are blended together. Both images should be the same size and have the same type (either raster or vector).
772793
*
@@ -1933,6 +1954,12 @@ export interface RasterLayerStyleProps {
19331954
* The transition affecting any changes to this layer’s rasterElevation property.
19341955
*/
19351956
rasterElevationTransition?: Transition;
1957+
/**
1958+
* Selects the base of rasterElevation.
1959+
*/
1960+
rasterElevationReference?: Value<
1961+
Enum<RasterElevationReferenceEnum, RasterElevationReferenceEnumValues>
1962+
>;
19361963
}
19371964
export interface RasterParticleLayerStyleProps {
19381965
/**

0 commit comments

Comments
 (0)