diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-08-19 14:32:50 -0700 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2016-08-19 14:32:50 -0700 |
commit | 7f1b325b0c8424d82a3de209a9bdee7a8602b1e0 (patch) | |
tree | dcbd38fde0513361e410b6fe7a6ccd974efb9bee | |
parent | 98787b37bfd334a4f921de46ac3d2320a3c8c49a (diff) | |
download | qtlocation-mapboxgl-7f1b325b0c8424d82a3de209a9bdee7a8602b1e0.tar.gz |
[ios, macos] Optional properties are nullable
null_resettable semantics aren’t currently respected: #6095.
-rw-r--r-- | platform/darwin/src/MGLBackgroundStyleLayer.h | 12 | ||||
-rw-r--r-- | platform/darwin/src/MGLCircleStyleLayer.h | 30 | ||||
-rw-r--r-- | platform/darwin/src/MGLFillStyleLayer.h | 30 | ||||
-rw-r--r-- | platform/darwin/src/MGLLineStyleLayer.h | 58 | ||||
-rw-r--r-- | platform/darwin/src/MGLRasterStyleLayer.h | 28 | ||||
-rw-r--r-- | platform/darwin/src/MGLStyleLayer.h.ejs | 10 | ||||
-rw-r--r-- | platform/darwin/src/MGLSymbolStyleLayer.h | 216 |
7 files changed, 192 insertions, 192 deletions
diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.h b/platform/darwin/src/MGLBackgroundStyleLayer.h index 544354d978..1310b6ed00 100644 --- a/platform/darwin/src/MGLBackgroundStyleLayer.h +++ b/platform/darwin/src/MGLBackgroundStyleLayer.h @@ -13,23 +13,23 @@ NS_ASSUME_NONNULL_BEGIN /** The color with which the background will be drawn. - The default value of this property is an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. + This property is only applied to the style if `backgroundPattern` is set to `nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> backgroundColor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> backgroundColor; /** Name of image in sprite to use for drawing an image background. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> backgroundPattern; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> backgroundPattern; /** The opacity at which the background will be drawn. - The default value of this property is `1`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `1`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> backgroundOpacity; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> backgroundOpacity; @end diff --git a/platform/darwin/src/MGLCircleStyleLayer.h b/platform/darwin/src/MGLCircleStyleLayer.h index af3ab3da6d..2cd9198ea4 100644 --- a/platform/darwin/src/MGLCircleStyleLayer.h +++ b/platform/darwin/src/MGLCircleStyleLayer.h @@ -25,55 +25,55 @@ typedef NS_ENUM(NSUInteger, MGLCircleStyleLayerCirclePitchScale) { This property is measured in points. - The default value of this property is `5`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `5`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> circleRadius; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> circleRadius; /** The color of the circle. - The default value of this property is an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> circleColor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> circleColor; /** Amount to blur the circle. 1 blurs the circle such that only the centerpoint is full opacity. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `0`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> circleBlur; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> circleBlur; /** The opacity at which the circle will be drawn. - The default value of this property is `1`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `1`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> circleOpacity; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> circleOpacity; /** The geometry's offset. Values are [x, y] where negatives indicate left and up, respectively. This property is measured in points. - The default value of this property is 0 points from the left and 0 points from the top. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of 0 points from the left and 0 points from the top. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> circleTranslate; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> circleTranslate; /** Control whether the translation is relative to the map (north) or viewport (screen) - The default value of this property is `MGLCircleStyleLayerCircleTranslateAnchorMap`. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of `MGLCircleStyleLayerCircleTranslateAnchorMap`. + This property is only applied to the style if `circleTranslate` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> circleTranslateAnchor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> circleTranslateAnchor; /** Controls the scaling behavior of the circle when the map is pitched. The value `MGLCircleStyleLayerCirclePitchScaleMap` scales circles according to their apparent distance to the camera. The value `MGLCircleStyleLayerCirclePitchScaleViewport` results in no pitch-related scaling. - The default value of this property is `MGLCircleStyleLayerCirclePitchScaleMap`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `MGLCircleStyleLayerCirclePitchScaleMap`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> circlePitchScale; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> circlePitchScale; @end diff --git a/platform/darwin/src/MGLFillStyleLayer.h b/platform/darwin/src/MGLFillStyleLayer.h index 26a438af30..dc724eb48a 100644 --- a/platform/darwin/src/MGLFillStyleLayer.h +++ b/platform/darwin/src/MGLFillStyleLayer.h @@ -18,55 +18,55 @@ typedef NS_ENUM(NSUInteger, MGLFillStyleLayerFillTranslateAnchor) { /** Whether or not the fill should be antialiased. - The default value of this property is `YES`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `YES`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillAntialias; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillAntialias; /** The opacity of the entire fill layer. In contrast to the fill-color, this value will also affect the 1pt stroke around the fill, if the stroke is used. - The default value of this property is `1`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `1`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillOpacity; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillOpacity; /** The color of the filled part of this layer. This color can be specified as rgba with an alpha component and the color's opacity will not affect the opacity of the 1pt stroke, if it is used. - The default value of this property is an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. + This property is only applied to the style if `fillPattern` is set to `nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillColor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillColor; /** The outline color of the fill. Matches the value of `fillColor` if unspecified. - + This property is only applied to the style if `fillPattern` is set to `nil`, and `fillAntialias` is set to `YES`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillOutlineColor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillOutlineColor; /** The geometry's offset. Values are [x, y] where negatives indicate left and up, respectively. This property is measured in points. - The default value of this property is 0 points from the left and 0 points from the top. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of 0 points from the left and 0 points from the top. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillTranslate; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillTranslate; /** Control whether the translation is relative to the map (north) or viewport (screen) - The default value of this property is `MGLFillStyleLayerFillTranslateAnchorMap`. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of `MGLFillStyleLayerFillTranslateAnchorMap`. + This property is only applied to the style if `fillTranslate` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillTranslateAnchor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillTranslateAnchor; /** Name of image in sprite to use for drawing image fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillPattern; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillPattern; @end diff --git a/platform/darwin/src/MGLLineStyleLayer.h b/platform/darwin/src/MGLLineStyleLayer.h index 6a8900b99c..6dda999047 100644 --- a/platform/darwin/src/MGLLineStyleLayer.h +++ b/platform/darwin/src/MGLLineStyleLayer.h @@ -30,120 +30,120 @@ typedef NS_ENUM(NSUInteger, MGLLineStyleLayerLineTranslateAnchor) { /** The display of line endings. - The default value of this property is `MGLLineStyleLayerLineCapButt`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `MGLLineStyleLayerLineCapButt`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineCap; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineCap; /** The display of lines when joining. - The default value of this property is `MGLLineStyleLayerLineJoinMiter`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `MGLLineStyleLayerLineJoinMiter`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineJoin; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineJoin; /** Used to automatically convert miter joins to bevel joins for sharp angles. - The default value of this property is `2`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `2`. This property is only applied to the style if `lineJoin` is set to `MGLLineStyleLayerLineJoinMiter`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineMiterLimit; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineMiterLimit; /** Used to automatically convert round joins to miter joins for shallow angles. - The default value of this property is `1.05`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `1.05`. This property is only applied to the style if `lineJoin` is set to `MGLLineStyleLayerLineJoinRound`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineRoundLimit; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineRoundLimit; #pragma mark - Accessing the Paint Attributes /** The opacity at which the line will be drawn. - The default value of this property is `1`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `1`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineOpacity; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineOpacity; /** The color with which the line will be drawn. - The default value of this property is an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. + This property is only applied to the style if `linePattern` is set to `nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineColor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineColor; /** The geometry's offset. Values are [x, y] where negatives indicate left and up, respectively. This property is measured in points. - The default value of this property is 0 points from the left and 0 points from the top. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of 0 points from the left and 0 points from the top. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineTranslate; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineTranslate; /** Control whether the translation is relative to the map (north) or viewport (screen) - The default value of this property is `MGLLineStyleLayerLineTranslateAnchorMap`. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of `MGLLineStyleLayerLineTranslateAnchorMap`. + This property is only applied to the style if `lineTranslate` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineTranslateAnchor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineTranslateAnchor; /** Stroke thickness. This property is measured in points. - The default value of this property is `1`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `1`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineWidth; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineWidth; /** Draws a line casing outside of a line's actual path. Value indicates the width of the inner gap. This property is measured in points. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `0`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineGapWidth; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineGapWidth; /** The line's offset perpendicular to its direction. Values may be positive or negative, where positive indicates "rightwards" (if you were moving in the direction of the line) and negative indicates "leftwards." This property is measured in points. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `0`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineOffset; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineOffset; /** Blur applied to the line, in points. This property is measured in points. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `0`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineBlur; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineBlur; /** Specifies the lengths of the alternating dashes and gaps that form the dash pattern. The lengths are later scaled by the line width. To convert a dash length to points, multiply the length by the current line width. This property is measured in line widths. - + This property is only applied to the style if `linePattern` is set to `nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineDasharray; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> lineDasharray; /** Name of image in sprite to use for drawing image lines. For seamless patterns, image width must be a factor of two (2, 4, 8, ..., 512). */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> linePattern; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> linePattern; @end diff --git a/platform/darwin/src/MGLRasterStyleLayer.h b/platform/darwin/src/MGLRasterStyleLayer.h index ef72ae3f0f..9284221cec 100644 --- a/platform/darwin/src/MGLRasterStyleLayer.h +++ b/platform/darwin/src/MGLRasterStyleLayer.h @@ -13,55 +13,55 @@ NS_ASSUME_NONNULL_BEGIN /** The opacity at which the image will be drawn. - The default value of this property is `1`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `1`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> rasterOpacity; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> rasterOpacity; /** Rotates hues around the color wheel. This property is measured in degrees. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `0`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> rasterHueRotate; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> rasterHueRotate; /** Increase or reduce the brightness of the image. The value is the minimum brightness. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `0`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> rasterBrightnessMin; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> rasterBrightnessMin; /** Increase or reduce the brightness of the image. The value is the maximum brightness. - The default value of this property is `1`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `1`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> rasterBrightnessMax; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> rasterBrightnessMax; /** Increase or reduce the saturation of the image. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `0`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> rasterSaturation; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> rasterSaturation; /** Increase or reduce the contrast of the image. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `0`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> rasterContrast; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> rasterContrast; /** Fade duration when a new tile is added. This property is measured in milliseconds. - The default value of this property is `300`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `300`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> rasterFadeDuration; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> rasterFadeDuration; @end diff --git a/platform/darwin/src/MGLStyleLayer.h.ejs b/platform/darwin/src/MGLStyleLayer.h.ejs index 700127f311..870c6a45c9 100644 --- a/platform/darwin/src/MGLStyleLayer.h.ejs +++ b/platform/darwin/src/MGLStyleLayer.h.ejs @@ -42,11 +42,11 @@ typedef NS_ENUM(NSUInteger, MGL<%- camelize(type) %>StyleLayer<%- camelize(prope /** <%- propertyDoc(property, type) %><% if ('default' in property) { %> - The default value of this property is <%= propertyDefault(property, type) %>.<% if (!property.required) { %> Set this property to `nil` to reset it to the default.<% } %><% } %><% if (property.requires) { %> + <% if (property.required) { %>The default value of this property is <%= propertyDefault(property, type) %>.<% } else { %>If this property is set to `nil`, the layer uses an implicit default value of <%= propertyDefault(property, type) %>.<% } %><% } %><% if (property.requires) { %> <%= propertyReqs(property, layoutPropertiesByName, type) %><% } %> */ -@property (nonatomic<% if (!property.required) { %>, null_resettable<% } %>) <%- propertyType(property, false, type) %> <%- camelizeWithLeadingLowercase(property.name) %>; +@property (nonatomic<% if (!property.required) { %>, nullable<% } %>) <%- propertyType(property, false, type) %> <%- camelizeWithLeadingLowercase(property.name) %>; <% } -%> <% } -%> @@ -56,11 +56,11 @@ typedef NS_ENUM(NSUInteger, MGL<%- camelize(type) %>StyleLayer<%- camelize(prope /** <%- propertyDoc(property, type) %><% if ('default' in property) { %> - The default value of this property is <%= propertyDefault(property, type) %>.<% if (!property.required) { %> Set this property to `nil` to reset it to the default.<% } %><% } %><% if (property.requires) { %> - + <% if (property.required) { %>The default value of this property is <%= propertyDefault(property, type) %>.<% } else { %>If this property is set to `nil`, the layer uses an implicit default value of <%= propertyDefault(property, type) %>.<% } %><% } %><% if (property.requires) { %> + <%= propertyReqs(property, paintPropertiesByName, type) %><% } %> */ -@property (nonatomic<% if (!property.required) { %>, null_resettable<% } %>) <%- propertyType(property, false, type) %> <%- camelizeWithLeadingLowercase(property.name) %>; +@property (nonatomic<% if (!property.required) { %>, nullable<% } %>) <%- propertyType(property, false, type) %> <%- camelizeWithLeadingLowercase(property.name) %>; <% } -%> @end diff --git a/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/darwin/src/MGLSymbolStyleLayer.h index 65bab34b96..d77488bdca 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.h +++ b/platform/darwin/src/MGLSymbolStyleLayer.h @@ -74,460 +74,460 @@ typedef NS_ENUM(NSUInteger, MGLSymbolStyleLayerTextTranslateAnchor) { /** Label placement relative to its geometry. `MGLSymbolStyleLayerSymbolPlacementLine` can only be used on LineStrings and Polygons. - The default value of this property is `MGLSymbolStyleLayerSymbolPlacementPoint`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `MGLSymbolStyleLayerSymbolPlacementPoint`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> symbolPlacement; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> symbolPlacement; /** Distance between two symbol anchors. This property is measured in points. - The default value of this property is `250`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `250`. This property is only applied to the style if `symbolPlacement` is set to `MGLSymbolStyleLayerSymbolPlacementLine`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> symbolSpacing; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> symbolSpacing; /** 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. - The default value of this property is `NO`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `NO`. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> symbolAvoidEdges; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> symbolAvoidEdges; /** If true, the icon will be visible even if it collides with other previously drawn symbols. - The default value of this property is `NO`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `NO`. This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconAllowOverlap; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconAllowOverlap; /** If true, other symbols can be visible even if they collide with the icon. - The default value of this property is `NO`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `NO`. This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconIgnorePlacement; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconIgnorePlacement; /** If true, text will display without their corresponding icons when the icon collides with other symbols and the text does not. - The default value of this property is `NO`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `NO`. This property is only applied to the style if `iconImage` is non-`nil`, and `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconOptional; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconOptional; /** Orientation of icon when map is rotated. - The default value of this property is `MGLSymbolStyleLayerIconRotationAlignmentViewport`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `MGLSymbolStyleLayerIconRotationAlignmentViewport`. This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconRotationAlignment; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconRotationAlignment; /** Scale factor for icon. 1 is original size, 3 triples the size. - The default value of this property is `1`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `1`. This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconSize; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconSize; /** Position and scale an icon by the its corresponding text. - The default value of this property is `MGLSymbolStyleLayerIconTextFitNone`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `MGLSymbolStyleLayerIconTextFitNone`. This property is only applied to the style if `iconImage` is non-`nil`, and `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconTextFit; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconTextFit; /** Size of padding area around the text-fit size in clockwise order: top, right, bottom, left. This property is measured in points. - The default value of this property is 0 points on the top, 0 points on the right, 0 points on the bottom, and 0 points on the left. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of 0 points on the top, 0 points on the right, 0 points on the bottom, and 0 points on the left. This property is only applied to the style if `iconImage` is non-`nil`, and `iconTextFit` is non-`nil`, and `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconTextFitPadding; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconTextFitPadding; /** A string with {tokens} replaced, referencing the data property to pull from. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconImage; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconImage; /** Rotates the icon clockwise. This property is measured in degrees. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `0`. This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconRotate; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconRotate; /** Size of the additional area around the icon bounding box used for detecting symbol collisions. This property is measured in points. - The default value of this property is `2`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `2`. This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconPadding; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconPadding; /** If true, the icon may be flipped to prevent it from being rendered upside-down. - The default value of this property is `NO`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `NO`. This property is only applied to the style if `iconImage` is non-`nil`, and `iconRotationAlignment` is set to `MGLSymbolStyleLayerIconRotationAlignmentMap`, and `symbolPlacement` is set to `MGLSymbolStyleLayerSymbolPlacementLine`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconKeepUpright; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconKeepUpright; /** Offset distance of icon from its anchor. Positive values indicate right and down, while negative values indicate left and up. - The default value of this property is 0 from the left and 0 from the top. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of 0 from the left and 0 from the top. This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconOffset; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconOffset; /** Aligns text to the plane of the `MGLSymbolStyleLayerTextPitchAlignmentViewport` or the `MGLSymbolStyleLayerTextPitchAlignmentMap` when the map is pitched. Matches `textRotationAlignment` if unspecified. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textPitchAlignment; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textPitchAlignment; /** Orientation of text when map is rotated. - The default value of this property is `MGLSymbolStyleLayerTextRotationAlignmentViewport`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `MGLSymbolStyleLayerTextRotationAlignmentViewport`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textRotationAlignment; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textRotationAlignment; /** Value to use for a text label. Feature properties are specified using tokens like {field_name}. - The default value of this property is ``. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of ``. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textField; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textField; /** Font stack to use for displaying text. - The default value of this property is `Open Sans Regular`, `Arial Unicode MS Regular`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `Open Sans Regular`, `Arial Unicode MS Regular`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textFont; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textFont; /** Font size. This property is measured in points. - The default value of this property is `16`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `16`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textSize; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textSize; /** The maximum line width for text wrapping. This property is measured in ems. - The default value of this property is `10`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `10`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textMaxWidth; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textMaxWidth; /** Text leading value for multi-line text. This property is measured in ems. - The default value of this property is `1.2`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `1.2`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textLineHeight; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textLineHeight; /** Text tracking amount. This property is measured in ems. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `0`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textLetterSpacing; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textLetterSpacing; /** Text justification options. - The default value of this property is `MGLSymbolStyleLayerTextJustifyCenter`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `MGLSymbolStyleLayerTextJustifyCenter`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textJustify; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textJustify; /** Part of the text placed closest to the anchor. - The default value of this property is `MGLSymbolStyleLayerTextAnchorCenter`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `MGLSymbolStyleLayerTextAnchorCenter`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textAnchor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textAnchor; /** Maximum angle change between adjacent characters. This property is measured in degrees. - The default value of this property is `45`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `45`. This property is only applied to the style if `textField` is non-`nil`, and `symbolPlacement` is set to `MGLSymbolStyleLayerSymbolPlacementLine`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textMaxAngle; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textMaxAngle; /** Rotates the text clockwise. This property is measured in degrees. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `0`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textRotate; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textRotate; /** Size of the additional area around the text bounding box used for detecting symbol collisions. This property is measured in points. - The default value of this property is `2`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `2`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textPadding; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textPadding; /** If true, the text may be flipped vertically to prevent it from being rendered upside-down. - The default value of this property is `YES`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `YES`. This property is only applied to the style if `textField` is non-`nil`, and `textRotationAlignment` is set to `MGLSymbolStyleLayerTextRotationAlignmentMap`, and `symbolPlacement` is set to `MGLSymbolStyleLayerSymbolPlacementLine`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textKeepUpright; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textKeepUpright; /** Specifies how to capitalize text, similar to the CSS `text-transform` property. - The default value of this property is `MGLSymbolStyleLayerTextTransformNone`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `MGLSymbolStyleLayerTextTransformNone`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textTransform; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textTransform; /** Offset distance of text from its anchor. Positive values indicate right and down, while negative values indicate left and up. This property is measured in ems. - The default value of this property is 0 ems from the left and 0 ems from the top. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of 0 ems from the left and 0 ems from the top. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textOffset; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textOffset; /** If true, the text will be visible even if it collides with other previously drawn symbols. - The default value of this property is `NO`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `NO`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textAllowOverlap; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textAllowOverlap; /** If true, other symbols can be visible even if they collide with the text. - The default value of this property is `NO`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `NO`. This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textIgnorePlacement; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textIgnorePlacement; /** If true, icons will display without their corresponding text when the text collides with other symbols and the icon does not. - The default value of this property is `NO`. Set this property to `nil` to reset it to the default. + If this property is set to `nil`, the layer uses an implicit default value of `NO`. This property is only applied to the style if `textField` is non-`nil`, and `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textOptional; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textOptional; #pragma mark - Accessing the Paint Attributes /** The opacity at which the icon will be drawn. - The default value of this property is `1`. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of `1`. + This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconOpacity; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconOpacity; /** The color of the icon. This can only be used with sdf icons. - The default value of this property is an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. + This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconColor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconColor; /** The color of the icon's halo. Icon halos can only be used with sdf icons. - The default value of this property is an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 0. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 0. + This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconHaloColor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconHaloColor; /** Distance of halo to the icon outline. This property is measured in points. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of `0`. + This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconHaloWidth; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconHaloWidth; /** Fade out the halo towards the outside. This property is measured in points. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of `0`. + This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconHaloBlur; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconHaloBlur; /** Distance that the icon's anchor is moved from its original placement. Positive values indicate right and down, while negative values indicate left and up. This property is measured in points. - The default value of this property is 0 points from the left and 0 points from the top. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of 0 points from the left and 0 points from the top. + This property is only applied to the style if `iconImage` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconTranslate; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconTranslate; /** Control whether the translation is relative to the map (north) or viewport (screen). - The default value of this property is `MGLSymbolStyleLayerIconTranslateAnchorMap`. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of `MGLSymbolStyleLayerIconTranslateAnchorMap`. + This property is only applied to the style if `iconImage` is non-`nil`, and `iconTranslate` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> iconTranslateAnchor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> iconTranslateAnchor; /** The opacity at which the text will be drawn. - The default value of this property is `1`. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of `1`. + This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textOpacity; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textOpacity; /** The color with which the text will be drawn. - The default value of this property is an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. + This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textColor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textColor; /** The color of the text's halo, which helps it stand out from backgrounds. - The default value of this property is an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 0. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 0. + This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textHaloColor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textHaloColor; /** Distance of halo to the font outline. Max text halo width is 1/4 of the font-size. This property is measured in points. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of `0`. + This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textHaloWidth; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textHaloWidth; /** The halo's fadeout distance towards the outside. This property is measured in points. - The default value of this property is `0`. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of `0`. + This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textHaloBlur; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textHaloBlur; /** Distance that the text's anchor is moved from its original placement. Positive values indicate right and down, while negative values indicate left and up. This property is measured in points. - The default value of this property is 0 points from the left and 0 points from the top. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of 0 points from the left and 0 points from the top. + This property is only applied to the style if `textField` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textTranslate; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textTranslate; /** Control whether the translation is relative to the map (north) or viewport (screen). - The default value of this property is `MGLSymbolStyleLayerTextTranslateAnchorMap`. Set this property to `nil` to reset it to the default. - + If this property is set to `nil`, the layer uses an implicit default value of `MGLSymbolStyleLayerTextTranslateAnchorMap`. + This property is only applied to the style if `textField` is non-`nil`, and `textTranslate` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> textTranslateAnchor; +@property (nonatomic, nullable) id <MGLStyleAttributeValue> textTranslateAnchor; @end |