summaryrefslogtreecommitdiff
path: root/platform/darwin/src/MGLSymbolStyleLayer.h
diff options
context:
space:
mode:
authorAlexander Shalamov <alexander.shalamov@mapbox.com>2019-06-19 22:07:32 +0300
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2019-08-13 13:32:56 +0300
commit0ff218d688084146fee178ce52c17f346fa67198 (patch)
tree75378687211bc16b81ab68e9e2cc53ee3c5f8761 /platform/darwin/src/MGLSymbolStyleLayer.h
parentf94460041353be26eb7516d7006a2c83a4aa19f2 (diff)
downloadqtlocation-mapboxgl-0ff218d688084146fee178ce52c17f346fa67198.tar.gz
[darwin] Add plural override for 'text-writing-mode' layout property
Diffstat (limited to 'platform/darwin/src/MGLSymbolStyleLayer.h')
-rw-r--r--platform/darwin/src/MGLSymbolStyleLayer.h29
1 files changed, 18 insertions, 11 deletions
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/darwin/src/MGLSymbolStyleLayer.h
index bbb5dae905..cbbd4577d0 100644
--- a/platform/darwin/src/MGLSymbolStyleLayer.h
+++ b/platform/darwin/src/MGLSymbolStyleLayer.h
@@ -324,20 +324,20 @@ typedef NS_ENUM(NSUInteger, MGLTextTransform) {
["vertical"]` is set. The order of elements in an array define priority order
for the placement of an orientation variant.
- Values of this type are used in the `MGLSymbolStyleLayer.textWritingMode`
+ Values of this type are used in the `MGLSymbolStyleLayer.textWritingModes`
property.
*/
-typedef NS_ENUM(NSUInteger, MGLTextWritingMode) {
+typedef NS_ENUM(NSUInteger, MGLTextWritingModes) {
/**
If a text's language supports horizontal writing mode, symbols with point
placement would be laid out horizontally.
*/
- MGLTextWritingModeHorizontal,
+ MGLTextWritingModesHorizontal,
/**
If a text's language supports vertical writing mode, symbols with point
placement would be laid out vertically.
*/
- MGLTextWritingModeVertical,
+ MGLTextWritingModesVertical,
};
/**
@@ -1682,9 +1682,13 @@ MGL_EXPORT
`symbolPlacement` is set to an expression that evaluates to or
`MGLSymbolPlacementPoint`. Otherwise, it is ignored.
+ This attribute corresponds to the <a
+ href="https://www.mapbox.com/mapbox-gl-style-spec/#layout-symbol-text-writing-mode"><code>text-writing-mode</code></a>
+ layout property in the Mapbox Style Specification.
+
You can set this property to an expression containing any of the following:
- * Constant `MGLTextWritingMode` array values
+ * Constant `MGLTextWritingModes` array values
* Constant array, whose each element is any of the following constant string
values:
* `horizontal`: If a text's language supports horizontal writing mode,
@@ -1700,7 +1704,10 @@ MGL_EXPORT
`$zoomLevel` variable or applying interpolation or step functions to feature
attributes.
*/
-@property (nonatomic, null_resettable) NSExpression *textWritingMode;
+@property (nonatomic, null_resettable) NSExpression *textWritingModes;
+
+
+@property (nonatomic, null_resettable) NSExpression *textWritingMode __attribute__((unavailable("Use textWritingModes instead.")));
#pragma mark - Accessing the Paint Attributes
@@ -2439,17 +2446,17 @@ MGL_EXPORT
@property (readonly) MGLTextTransform MGLTextTransformValue;
/**
- Creates a new value object containing the given `MGLTextWritingMode` enumeration.
+ Creates a new value object containing the given `MGLTextWritingModes` enumeration.
- @param textWritingMode The value for the new object.
+ @param textWritingModes The value for the new object.
@return A new value object that contains the enumeration value.
*/
-+ (instancetype)valueWithMGLTextWritingMode:(MGLTextWritingMode)textWritingMode;
++ (instancetype)valueWithMGLTextWritingModes:(MGLTextWritingModes)textWritingModes;
/**
- The `MGLTextWritingMode` enumeration representation of the value.
+ The `MGLTextWritingModes` enumeration representation of the value.
*/
-@property (readonly) MGLTextWritingMode MGLTextWritingModeValue;
+@property (readonly) MGLTextWritingModes MGLTextWritingModesValue;
/**
Creates a new value object containing the given `MGLIconTranslationAnchor` enumeration.