diff options
Diffstat (limited to 'platform')
3 files changed, 10 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java index 84285a1c54..0a1d1cacbe 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java @@ -111,7 +111,7 @@ public final class Property { // SYMBOL_Z_ORDER: Controls the order in which overlapping symbols in the same layer are rendered /** - * If {@link SYMBOL_SORT_KEY} is set, sort based on that. Otherwise sort symbols by their position relative to the viewport. + * If {@link SYMBOL_SORT_KEY} is set, sort based on that. Otherwise sort symbols by their y-position relative to the viewport. */ public static final String SYMBOL_Z_ORDER_AUTO = "auto"; /** 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. diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index 0ffb8f1d6c..acc8724a29 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -71,6 +71,7 @@ "query-tests/regressions/mapbox-gl-js#6555": "skip - no querySourceFeatures in mbgl-node; needs issue", "render-tests/background-color/transition": "https://github.com/mapbox/mapbox-gl-native/issues/10619", "render-tests/canvas/default": "skip - js specific", + "render-tests/canvas/update": "skip - js specific", "render-tests/collator/resolved-locale": "Some test platforms don't resolve 'en' locale", "render-tests/collator/default": "Some test platforms don't resolve 'en' locale", "render-tests/custom-layer-js/depth": "skip - js specific", @@ -155,6 +156,8 @@ "render-tests/remove-feature-state/data-expression": "https://github.com/mapbox/mapbox-gl-native/issues/12413", "render-tests/remove-feature-state/default": "https://github.com/mapbox/mapbox-gl-native/issues/12413", "render-tests/remove-feature-state/vector-source": "https://github.com/mapbox/mapbox-gl-native/issues/12413", + "render-tests/regressions/mapbox-gl-js#8026": "skip - js specific", + "render-tests/fill-extrusion-geometry/linestring": "https://github.com/mapbox/mapbox-gl-native/pull/14240", "query-tests/remove-feature-state/default": "https://github.com/mapbox/mapbox-gl-native/issues/12413", "query-tests/fill-extrusion/base-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139", "query-tests/fill-extrusion/box-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139", @@ -164,6 +167,7 @@ "query-tests/fill-extrusion/sort-rotated": "https://github.com/mapbox/mapbox-gl-native/issues/13139", "query-tests/fill-extrusion/sort": "https://github.com/mapbox/mapbox-gl-native/issues/13139", "query-tests/fill-extrusion/top-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139", + "query-tests/regressions/mapbox-gl-js#7883": "https://github.com/mapbox/mapbox-gl-native/issues/14585", "expression-tests/number-format/currency": "https://github.com/mapbox/mapbox-gl-native/issues/13632", "expression-tests/number-format/default": "https://github.com/mapbox/mapbox-gl-native/issues/13632", "expression-tests/number-format/precision": "https://github.com/mapbox/mapbox-gl-native/issues/13632" |