diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-08-25 21:59:55 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-08-26 15:40:10 -0700 |
| commit | 9d368ea98d096c1eed2c1eb7edc4a37ff31b03b7 (patch) | |
| tree | 602b5aaf36a8d3db50e14b58e668f53ffe8d99a0 /platform/darwin/src/MGLCircleStyleLayer.mm | |
| parent | 8dff7ab2f0fe1f2d1412e79c99285f1a389e6541 (diff) | |
| download | qtlocation-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.mm')
| -rw-r--r-- | platform/darwin/src/MGLCircleStyleLayer.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm index d18a89833d..27be01505c 100644 --- a/platform/darwin/src/MGLCircleStyleLayer.mm +++ b/platform/darwin/src/MGLCircleStyleLayer.mm @@ -37,7 +37,7 @@ } - (id <MGLStyleAttributeValue>)circleRadius { - return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getCircleRadius()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getCircleRadius() ?: self.layer->getDefaultCircleRadius()]; } - (void)setCircleColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleColor { @@ -46,7 +46,7 @@ } - (id <MGLStyleAttributeValue>)circleColor { - return [MGLStyleAttribute mbgl_colorWithPropertyValueColor:self.layer->getCircleColor()]; + return [MGLStyleAttribute mbgl_colorWithPropertyValueColor:self.layer->getCircleColor() ?: self.layer->getDefaultCircleColor()]; } - (void)setCircleBlur:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleBlur { @@ -55,7 +55,7 @@ } - (id <MGLStyleAttributeValue>)circleBlur { - return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getCircleBlur()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getCircleBlur() ?: self.layer->getDefaultCircleBlur()]; } - (void)setCircleOpacity:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleOpacity { @@ -64,7 +64,7 @@ } - (id <MGLStyleAttributeValue>)circleOpacity { - return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getCircleOpacity()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getCircleOpacity() ?: self.layer->getDefaultCircleOpacity()]; } - (void)setCircleTranslate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleTranslate { @@ -73,7 +73,7 @@ } - (id <MGLStyleAttributeValue>)circleTranslate { - return [MGLStyleAttribute mbgl_offsetWithPropertyValueOffset:self.layer->getCircleTranslate()]; + return [MGLStyleAttribute mbgl_offsetWithPropertyValueOffset:self.layer->getCircleTranslate() ?: self.layer->getDefaultCircleTranslate()]; } - (void)setCircleTranslateAnchor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleTranslateAnchor { |