Skip to content

Commit 6e8557c

Browse files
mfazekasmfazekas
authored
chore: style v8.json update (#3995)
* chore: style v8.json update * v10 dummy for v11 only fill exrtrusion layer properties * fix attrs
1 parent 5a1bad1 commit 6e8557c

File tree

14 files changed

+6589
-3349
lines changed

14 files changed

+6589
-3349
lines changed

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

Lines changed: 111 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import com.rnmapbox.rnmbx.utils.DownloadMapImageTask.OnAllImagesLoaded
2828
import com.rnmapbox.rnmbx.utils.Logger
2929

3030
import com.rnmapbox.rnmbx.v11compat.light.*;
31+
import com.rnmapbox.rnmbx.v11compat.layers.*;
3132
import com.rnmapbox.rnmbx.v11compat.stylefactory.*;
3233

3334
import java.util.List;
@@ -350,8 +351,6 @@ object RNMBXStyleFactory {
350351
}
351352
}
352353
})
353-
"iconImageCrossFadeTransition" ->
354-
setIconImageCrossFadeTransition(layer, styleValue)
355354
}
356355
} catch (e: MapboxStyleException) {
357356
Logger.e(LOG_TAG, "Failed to update: $styleKey ${e.message}")
@@ -472,6 +471,8 @@ object RNMBXStyleFactory {
472471
when (styleKey) {
473472
"visibility" ->
474473
setVisibility(layer, styleValue)
474+
"fillExtrusionEdgeRadius" ->
475+
setFillExtrusionEdgeRadius(layer, styleValue)
475476
"fillExtrusionOpacity" ->
476477
setFillExtrusionOpacity(layer, styleValue)
477478
"fillExtrusionOpacityTransition" ->
@@ -506,6 +507,14 @@ object RNMBXStyleFactory {
506507
setFillExtrusionBaseTransition(layer, styleValue)
507508
"fillExtrusionVerticalGradient" ->
508509
setFillExtrusionVerticalGradient(layer, styleValue)
510+
"fillExtrusionAmbientOcclusionIntensity" ->
511+
setFillExtrusionAmbientOcclusionIntensity(layer, styleValue)
512+
"fillExtrusionAmbientOcclusionIntensityTransition" ->
513+
setFillExtrusionAmbientOcclusionIntensityTransition(layer, styleValue)
514+
"fillExtrusionAmbientOcclusionRadius" ->
515+
setFillExtrusionAmbientOcclusionRadius(layer, styleValue)
516+
"fillExtrusionAmbientOcclusionRadiusTransition" ->
517+
setFillExtrusionAmbientOcclusionRadiusTransition(layer, styleValue)
509518
"fillExtrusionRoundedRoof" ->
510519
setFillExtrusionRoundedRoof(layer, styleValue)
511520
"fillExtrusionAmbientOcclusionWallRadius" ->
@@ -546,6 +555,10 @@ object RNMBXStyleFactory {
546555
setFillExtrusionVerticalScaleTransition(layer, styleValue)
547556
"fillExtrusionCutoffFadeRange" ->
548557
setFillExtrusionCutoffFadeRange(layer, styleValue)
558+
"fillExtrusionEmissiveStrength" ->
559+
setFillExtrusionEmissiveStrength(layer, styleValue)
560+
"fillExtrusionEmissiveStrengthTransition" ->
561+
setFillExtrusionEmissiveStrengthTransition(layer, styleValue)
549562
}
550563
} catch (e: MapboxStyleException) {
551564
Logger.e(LOG_TAG, "Failed to update: $styleKey ${e.message}")
@@ -2614,14 +2627,6 @@ object RNMBXStyleFactory {
26142627
}
26152628
}
26162629

2617-
2618-
fun setIconImageCrossFadeTransition(layer: SymbolLayer, styleValue: RNMBXStyleValue) {
2619-
val transition = styleValue.transition
2620-
if (transition != null) {
2621-
layer.iconImageCrossFadeTransition(transition);
2622-
}
2623-
}
2624-
26252630
fun setCircleSortKey(layer: CircleLayer, styleValue: RNMBXStyleValue ) {
26262631
if (styleValue.isExpression()) {
26272632
val expression = styleValue.getExpression()
@@ -3034,6 +3039,24 @@ object RNMBXStyleFactory {
30343039
layer.visibility(Visibility.valueOf(styleValue.getEnumName()));
30353040
}
30363041

3042+
fun setFillExtrusionEdgeRadius(layer: FillExtrusionLayer, styleValue: RNMBXStyleValue ) {
3043+
if (styleValue.isExpression()) {
3044+
val expression = styleValue.getExpression()
3045+
if (expression != null) {
3046+
layer.fillExtrusionEdgeRadius(expression)
3047+
} else {
3048+
Logger.e("RNMBXFillExtrusion", "Expression for fillExtrusionEdgeRadius is null")
3049+
}
3050+
} else {
3051+
val value = styleValue.getDouble(VALUE_KEY)
3052+
if (value != null) {
3053+
layer.fillExtrusionEdgeRadius(value)
3054+
} else {
3055+
Logger.e("RNMBXFillExtrusion", "value for fillExtrusionEdgeRadius is null")
3056+
}
3057+
}
3058+
}
3059+
30373060
fun setFillExtrusionOpacity(layer: FillExtrusionLayer, styleValue: RNMBXStyleValue ) {
30383061
if (styleValue.isExpression()) {
30393062
val expression = styleValue.getExpression()
@@ -3222,6 +3245,58 @@ object RNMBXStyleFactory {
32223245
}
32233246
}
32243247

3248+
fun setFillExtrusionAmbientOcclusionIntensity(layer: FillExtrusionLayer, styleValue: RNMBXStyleValue ) {
3249+
if (styleValue.isExpression()) {
3250+
val expression = styleValue.getExpression()
3251+
if (expression != null) {
3252+
layer.fillExtrusionAmbientOcclusionIntensity(expression)
3253+
} else {
3254+
Logger.e("RNMBXFillExtrusion", "Expression for fillExtrusionAmbientOcclusionIntensity is null")
3255+
}
3256+
} else {
3257+
val value = styleValue.getDouble(VALUE_KEY)
3258+
if (value != null) {
3259+
layer.fillExtrusionAmbientOcclusionIntensity(value)
3260+
} else {
3261+
Logger.e("RNMBXFillExtrusion", "value for fillExtrusionAmbientOcclusionIntensity is null")
3262+
}
3263+
}
3264+
}
3265+
3266+
3267+
fun setFillExtrusionAmbientOcclusionIntensityTransition(layer: FillExtrusionLayer, styleValue: RNMBXStyleValue) {
3268+
val transition = styleValue.transition
3269+
if (transition != null) {
3270+
layer.fillExtrusionAmbientOcclusionIntensityTransition(transition);
3271+
}
3272+
}
3273+
3274+
fun setFillExtrusionAmbientOcclusionRadius(layer: FillExtrusionLayer, styleValue: RNMBXStyleValue ) {
3275+
if (styleValue.isExpression()) {
3276+
val expression = styleValue.getExpression()
3277+
if (expression != null) {
3278+
layer.fillExtrusionAmbientOcclusionRadius(expression)
3279+
} else {
3280+
Logger.e("RNMBXFillExtrusion", "Expression for fillExtrusionAmbientOcclusionRadius is null")
3281+
}
3282+
} else {
3283+
val value = styleValue.getDouble(VALUE_KEY)
3284+
if (value != null) {
3285+
layer.fillExtrusionAmbientOcclusionRadius(value)
3286+
} else {
3287+
Logger.e("RNMBXFillExtrusion", "value for fillExtrusionAmbientOcclusionRadius is null")
3288+
}
3289+
}
3290+
}
3291+
3292+
3293+
fun setFillExtrusionAmbientOcclusionRadiusTransition(layer: FillExtrusionLayer, styleValue: RNMBXStyleValue) {
3294+
val transition = styleValue.transition
3295+
if (transition != null) {
3296+
layer.fillExtrusionAmbientOcclusionRadiusTransition(transition);
3297+
}
3298+
}
3299+
32253300
fun setFillExtrusionRoundedRoof(layer: FillExtrusionLayer, styleValue: RNMBXStyleValue ) {
32263301
if (styleValue.isExpression()) {
32273302
val expression = styleValue.getExpression()
@@ -3492,6 +3567,32 @@ object RNMBXStyleFactory {
34923567
}
34933568
}
34943569

3570+
fun setFillExtrusionEmissiveStrength(layer: FillExtrusionLayer, styleValue: RNMBXStyleValue ) {
3571+
if (styleValue.isExpression()) {
3572+
val expression = styleValue.getExpression()
3573+
if (expression != null) {
3574+
layer.fillExtrusionEmissiveStrength(expression)
3575+
} else {
3576+
Logger.e("RNMBXFillExtrusion", "Expression for fillExtrusionEmissiveStrength is null")
3577+
}
3578+
} else {
3579+
val value = styleValue.getDouble(VALUE_KEY)
3580+
if (value != null) {
3581+
layer.fillExtrusionEmissiveStrength(value)
3582+
} else {
3583+
Logger.e("RNMBXFillExtrusion", "value for fillExtrusionEmissiveStrength is null")
3584+
}
3585+
}
3586+
}
3587+
3588+
3589+
fun setFillExtrusionEmissiveStrengthTransition(layer: FillExtrusionLayer, styleValue: RNMBXStyleValue) {
3590+
val transition = styleValue.transition
3591+
if (transition != null) {
3592+
layer.fillExtrusionEmissiveStrengthTransition(transition);
3593+
}
3594+
}
3595+
34953596
fun setVisibility(layer: RasterLayer, styleValue: RNMBXStyleValue ) {
34963597
layer.visibility(Visibility.valueOf(styleValue.getEnumName()));
34973598
}

‎android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Layers.kt‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package com.rnmapbox.rnmbx.v11compat.layers;
2+
3+
import com.mapbox.maps.extension.style.expressions.generated.Expression
4+
import com.mapbox.maps.extension.style.layers.generated.FillExtrusionLayer
5+
import com.mapbox.maps.extension.style.types.StyleTransition
6+
7+
fun FillExtrusionLayer.fillExtrusionEdgeRadius(
8+
expression: Expression
9+
) {
10+
// V11 only
11+
}
12+
13+
fun FillExtrusionLayer.fillExtrusionEdgeRadius(
14+
value: Double
15+
) {
16+
// V11 only
17+
}
18+
19+
fun FillExtrusionLayer.fillExtrusionEmissiveStrength(
20+
expression: Expression
21+
) {
22+
// V11 only
23+
}
24+
25+
fun FillExtrusionLayer.fillExtrusionEmissiveStrength(
26+
value: Double
27+
) {
28+
// V11 only
29+
}
30+
31+
fun FillExtrusionLayer.fillExtrusionEmissiveStrengthTransition(
32+
transition: StyleTransition
33+
) {
34+
// V11 only
35+
}

‎android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/Layers.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package com.rnmapbox.rnmbx.v11compat.layers;

‎docs/CircleLayer.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ Name: `circleBlur`
284284
Mapbox spec: [circle-blur](https://docs.mapbox.com/style-spec/reference/layers/#paint-circle-circle-blur)
285285

286286
#### Description
287-
Amount to blur the circle. 1 blurs the circle such that only the centerpoint is full opacity.
287+
Amount to blur the circle. 1 blurs the circle such that only the centerpoint is full opacity. Setting a negative value renders the blur as an inner glow effect.
288288

289289
#### Type
290290
`number`

‎docs/FillExtrusionLayer.md‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ Customizable style attributes
128128
## styles
129129

130130
* <a href="#visibility">visibility</a><br/>
131+
* <a href="#fillextrusionedgeradius">fillExtrusionEdgeRadius</a><br/>
131132
* <a href="#fillextrusionopacity">fillExtrusionOpacity</a><br/>
132133
* <a href="#fillextrusioncolor">fillExtrusionColor</a><br/>
133134
* <a href="#fillextrusiontranslate">fillExtrusionTranslate</a><br/>
@@ -136,6 +137,8 @@ Customizable style attributes
136137
* <a href="#fillextrusionheight">fillExtrusionHeight</a><br/>
137138
* <a href="#fillextrusionbase">fillExtrusionBase</a><br/>
138139
* <a href="#fillextrusionverticalgradient">fillExtrusionVerticalGradient</a><br/>
140+
* <a href="#fillextrusionambientocclusionintensity">fillExtrusionAmbientOcclusionIntensity</a><br/>
141+
* <a href="#fillextrusionambientocclusionradius">fillExtrusionAmbientOcclusionRadius</a><br/>
139142
* <a href="#fillextrusionroundedroof">fillExtrusionRoundedRoof</a><br/>
140143

141144
___
@@ -158,6 +161,32 @@ Whether this layer is displayed.
158161
**none** - The layer is not shown.<br />
159162

160163

164+
#### Expression
165+
166+
Parameters: ``
167+
168+
___
169+
170+
### fillExtrusionEdgeRadius
171+
Name: `fillExtrusionEdgeRadius`
172+
173+
Mapbox spec: [fill-extrusion-edge-radius](https://docs.mapbox.com/style-spec/reference/layers/#layout-fill-extrusion-fill-extrusion-edge-radius)
174+
175+
#### Description
176+
Radius of a fill extrusion edge in meters. If not zero, rounds extrusion edges for a smoother appearance.
177+
178+
#### Type
179+
`number`
180+
#### Default Value
181+
`0`
182+
183+
#### Minimum
184+
`0`
185+
186+
187+
#### Maximum
188+
`1`
189+
161190
#### Expression
162191

163192
Parameters: ``
@@ -449,6 +478,96 @@ Whether to apply a vertical gradient to the sides of a fillExtrusion layer. If t
449478

450479
Parameters: `zoom`
451480

481+
___
482+
483+
### fillExtrusionAmbientOcclusionIntensity
484+
Name: `fillExtrusionAmbientOcclusionIntensity`
485+
486+
Mapbox spec: [fill-extrusion-ambient-occlusion-intensity](https://docs.mapbox.com/style-spec/reference/layers/#paint-fill-extrusion-fill-extrusion-ambient-occlusion-intensity)
487+
488+
#### Description
489+
Controls the intensity of shading near ground and concave angles between walls. Default value 0.0 disables ambient occlusion and values around 0.3 provide the most plausible results for buildings.
490+
491+
#### Type
492+
`number`
493+
#### Default Value
494+
`0`
495+
496+
#### Minimum
497+
`0`
498+
499+
500+
#### Maximum
501+
`1`
502+
503+
#### Expression
504+
505+
Parameters: `zoom`
506+
___
507+
508+
### fillExtrusionAmbientOcclusionIntensityTransition
509+
Name: `fillExtrusionAmbientOcclusionIntensityTransition`
510+
511+
#### Description
512+
513+
The transition affecting any changes to this layer’s fillExtrusionAmbientOcclusionIntensity property.
514+
515+
#### Type
516+
517+
`{ duration, delay }`
518+
519+
#### Units
520+
`milliseconds`
521+
522+
#### Default Value
523+
`{duration: 300, delay: 0}`
524+
525+
526+
___
527+
528+
### fillExtrusionAmbientOcclusionRadius
529+
Name: `fillExtrusionAmbientOcclusionRadius`
530+
531+
Mapbox spec: [fill-extrusion-ambient-occlusion-radius](https://docs.mapbox.com/style-spec/reference/layers/#paint-fill-extrusion-fill-extrusion-ambient-occlusion-radius)
532+
533+
#### Description
534+
Shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to height of one floor and brings the most plausible results for buildings. This property works only with legacy light. When 3D lights are enabled `fillExtrusionAmbientOcclusionWallRadius` and `fillExtrusionAmbientOcclusionGroundRadius` are used instead.
535+
536+
#### Type
537+
`number`
538+
#### Default Value
539+
`3`
540+
541+
#### Minimum
542+
`0`
543+
544+
545+
#### Requires
546+
`fillExtrusionEdgeRadius`
547+
548+
#### Expression
549+
550+
Parameters: `zoom`
551+
___
552+
553+
### fillExtrusionAmbientOcclusionRadiusTransition
554+
Name: `fillExtrusionAmbientOcclusionRadiusTransition`
555+
556+
#### Description
557+
558+
The transition affecting any changes to this layer’s fillExtrusionAmbientOcclusionRadius property.
559+
560+
#### Type
561+
562+
`{ duration, delay }`
563+
564+
#### Units
565+
`milliseconds`
566+
567+
#### Default Value
568+
`{duration: 300, delay: 0}`
569+
570+
452571
___
453572

454573
### fillExtrusionRoundedRoof

0 commit comments

Comments
 (0)