summaryrefslogtreecommitdiff
path: root/platform/darwin/src/MGLCircleStyleLayer.h
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-08-25 21:59:55 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-08-26 15:40:10 -0700
commit9d368ea98d096c1eed2c1eb7edc4a37ff31b03b7 (patch)
tree602b5aaf36a8d3db50e14b58e668f53ffe8d99a0 /platform/darwin/src/MGLCircleStyleLayer.h
parent8dff7ab2f0fe1f2d1412e79c99285f1a389e6541 (diff)
downloadqtlocation-mapboxgl-9d368ea98d096c1eed2c1eb7edc4a37ff31b03b7.tar.gz
[ios, macos] Mark MGLStyleLayer properties null_resettable
If the property is unset, return the default value. Fixes #6126.
Diffstat (limited to 'platform/darwin/src/MGLCircleStyleLayer.h')
-rw-r--r--platform/darwin/src/MGLCircleStyleLayer.h28
1 files changed, 14 insertions, 14 deletions
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 <MGLStyleAttributeValue> circleRadius;
+@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> 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 <MGLStyleAttributeValue> circleColor;
+@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> 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 <MGLStyleAttributeValue> circleBlur;
+@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> 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 <MGLStyleAttributeValue> circleOpacity;
+@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> 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 <MGLStyleAttributeValue> circleTranslate;
+@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> 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 <MGLStyleAttributeValue> circleTranslateAnchor;
+@property (nonatomic, null_resettable) 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.
- 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 <MGLStyleAttributeValue> circlePitchScale;
+@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> circlePitchScale;
@end