[ios, macos] Optional properties are nullable

null_resettable semantics aren’t currently respected: #6095.

1 files changed, 29 insertions, 29 deletions

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