summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorzmiao <miao.zhao@mapbox.com>2020-02-10 23:27:07 +0200
committerzmiao <miao.zhao@mapbox.com>2020-02-11 11:05:18 +0200
commit7424c4eecb6062e26b7ca3fee154eadff812e665 (patch)
tree10489b8bc9906eede347912116ab0039c432c5da /platform
parente0b1642825fe11b2504b51780edd0493527be2bb (diff)
downloadqtlocation-mapboxgl-7424c4eecb6062e26b7ca3fee154eadff812e665.tar.gz
Bump GL-JS
Backport GL-JS fix 'Hide glyphs behind the camera'(https://github.com/mapbox/mapbox-gl-js/pull/9229)
Diffstat (limited to 'platform')
-rw-r--r--platform/darwin/src/MGLSymbolStyleLayer.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/darwin/src/MGLSymbolStyleLayer.h
index 53bc488a41..8b6bef3c54 100644
--- a/platform/darwin/src/MGLSymbolStyleLayer.h
+++ b/platform/darwin/src/MGLSymbolStyleLayer.h
@@ -994,7 +994,9 @@ MGL_EXPORT
If true, the symbols will not cross tile edges to avoid mutual collisions.
Recommended in layers that don't have enough padding in the vector tile to
prevent collisions, or if it is a point symbol layer placed after a line symbol
- layer.
+ layer. When using a client that supports global collision detection, like
+ Mapbox GL JS version 0.42.0 or greater, enabling this property is not needed to
+ prevent clipped labels at tile boundaries.
The default value of this property is an expression that evaluates to `NO`. Set
this property to `nil` to reset it to the default value.
@@ -1629,7 +1631,7 @@ MGL_EXPORT
/**
To increase the chance of placing high-priority labels on the map, you can
- provide an array of `textAnchor` locations: the render will attempt to place
+ provide an array of `textAnchor` locations: the renderer will attempt to place
the label at each location, in order, before moving onto the next label. Use
`textJustify: auto` to choose justification based on anchor position. To apply
an offset, use the `textRadialOffset` or the two-dimensional `textOffset`.