diff options
| m--------- | mapbox-gl-js | 0 | ||||
| -rw-r--r-- | platform/darwin/src/MGLSymbolStyleLayer.h | 20 |
2 files changed, 11 insertions, 9 deletions
diff --git a/mapbox-gl-js b/mapbox-gl-js -Subproject b0a37a059af486e3577fad432904bc1341b17f5 +Subproject 8e77fc87ad0e477df7d01dc0534ddacc23358cd diff --git a/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/darwin/src/MGLSymbolStyleLayer.h index f0a2472dba..658a31679e 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.h +++ b/platform/darwin/src/MGLSymbolStyleLayer.h @@ -1166,8 +1166,8 @@ MGL_EXPORT The default value of this property is an expression that evaluates to `center`. Set this property to `nil` to reset it to the default value. - This property is only applied to the style if `text` is non-`nil`. Otherwise, - it is ignored. + This property is only applied to the style if `text` is non-`nil`, and + `textVariableAnchor` is set to `nil`. Otherwise, it is ignored. You can set this property to an expression containing any of the following: @@ -1380,7 +1380,8 @@ MGL_EXPORT ems downward. Set this property to `nil` to reset it to the default value. This property is only applied to the style if `text` is non-`nil`, and - `textRadialOffset` is set to `nil`. Otherwise, it is ignored. + `textRadialOffset` is set to `nil`, and `textVariableAnchor` is set to `nil`. + Otherwise, it is ignored. You can set this property to an expression containing any of the following: @@ -1403,7 +1404,8 @@ MGL_EXPORT ems upward. Set this property to `nil` to reset it to the default value. This property is only applied to the style if `text` is non-`nil`, and - `textRadialOffset` is set to `nil`. Otherwise, it is ignored. + `textRadialOffset` is set to `nil`, and `textVariableAnchor` is set to `nil`. + Otherwise, it is ignored. You can set this property to an expression containing any of the following: @@ -1503,8 +1505,8 @@ MGL_EXPORT The default value of this property is an expression that evaluates to the float `0`. Set this property to `nil` to reset it to the default value. - This property is only applied to the style if `textOffset` is set to `nil`. - Otherwise, it is ignored. + This property is only applied to the style if `text` is non-`nil`. Otherwise, + it is ignored. You can set this property to an expression containing any of the following: @@ -1611,9 +1613,9 @@ MGL_EXPORT an offset, use the `textRadialOffset` instead of the two-dimensional `textOffset`. - This property is only applied to the style if `textAnchor` is set to `nil`, and - `textOffset` is set to `nil`, and `symbolPlacement` is set to an expression - that evaluates to or `MGLSymbolPlacementPoint`. Otherwise, it is ignored. + This property is only applied to the style if `text` is non-`nil`, and + `symbolPlacement` is set to an expression that evaluates to or + `MGLSymbolPlacementPoint`. Otherwise, it is ignored. You can set this property to an expression containing any of the following: |