From 9d368ea98d096c1eed2c1eb7edc4a37ff31b03b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Thu, 25 Aug 2016 21:59:55 -0700 Subject: [ios, macos] Mark MGLStyleLayer properties null_resettable If the property is unset, return the default value. Fixes #6126. --- platform/darwin/src/MGLCircleStyleLayer.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'platform/darwin/src/MGLCircleStyleLayer.h') diff --git a/platform/darwin/src/MGLCircleStyleLayer.h b/platform/darwin/src/MGLCircleStyleLayer.h index f79b9bb9a5..4c51c453c7 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. - If this property is set to `nil`, the layer uses an implicit default value of `5`. + The default value of this property is `5`. Set this property to `nil` to reset it to the default value. */ -@property (nonatomic, nullable) id circleRadius; +@property (nonatomic, null_resettable) id circleRadius; /** The color of the circle. - If this property is set to `nil`, the layer uses an implicit default value of `blackColor`. + The default value of this property is `blackColor`. Set this property to `nil` to reset it to the default value. */ -@property (nonatomic, nullable) id circleColor; +@property (nonatomic, null_resettable) id circleColor; /** Amount to blur the circle. 1 blurs the circle such that only the centerpoint is full opacity. - If this property is set to `nil`, the layer uses an implicit default value of `0`. + The default value of this property is `0`. Set this property to `nil` to reset it to the default value. */ -@property (nonatomic, nullable) id circleBlur; +@property (nonatomic, null_resettable) id circleBlur; /** The opacity at which the circle will be drawn. - If this property is set to `nil`, the layer uses an implicit default value of `1`. + The default value of this property is `1`. Set this property to `nil` to reset it to the default value. */ -@property (nonatomic, nullable) id circleOpacity; +@property (nonatomic, null_resettable) id circleOpacity; /** The geometry's offset. Values are [x, y] where negatives indicate left and up, respectively. This property is measured in points. - 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. + 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 value. */ -@property (nonatomic, nullable) id circleTranslate; +@property (nonatomic, null_resettable) id circleTranslate; /** Control whether the translation is relative to the map (north) or viewport (screen) - If this property is set to `nil`, the layer uses an implicit default value of `MGLCircleStyleLayerCircleTranslateAnchorMap`. + The default value of this property is `MGLCircleStyleLayerCircleTranslateAnchorMap`. Set this property to `nil` to reset it to the default value. This property is only applied to the style if `circleTranslate` is non-`nil`. Otherwise, it is ignored. */ -@property (nonatomic, nullable) id circleTranslateAnchor; +@property (nonatomic, null_resettable) id 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. - If this property is set to `nil`, the layer uses an implicit default value of `MGLCircleStyleLayerCirclePitchScaleMap`. + The default value of this property is `MGLCircleStyleLayerCirclePitchScaleMap`. Set this property to `nil` to reset it to the default value. */ -@property (nonatomic, nullable) id circlePitchScale; +@property (nonatomic, null_resettable) id circlePitchScale; @end -- cgit v1.2.1