diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2017-01-05 03:22:04 -0800 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2017-01-07 15:46:53 -0800 |
commit | 17b3ec1edd217b8b14d64b74cbf58b0e4ae4f241 (patch) | |
tree | 8d7a22ac6f52d5f8463b7c17d609a7d70e784dd9 /platform/darwin/src/MGLCircleStyleLayer.mm | |
parent | d5d6bcee0f2f11cfccb3cc8ee7bc90c4f0ac74e7 (diff) | |
download | qtlocation-mapboxgl-17b3ec1edd217b8b14d64b74cbf58b0e4ae4f241.tar.gz |
[ios, macos] Renamed text-field, text-font, text-font-size, circle-pitch-scale
Reduced the likelihood that the developer might attempt to set textField to an NSTextField or UITextField, or textFont to an NSFont or UIFont, or textSize to a CGSize or NSSize, or circlePitchScale to a number (given iconScale).
Diffstat (limited to 'platform/darwin/src/MGLCircleStyleLayer.mm')
-rw-r--r-- | platform/darwin/src/MGLCircleStyleLayer.mm | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm index ecba9b01d3..c23658b518 100644 --- a/platform/darwin/src/MGLCircleStyleLayer.mm +++ b/platform/darwin/src/MGLCircleStyleLayer.mm @@ -11,9 +11,9 @@ #include <mbgl/style/layers/circle_layer.hpp> namespace mbgl { - MBGL_DEFINE_ENUM(MGLCirclePitchScale, { - { MGLCirclePitchScaleMap, "map" }, - { MGLCirclePitchScaleViewport, "viewport" }, + MBGL_DEFINE_ENUM(MGLCircleScaleAlignment, { + { MGLCircleScaleAlignmentMap, "map" }, + { MGLCircleScaleAlignmentViewport, "viewport" }, }); MBGL_DEFINE_ENUM(MGLCircleTranslateAnchor, { @@ -173,32 +173,37 @@ namespace mbgl { return MGLStyleValueTransformer<float, NSNumber *>().toStyleValue(propertyValue); } -- (void)setCirclePitchScale:(MGLStyleValue<NSValue *> *)circlePitchScale { +- (void)setCircleRadius:(MGLStyleValue<NSNumber *> *)circleRadius { MGLAssertStyleLayerIsValid(); - auto mbglValue = MGLStyleValueTransformer<mbgl::style::CirclePitchScaleType, NSValue *, mbgl::style::CirclePitchScaleType, MGLCirclePitchScale>().toEnumPropertyValue(circlePitchScale); - self.rawLayer->setCirclePitchScale(mbglValue); + auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue(circleRadius); + self.rawLayer->setCircleRadius(mbglValue); } -- (MGLStyleValue<NSValue *> *)circlePitchScale { +- (MGLStyleValue<NSNumber *> *)circleRadius { MGLAssertStyleLayerIsValid(); - auto propertyValue = self.rawLayer->getCirclePitchScale() ?: self.rawLayer->getDefaultCirclePitchScale(); - return MGLStyleValueTransformer<mbgl::style::CirclePitchScaleType, NSValue *, mbgl::style::CirclePitchScaleType, MGLCirclePitchScale>().toEnumStyleValue(propertyValue); + auto propertyValue = self.rawLayer->getCircleRadius() ?: self.rawLayer->getDefaultCircleRadius(); + return MGLStyleValueTransformer<float, NSNumber *>().toStyleValue(propertyValue); } -- (void)setCircleRadius:(MGLStyleValue<NSNumber *> *)circleRadius { +- (void)setCircleScaleAlignment:(MGLStyleValue<NSValue *> *)circleScaleAlignment { MGLAssertStyleLayerIsValid(); - auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue(circleRadius); - self.rawLayer->setCircleRadius(mbglValue); + auto mbglValue = MGLStyleValueTransformer<mbgl::style::CirclePitchScaleType, NSValue *, mbgl::style::CirclePitchScaleType, MGLCircleScaleAlignment>().toEnumPropertyValue(circleScaleAlignment); + self.rawLayer->setCirclePitchScale(mbglValue); } -- (MGLStyleValue<NSNumber *> *)circleRadius { +- (MGLStyleValue<NSValue *> *)circleScaleAlignment { MGLAssertStyleLayerIsValid(); - auto propertyValue = self.rawLayer->getCircleRadius() ?: self.rawLayer->getDefaultCircleRadius(); - return MGLStyleValueTransformer<float, NSNumber *>().toStyleValue(propertyValue); + auto propertyValue = self.rawLayer->getCirclePitchScale() ?: self.rawLayer->getDefaultCirclePitchScale(); + return MGLStyleValueTransformer<mbgl::style::CirclePitchScaleType, NSValue *, mbgl::style::CirclePitchScaleType, MGLCircleScaleAlignment>().toEnumStyleValue(propertyValue); +} + + +- (void)setCirclePitchScale:(MGLStyleValue<NSValue *> *)circlePitchScale { + NSAssert(NO, @"Use -setCircleScaleAlignment: instead."); } - (void)setCircleTranslate:(MGLStyleValue<NSValue *> *)circleTranslate { @@ -234,14 +239,14 @@ namespace mbgl { @implementation NSValue (MGLCircleStyleLayerAdditions) -+ (NSValue *)valueWithMGLCirclePitchScale:(MGLCirclePitchScale)circlePitchScale { - return [NSValue value:&circlePitchScale withObjCType:@encode(MGLCirclePitchScale)]; ++ (NSValue *)valueWithMGLCircleScaleAlignment:(MGLCircleScaleAlignment)circleScaleAlignment { + return [NSValue value:&circleScaleAlignment withObjCType:@encode(MGLCircleScaleAlignment)]; } -- (MGLCirclePitchScale)MGLCirclePitchScaleValue { - MGLCirclePitchScale circlePitchScale; - [self getValue:&circlePitchScale]; - return circlePitchScale; +- (MGLCircleScaleAlignment)MGLCircleScaleAlignmentValue { + MGLCircleScaleAlignment circleScaleAlignment; + [self getValue:&circleScaleAlignment]; + return circleScaleAlignment; } + (NSValue *)valueWithMGLCircleTranslateAnchor:(MGLCircleTranslateAnchor)circleTranslateAnchor { |