summaryrefslogtreecommitdiff
path: root/platform/darwin
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-05-03 11:41:49 +0200
committerKonstantin Käfer <mail@kkaefer.com>2019-05-08 14:10:11 +0200
commita53c88159fa084d5dc9dae3ed298cc150a4db7ce (patch)
tree1f3f91df0d6c52f2efd7a1cafadc8774044ca591 /platform/darwin
parent20a807fdf36e2609973451ef8d0e49472a59db91 (diff)
downloadqtlocation-mapboxgl-a53c88159fa084d5dc9dae3ed298cc150a4db7ce.tar.gz
[core] upgrade mapbox-gl-js pin to the most recent version
Diffstat (limited to 'platform/darwin')
-rw-r--r--platform/darwin/src/MGLSymbolStyleLayer.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/darwin/src/MGLSymbolStyleLayer.h
index cbe3464346..f0a2472dba 100644
--- a/platform/darwin/src/MGLSymbolStyleLayer.h
+++ b/platform/darwin/src/MGLSymbolStyleLayer.h
@@ -159,7 +159,7 @@ typedef NS_ENUM(NSUInteger, MGLSymbolPlacement) {
typedef NS_ENUM(NSUInteger, MGLSymbolZOrder) {
/**
If `MGLSymbolStyleLayer.symbolSortKey` is set, sort based on that.
- Otherwise sort symbols by their position relative to the viewport.
+ Otherwise sort symbols by their y-position relative to the viewport.
*/
MGLSymbolZOrderAuto,
/**
@@ -1075,7 +1075,7 @@ MGL_EXPORT
* Constant `MGLSymbolZOrder` values
* Any of the following constant string values:
* `auto`: If `symbol-sort-key` is set, sort based on that. Otherwise sort
- symbols by their position relative to the viewport.
+ symbols by their y-position relative to the viewport.
* `viewport-y`: Specify this z order if symbols’ appearance relies on lower
features overlapping higher features. For example, symbols with a pin-like
appearance would require this z order.
@@ -1500,6 +1500,9 @@ MGL_EXPORT
This property is measured in ems.
+ 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.