diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-09-24 11:12:21 -0700 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2016-10-17 11:47:22 -0700 |
commit | 0c8a3feffa94a9594bcaa77fdc18d11a3c482ff5 (patch) | |
tree | 9570ab6ad86323a0dcea7616f91d8ca726cd6659 /platform/darwin/src/MGLLineStyleLayer.h | |
parent | ae96e78ccd293d12e28e54a9a727d29d05a37980 (diff) | |
download | qtlocation-mapboxgl-0c8a3feffa94a9594bcaa77fdc18d11a3c482ff5.tar.gz |
[ios, macos] Replaced MGLStyleAttributeValue with MGLStyleValue
MGLStyleValue is an umbrella class serving as a variant container for MGLStyleConstantValue and MGLStyleFunction. These classes use lightweight generics to indicate the underlying type. A templated C++ class concisely converts between mbgl::style::PropertyValue and MGLStyleValue.
Diffstat (limited to 'platform/darwin/src/MGLLineStyleLayer.h')
-rw-r--r-- | platform/darwin/src/MGLLineStyleLayer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLLineStyleLayer.h b/platform/darwin/src/MGLLineStyleLayer.h index 5fb9693e78..cee33e1388 100644 --- a/platform/darwin/src/MGLLineStyleLayer.h +++ b/platform/darwin/src/MGLLineStyleLayer.h @@ -3,6 +3,7 @@ #import "MGLStyleAttributeValue.h" #import "MGLVectorStyleLayer.h" +#import "MGLStyleAttributeFunction.h" NS_ASSUME_NONNULL_BEGIN @@ -84,7 +85,7 @@ typedef NS_ENUM(NSUInteger, MGLLineTranslateAnchor) { The default value of this property is an `NSValue` object containing `MGLLineJoinMiter`. Set this property to `nil` to reset it to the default value. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineJoin; +@property (nonatomic, null_resettable) MGLStyleValue <NSValue *> *lineJoin; /** Used to automatically convert miter joins to bevel joins for sharp angles. @@ -93,7 +94,7 @@ typedef NS_ENUM(NSUInteger, MGLLineTranslateAnchor) { This property is only applied to the style if `lineJoin` is set to an `NSValue` object containing `MGLLineJoinMiter`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> lineMiterLimit; +@property (nonatomic, null_resettable) MGLStyleValue <NSNumber *> *lineMiterLimit; /** Used to automatically convert round joins to miter joins for shallow angles. |