diff options
author | Fredrik Karlsson <bjorn.fredrik.karlsson@gmail.com> | 2016-08-12 10:33:20 -0400 |
---|---|---|
committer | Fredrik Karlsson <bjorn.fredrik.karlsson@gmail.com> | 2016-08-18 14:26:04 +0200 |
commit | 9dc252f2f97d1598583213cad1ead6920d255869 (patch) | |
tree | 8cba6078a9654b6cb8c8d1b52b1f4e9a8b4e167b /platform/darwin | |
parent | c55b9ca0f8823456dcc770169a6f99431e1e9a0c (diff) | |
download | qtlocation-mapboxgl-9dc252f2f97d1598583213cad1ead6920d255869.tar.gz |
[ios, macos] fixes #5958 naming conventions
Diffstat (limited to 'platform/darwin')
-rw-r--r-- | platform/darwin/scripts/generate-style-code.js | 10 | ||||
-rw-r--r-- | platform/darwin/src/MGLBackgroundStyleLayer.mm | 6 | ||||
-rw-r--r-- | platform/darwin/src/MGLCircleStyleLayer.mm | 10 | ||||
-rw-r--r-- | platform/darwin/src/MGLFillStyleLayer.mm | 12 | ||||
-rw-r--r-- | platform/darwin/src/MGLLineStyleLayer.mm | 22 | ||||
-rw-r--r-- | platform/darwin/src/MGLRasterStyleLayer.mm | 14 | ||||
-rw-r--r-- | platform/darwin/src/MGLStyleAttribute.h | 16 | ||||
-rw-r--r-- | platform/darwin/src/MGLStyleAttribute.mm | 16 | ||||
-rw-r--r-- | platform/darwin/src/MGLSymbolStyleLayer.mm | 76 |
9 files changed, 91 insertions, 91 deletions
diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js index e28b4c0d11..04bddbc474 100644 --- a/platform/darwin/scripts/generate-style-code.js +++ b/platform/darwin/scripts/generate-style-code.js @@ -145,16 +145,16 @@ global.arraySetterImplementation = function(property) { global.getterImplementation = function(property, layerType) { switch (property.type) { case 'boolean': - return `return [MGLStyleAttribute mbgl_boolPropertyValueWith:self.layer->get${camelize(property.name)}()];` + return `return [MGLStyleAttribute mbgl_boolWithPropertyValueBool:self.layer->get${camelize(property.name)}()];` case 'number': - return `return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->get${camelize(property.name)}()];` + return `return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->get${camelize(property.name)}()];` case 'string': - return `return [MGLStyleAttribute mbgl_stringPropertyValueWith:self.layer->get${camelize(property.name)}()];` + return `return [MGLStyleAttribute mbgl_stringWithPropertyValueString:self.layer->get${camelize(property.name)}()];` case 'enum': var objCType = `${prefix}${camelize(layerType)}${suffix}${camelize(property.name)}`; return `MGLGetEnumProperty(${camelize(property.name)}, ${mbglType(property)}, ${objCType});`; case 'color': - return `return [MGLStyleAttribute mbgl_colorPropertyValueWith:self.layer->get${camelize(property.name)}()];` + return `return [MGLStyleAttribute mbgl_colorWithPropertyValueColor:self.layer->get${camelize(property.name)}()];` case 'array': return arrayGetterImplementation(property); default: @@ -163,7 +163,7 @@ global.getterImplementation = function(property, layerType) { } global.arrayGetterImplementation = function(property) { - return `return [MGLStyleAttribute mbgl_${convertedType(property)}PropertyValueWith:self.layer->get${camelize(property.name)}()];` + return `return [MGLStyleAttribute mbgl_${convertedType(property)}WithPropertyValue${camelize(convertedType(property))}:self.layer->get${camelize(property.name)}()];` } global.convertedType = function(property) { diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.mm b/platform/darwin/src/MGLBackgroundStyleLayer.mm index 5ba581869b..1a991a65e9 100644 --- a/platform/darwin/src/MGLBackgroundStyleLayer.mm +++ b/platform/darwin/src/MGLBackgroundStyleLayer.mm @@ -37,7 +37,7 @@ } - (id <MGLStyleAttributeValue>)backgroundColor { - return [MGLStyleAttribute mbgl_colorPropertyValueWith:self.layer->getBackgroundColor()]; + return [MGLStyleAttribute mbgl_colorWithPropertyValueColor:self.layer->getBackgroundColor()]; } - (void)setBackgroundPattern:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)backgroundPattern { @@ -46,7 +46,7 @@ } - (id <MGLStyleAttributeValue>)backgroundPattern { - return [MGLStyleAttribute mbgl_stringPropertyValueWith:self.layer->getBackgroundPattern()]; + return [MGLStyleAttribute mbgl_stringWithPropertyValueString:self.layer->getBackgroundPattern()]; } - (void)setBackgroundOpacity:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)backgroundOpacity { @@ -55,7 +55,7 @@ } - (id <MGLStyleAttributeValue>)backgroundOpacity { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getBackgroundOpacity()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getBackgroundOpacity()]; } @end diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm index d655297131..d18a89833d 100644 --- a/platform/darwin/src/MGLCircleStyleLayer.mm +++ b/platform/darwin/src/MGLCircleStyleLayer.mm @@ -37,7 +37,7 @@ } - (id <MGLStyleAttributeValue>)circleRadius { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getCircleRadius()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getCircleRadius()]; } - (void)setCircleColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleColor { @@ -46,7 +46,7 @@ } - (id <MGLStyleAttributeValue>)circleColor { - return [MGLStyleAttribute mbgl_colorPropertyValueWith:self.layer->getCircleColor()]; + return [MGLStyleAttribute mbgl_colorWithPropertyValueColor:self.layer->getCircleColor()]; } - (void)setCircleBlur:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleBlur { @@ -55,7 +55,7 @@ } - (id <MGLStyleAttributeValue>)circleBlur { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getCircleBlur()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getCircleBlur()]; } - (void)setCircleOpacity:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleOpacity { @@ -64,7 +64,7 @@ } - (id <MGLStyleAttributeValue>)circleOpacity { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getCircleOpacity()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getCircleOpacity()]; } - (void)setCircleTranslate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleTranslate { @@ -73,7 +73,7 @@ } - (id <MGLStyleAttributeValue>)circleTranslate { - return [MGLStyleAttribute mbgl_offsetPropertyValueWith:self.layer->getCircleTranslate()]; + return [MGLStyleAttribute mbgl_offsetWithPropertyValueOffset:self.layer->getCircleTranslate()]; } - (void)setCircleTranslateAnchor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleTranslateAnchor { diff --git a/platform/darwin/src/MGLFillStyleLayer.mm b/platform/darwin/src/MGLFillStyleLayer.mm index a9c771827f..8a71a186c5 100644 --- a/platform/darwin/src/MGLFillStyleLayer.mm +++ b/platform/darwin/src/MGLFillStyleLayer.mm @@ -37,7 +37,7 @@ } - (id <MGLStyleAttributeValue>)fillAntialias { - return [MGLStyleAttribute mbgl_boolPropertyValueWith:self.layer->getFillAntialias()]; + return [MGLStyleAttribute mbgl_boolWithPropertyValueBool:self.layer->getFillAntialias()]; } - (void)setFillOpacity:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)fillOpacity { @@ -46,7 +46,7 @@ } - (id <MGLStyleAttributeValue>)fillOpacity { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getFillOpacity()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getFillOpacity()]; } - (void)setFillColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)fillColor { @@ -55,7 +55,7 @@ } - (id <MGLStyleAttributeValue>)fillColor { - return [MGLStyleAttribute mbgl_colorPropertyValueWith:self.layer->getFillColor()]; + return [MGLStyleAttribute mbgl_colorWithPropertyValueColor:self.layer->getFillColor()]; } - (void)setFillOutlineColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)fillOutlineColor { @@ -64,7 +64,7 @@ } - (id <MGLStyleAttributeValue>)fillOutlineColor { - return [MGLStyleAttribute mbgl_colorPropertyValueWith:self.layer->getFillOutlineColor()]; + return [MGLStyleAttribute mbgl_colorWithPropertyValueColor:self.layer->getFillOutlineColor()]; } - (void)setFillTranslate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)fillTranslate { @@ -73,7 +73,7 @@ } - (id <MGLStyleAttributeValue>)fillTranslate { - return [MGLStyleAttribute mbgl_offsetPropertyValueWith:self.layer->getFillTranslate()]; + return [MGLStyleAttribute mbgl_offsetWithPropertyValueOffset:self.layer->getFillTranslate()]; } - (void)setFillTranslateAnchor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)fillTranslateAnchor { @@ -91,7 +91,7 @@ } - (id <MGLStyleAttributeValue>)fillPattern { - return [MGLStyleAttribute mbgl_stringPropertyValueWith:self.layer->getFillPattern()]; + return [MGLStyleAttribute mbgl_stringWithPropertyValueString:self.layer->getFillPattern()]; } @end diff --git a/platform/darwin/src/MGLLineStyleLayer.mm b/platform/darwin/src/MGLLineStyleLayer.mm index b4ab97e679..281764242c 100644 --- a/platform/darwin/src/MGLLineStyleLayer.mm +++ b/platform/darwin/src/MGLLineStyleLayer.mm @@ -55,7 +55,7 @@ } - (id <MGLStyleAttributeValue>)lineMiterLimit { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getLineMiterLimit()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getLineMiterLimit()]; } - (void)setLineRoundLimit:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineRoundLimit { @@ -64,7 +64,7 @@ } - (id <MGLStyleAttributeValue>)lineRoundLimit { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getLineRoundLimit()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getLineRoundLimit()]; } #pragma mark - Accessing the Paint Attributes @@ -75,7 +75,7 @@ } - (id <MGLStyleAttributeValue>)lineOpacity { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getLineOpacity()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getLineOpacity()]; } - (void)setLineColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineColor { @@ -84,7 +84,7 @@ } - (id <MGLStyleAttributeValue>)lineColor { - return [MGLStyleAttribute mbgl_colorPropertyValueWith:self.layer->getLineColor()]; + return [MGLStyleAttribute mbgl_colorWithPropertyValueColor:self.layer->getLineColor()]; } - (void)setLineTranslate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineTranslate { @@ -93,7 +93,7 @@ } - (id <MGLStyleAttributeValue>)lineTranslate { - return [MGLStyleAttribute mbgl_offsetPropertyValueWith:self.layer->getLineTranslate()]; + return [MGLStyleAttribute mbgl_offsetWithPropertyValueOffset:self.layer->getLineTranslate()]; } - (void)setLineTranslateAnchor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineTranslateAnchor { @@ -111,7 +111,7 @@ } - (id <MGLStyleAttributeValue>)lineWidth { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getLineWidth()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getLineWidth()]; } - (void)setLineGapWidth:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineGapWidth { @@ -120,7 +120,7 @@ } - (id <MGLStyleAttributeValue>)lineGapWidth { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getLineGapWidth()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getLineGapWidth()]; } - (void)setLineOffset:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineOffset { @@ -129,7 +129,7 @@ } - (id <MGLStyleAttributeValue>)lineOffset { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getLineOffset()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getLineOffset()]; } - (void)setLineBlur:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineBlur { @@ -138,7 +138,7 @@ } - (id <MGLStyleAttributeValue>)lineBlur { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getLineBlur()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getLineBlur()]; } - (void)setLineDasharray:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineDasharray { @@ -147,7 +147,7 @@ } - (id <MGLStyleAttributeValue>)lineDasharray { - return [MGLStyleAttribute mbgl_numberArrayPropertyValueWith:self.layer->getLineDasharray()]; + return [MGLStyleAttribute mbgl_numberArrayWithPropertyValueNumberArray:self.layer->getLineDasharray()]; } - (void)setLinePattern:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)linePattern { @@ -156,7 +156,7 @@ } - (id <MGLStyleAttributeValue>)linePattern { - return [MGLStyleAttribute mbgl_stringPropertyValueWith:self.layer->getLinePattern()]; + return [MGLStyleAttribute mbgl_stringWithPropertyValueString:self.layer->getLinePattern()]; } @end diff --git a/platform/darwin/src/MGLRasterStyleLayer.mm b/platform/darwin/src/MGLRasterStyleLayer.mm index c15ebd1d45..291b7d60d8 100644 --- a/platform/darwin/src/MGLRasterStyleLayer.mm +++ b/platform/darwin/src/MGLRasterStyleLayer.mm @@ -37,7 +37,7 @@ } - (id <MGLStyleAttributeValue>)rasterOpacity { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getRasterOpacity()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getRasterOpacity()]; } - (void)setRasterHueRotate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterHueRotate { @@ -46,7 +46,7 @@ } - (id <MGLStyleAttributeValue>)rasterHueRotate { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getRasterHueRotate()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getRasterHueRotate()]; } - (void)setRasterBrightnessMin:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterBrightnessMin { @@ -55,7 +55,7 @@ } - (id <MGLStyleAttributeValue>)rasterBrightnessMin { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getRasterBrightnessMin()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getRasterBrightnessMin()]; } - (void)setRasterBrightnessMax:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterBrightnessMax { @@ -64,7 +64,7 @@ } - (id <MGLStyleAttributeValue>)rasterBrightnessMax { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getRasterBrightnessMax()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getRasterBrightnessMax()]; } - (void)setRasterSaturation:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterSaturation { @@ -73,7 +73,7 @@ } - (id <MGLStyleAttributeValue>)rasterSaturation { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getRasterSaturation()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getRasterSaturation()]; } - (void)setRasterContrast:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterContrast { @@ -82,7 +82,7 @@ } - (id <MGLStyleAttributeValue>)rasterContrast { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getRasterContrast()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getRasterContrast()]; } - (void)setRasterFadeDuration:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterFadeDuration { @@ -91,7 +91,7 @@ } - (id <MGLStyleAttributeValue>)rasterFadeDuration { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getRasterFadeDuration()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getRasterFadeDuration()]; } @end diff --git a/platform/darwin/src/MGLStyleAttribute.h b/platform/darwin/src/MGLStyleAttribute.h index 4f2424201e..564f44ad00 100644 --- a/platform/darwin/src/MGLStyleAttribute.h +++ b/platform/darwin/src/MGLStyleAttribute.h @@ -6,20 +6,20 @@ @interface MGLStyleAttribute : NSObject <MGLStyleAttributeValue> -+ (id <MGLStyleAttributeValue>)mbgl_colorPropertyValueWith:(mbgl::style::PropertyValue<mbgl::Color>)property; ++ (id <MGLStyleAttributeValue>)mbgl_colorWithPropertyValueColor:(mbgl::style::PropertyValue<mbgl::Color>)property; -+ (id <MGLStyleAttributeValue>)mbgl_numberPropertyValueWith:(mbgl::style::PropertyValue<float>)property; ++ (id <MGLStyleAttributeValue>)mbgl_numberWithPropertyValueNumber:(mbgl::style::PropertyValue<float>)property; -+ (id <MGLStyleAttributeValue>)mbgl_boolPropertyValueWith:(mbgl::style::PropertyValue<bool>)property; ++ (id <MGLStyleAttributeValue>)mbgl_boolWithPropertyValueBool:(mbgl::style::PropertyValue<bool>)property; -+ (id <MGLStyleAttributeValue>)mbgl_stringPropertyValueWith:(mbgl::style::PropertyValue<std::string>)property; ++ (id <MGLStyleAttributeValue>)mbgl_stringWithPropertyValueString:(mbgl::style::PropertyValue<std::string>)property; -+ (id <MGLStyleAttributeValue>)mbgl_offsetPropertyValueWith:(mbgl::style::PropertyValue<std::array<float, 2>>)property; ++ (id <MGLStyleAttributeValue>)mbgl_offsetWithPropertyValueOffset:(mbgl::style::PropertyValue<std::array<float, 2>>)property; -+ (id <MGLStyleAttributeValue>)mbgl_paddingPropertyValueWith:(mbgl::style::PropertyValue<std::array<float, 4>>)property; ++ (id <MGLStyleAttributeValue>)mbgl_paddingWithPropertyValuePadding:(mbgl::style::PropertyValue<std::array<float, 4>>)property; -+ (id <MGLStyleAttributeValue>)mbgl_stringArrayPropertyValueWith:(mbgl::style::PropertyValue<std::vector<std::string>>)property; ++ (id <MGLStyleAttributeValue>)mbgl_stringArrayWithPropertyValueStringArray:(mbgl::style::PropertyValue<std::vector<std::string>>)property; -+ (id <MGLStyleAttributeValue>)mbgl_numberArrayPropertyValueWith:(mbgl::style::PropertyValue<std::vector<float>>)property; ++ (id <MGLStyleAttributeValue>)mbgl_numberArrayWithPropertyValueNumberArray:(mbgl::style::PropertyValue<std::vector<float>>)property; @end diff --git a/platform/darwin/src/MGLStyleAttribute.mm b/platform/darwin/src/MGLStyleAttribute.mm index a30ef534f4..38c212ddd4 100644 --- a/platform/darwin/src/MGLStyleAttribute.mm +++ b/platform/darwin/src/MGLStyleAttribute.mm @@ -8,7 +8,7 @@ @implementation MGLStyleAttribute -+ (id <MGLStyleAttributeValue>)mbgl_colorPropertyValueWith:(mbgl::style::PropertyValue<mbgl::Color>)property ++ (id<MGLStyleAttributeValue>)mbgl_colorWithPropertyValueColor:(mbgl::style::PropertyValue<mbgl::Color>)property { if (property.isConstant()) { return [MGLColor mbgl_colorWithColor:property.asConstant()]; @@ -19,7 +19,7 @@ } } -+ (id <MGLStyleAttributeValue>)mbgl_numberPropertyValueWith:(mbgl::style::PropertyValue<float>)property ++ (id <MGLStyleAttributeValue>)mbgl_numberWithPropertyValueNumber:(mbgl::style::PropertyValue<float>)property { if (property.isConstant()) { return @(property.asConstant()); @@ -30,7 +30,7 @@ } } -+ (id<MGLStyleAttributeValue>)mbgl_boolPropertyValueWith:(mbgl::style::PropertyValue<bool>)property ++ (id<MGLStyleAttributeValue>)mbgl_boolWithPropertyValueBool:(mbgl::style::PropertyValue<bool>)property { if (property.isConstant()) { return @(property.asConstant()); @@ -41,7 +41,7 @@ } } -+ (id<MGLStyleAttributeValue>)mbgl_stringPropertyValueWith:(mbgl::style::PropertyValue<std::string>)property ++ (id<MGLStyleAttributeValue>)mbgl_stringWithPropertyValueString:(mbgl::style::PropertyValue<std::string>)property { if (property.isConstant()) { return @(property.asConstant().c_str()); @@ -52,7 +52,7 @@ } } -+ (id<MGLStyleAttributeValue>)mbgl_offsetPropertyValueWith:(mbgl::style::PropertyValue<std::array<float, 2> >)property ++ (id<MGLStyleAttributeValue>)mbgl_offsetWithPropertyValueOffset:(mbgl::style::PropertyValue<std::array<float, 2> >)property { if (property.isConstant()) { auto offset = property.asConstant(); @@ -64,7 +64,7 @@ } } -+ (id<MGLStyleAttributeValue>)mbgl_paddingPropertyValueWith:(mbgl::style::PropertyValue<std::array<float, 4> >)property ++ (id<MGLStyleAttributeValue>)mbgl_paddingWithPropertyValuePadding:(mbgl::style::PropertyValue<std::array<float, 4> >)property { if (property.isConstant()) { auto padding = property.asConstant(); @@ -76,7 +76,7 @@ } } -+ (id<MGLStyleAttributeValue>)mbgl_stringArrayPropertyValueWith:(mbgl::style::PropertyValue<std::vector<std::string> >)property ++ (id<MGLStyleAttributeValue>)mbgl_stringArrayWithPropertyValueStringArray:(mbgl::style::PropertyValue<std::vector<std::string> >)property { if (property.isConstant()) { auto strings = property.asConstant(); @@ -92,7 +92,7 @@ } } -+ (id<MGLStyleAttributeValue>)mbgl_numberArrayPropertyValueWith:(mbgl::style::PropertyValue<std::vector<float> >)property ++ (id<MGLStyleAttributeValue>)mbgl_numberArrayWithPropertyValueNumberArray:(mbgl::style::PropertyValue<std::vector<float> >)property { if (property.isConstant()) { auto numbers = property.asConstant(); diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm index c15a869c00..88ebfd43e8 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.mm +++ b/platform/darwin/src/MGLSymbolStyleLayer.mm @@ -46,7 +46,7 @@ } - (id <MGLStyleAttributeValue>)symbolSpacing { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getSymbolSpacing()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getSymbolSpacing()]; } - (void)setSymbolAvoidEdges:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)symbolAvoidEdges { @@ -55,7 +55,7 @@ } - (id <MGLStyleAttributeValue>)symbolAvoidEdges { - return [MGLStyleAttribute mbgl_boolPropertyValueWith:self.layer->getSymbolAvoidEdges()]; + return [MGLStyleAttribute mbgl_boolWithPropertyValueBool:self.layer->getSymbolAvoidEdges()]; } - (void)setIconAllowOverlap:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconAllowOverlap { @@ -64,7 +64,7 @@ } - (id <MGLStyleAttributeValue>)iconAllowOverlap { - return [MGLStyleAttribute mbgl_boolPropertyValueWith:self.layer->getIconAllowOverlap()]; + return [MGLStyleAttribute mbgl_boolWithPropertyValueBool:self.layer->getIconAllowOverlap()]; } - (void)setIconIgnorePlacement:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconIgnorePlacement { @@ -73,7 +73,7 @@ } - (id <MGLStyleAttributeValue>)iconIgnorePlacement { - return [MGLStyleAttribute mbgl_boolPropertyValueWith:self.layer->getIconIgnorePlacement()]; + return [MGLStyleAttribute mbgl_boolWithPropertyValueBool:self.layer->getIconIgnorePlacement()]; } - (void)setIconOptional:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconOptional { @@ -82,7 +82,7 @@ } - (id <MGLStyleAttributeValue>)iconOptional { - return [MGLStyleAttribute mbgl_boolPropertyValueWith:self.layer->getIconOptional()]; + return [MGLStyleAttribute mbgl_boolWithPropertyValueBool:self.layer->getIconOptional()]; } - (void)setIconRotationAlignment:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconRotationAlignment { @@ -100,7 +100,7 @@ } - (id <MGLStyleAttributeValue>)iconSize { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getIconSize()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getIconSize()]; } - (void)setIconTextFit:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconTextFit { @@ -118,7 +118,7 @@ } - (id <MGLStyleAttributeValue>)iconTextFitPadding { - return [MGLStyleAttribute mbgl_paddingPropertyValueWith:self.layer->getIconTextFitPadding()]; + return [MGLStyleAttribute mbgl_paddingWithPropertyValuePadding:self.layer->getIconTextFitPadding()]; } - (void)setIconImage:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconImage { @@ -127,7 +127,7 @@ } - (id <MGLStyleAttributeValue>)iconImage { - return [MGLStyleAttribute mbgl_stringPropertyValueWith:self.layer->getIconImage()]; + return [MGLStyleAttribute mbgl_stringWithPropertyValueString:self.layer->getIconImage()]; } - (void)setIconRotate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconRotate { @@ -136,7 +136,7 @@ } - (id <MGLStyleAttributeValue>)iconRotate { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getIconRotate()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getIconRotate()]; } - (void)setIconPadding:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconPadding { @@ -145,7 +145,7 @@ } - (id <MGLStyleAttributeValue>)iconPadding { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getIconPadding()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getIconPadding()]; } - (void)setIconKeepUpright:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconKeepUpright { @@ -154,7 +154,7 @@ } - (id <MGLStyleAttributeValue>)iconKeepUpright { - return [MGLStyleAttribute mbgl_boolPropertyValueWith:self.layer->getIconKeepUpright()]; + return [MGLStyleAttribute mbgl_boolWithPropertyValueBool:self.layer->getIconKeepUpright()]; } - (void)setIconOffset:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconOffset { @@ -163,7 +163,7 @@ } - (id <MGLStyleAttributeValue>)iconOffset { - return [MGLStyleAttribute mbgl_offsetPropertyValueWith:self.layer->getIconOffset()]; + return [MGLStyleAttribute mbgl_offsetWithPropertyValueOffset:self.layer->getIconOffset()]; } - (void)setTextPitchAlignment:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textPitchAlignment { @@ -190,7 +190,7 @@ } - (id <MGLStyleAttributeValue>)textField { - return [MGLStyleAttribute mbgl_stringPropertyValueWith:self.layer->getTextField()]; + return [MGLStyleAttribute mbgl_stringWithPropertyValueString:self.layer->getTextField()]; } - (void)setTextFont:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textFont { @@ -199,7 +199,7 @@ } - (id <MGLStyleAttributeValue>)textFont { - return [MGLStyleAttribute mbgl_stringArrayPropertyValueWith:self.layer->getTextFont()]; + return [MGLStyleAttribute mbgl_stringArrayWithPropertyValueStringArray:self.layer->getTextFont()]; } - (void)setTextSize:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textSize { @@ -208,7 +208,7 @@ } - (id <MGLStyleAttributeValue>)textSize { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getTextSize()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getTextSize()]; } - (void)setTextMaxWidth:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textMaxWidth { @@ -217,7 +217,7 @@ } - (id <MGLStyleAttributeValue>)textMaxWidth { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getTextMaxWidth()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getTextMaxWidth()]; } - (void)setTextLineHeight:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textLineHeight { @@ -226,7 +226,7 @@ } - (id <MGLStyleAttributeValue>)textLineHeight { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getTextLineHeight()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getTextLineHeight()]; } - (void)setTextLetterSpacing:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textLetterSpacing { @@ -235,7 +235,7 @@ } - (id <MGLStyleAttributeValue>)textLetterSpacing { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getTextLetterSpacing()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getTextLetterSpacing()]; } - (void)setTextJustify:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textJustify { @@ -262,7 +262,7 @@ } - (id <MGLStyleAttributeValue>)textMaxAngle { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getTextMaxAngle()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getTextMaxAngle()]; } - (void)setTextRotate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textRotate { @@ -271,7 +271,7 @@ } - (id <MGLStyleAttributeValue>)textRotate { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getTextRotate()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getTextRotate()]; } - (void)setTextPadding:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textPadding { @@ -280,7 +280,7 @@ } - (id <MGLStyleAttributeValue>)textPadding { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getTextPadding()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getTextPadding()]; } - (void)setTextKeepUpright:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textKeepUpright { @@ -289,7 +289,7 @@ } - (id <MGLStyleAttributeValue>)textKeepUpright { - return [MGLStyleAttribute mbgl_boolPropertyValueWith:self.layer->getTextKeepUpright()]; + return [MGLStyleAttribute mbgl_boolWithPropertyValueBool:self.layer->getTextKeepUpright()]; } - (void)setTextTransform:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textTransform { @@ -307,7 +307,7 @@ } - (id <MGLStyleAttributeValue>)textOffset { - return [MGLStyleAttribute mbgl_offsetPropertyValueWith:self.layer->getTextOffset()]; + return [MGLStyleAttribute mbgl_offsetWithPropertyValueOffset:self.layer->getTextOffset()]; } - (void)setTextAllowOverlap:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textAllowOverlap { @@ -316,7 +316,7 @@ } - (id <MGLStyleAttributeValue>)textAllowOverlap { - return [MGLStyleAttribute mbgl_boolPropertyValueWith:self.layer->getTextAllowOverlap()]; + return [MGLStyleAttribute mbgl_boolWithPropertyValueBool:self.layer->getTextAllowOverlap()]; } - (void)setTextIgnorePlacement:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textIgnorePlacement { @@ -325,7 +325,7 @@ } - (id <MGLStyleAttributeValue>)textIgnorePlacement { - return [MGLStyleAttribute mbgl_boolPropertyValueWith:self.layer->getTextIgnorePlacement()]; + return [MGLStyleAttribute mbgl_boolWithPropertyValueBool:self.layer->getTextIgnorePlacement()]; } - (void)setTextOptional:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textOptional { @@ -334,7 +334,7 @@ } - (id <MGLStyleAttributeValue>)textOptional { - return [MGLStyleAttribute mbgl_boolPropertyValueWith:self.layer->getTextOptional()]; + return [MGLStyleAttribute mbgl_boolWithPropertyValueBool:self.layer->getTextOptional()]; } #pragma mark - Accessing the Paint Attributes @@ -345,7 +345,7 @@ } - (id <MGLStyleAttributeValue>)iconOpacity { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getIconOpacity()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getIconOpacity()]; } - (void)setIconColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconColor { @@ -354,7 +354,7 @@ } - (id <MGLStyleAttributeValue>)iconColor { - return [MGLStyleAttribute mbgl_colorPropertyValueWith:self.layer->getIconColor()]; + return [MGLStyleAttribute mbgl_colorWithPropertyValueColor:self.layer->getIconColor()]; } - (void)setIconHaloColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconHaloColor { @@ -363,7 +363,7 @@ } - (id <MGLStyleAttributeValue>)iconHaloColor { - return [MGLStyleAttribute mbgl_colorPropertyValueWith:self.layer->getIconHaloColor()]; + return [MGLStyleAttribute mbgl_colorWithPropertyValueColor:self.layer->getIconHaloColor()]; } - (void)setIconHaloWidth:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconHaloWidth { @@ -372,7 +372,7 @@ } - (id <MGLStyleAttributeValue>)iconHaloWidth { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getIconHaloWidth()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getIconHaloWidth()]; } - (void)setIconHaloBlur:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconHaloBlur { @@ -381,7 +381,7 @@ } - (id <MGLStyleAttributeValue>)iconHaloBlur { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getIconHaloBlur()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getIconHaloBlur()]; } - (void)setIconTranslate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconTranslate { @@ -390,7 +390,7 @@ } - (id <MGLStyleAttributeValue>)iconTranslate { - return [MGLStyleAttribute mbgl_offsetPropertyValueWith:self.layer->getIconTranslate()]; + return [MGLStyleAttribute mbgl_offsetWithPropertyValueOffset:self.layer->getIconTranslate()]; } - (void)setIconTranslateAnchor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconTranslateAnchor { @@ -408,7 +408,7 @@ } - (id <MGLStyleAttributeValue>)textOpacity { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getTextOpacity()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getTextOpacity()]; } - (void)setTextColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textColor { @@ -417,7 +417,7 @@ } - (id <MGLStyleAttributeValue>)textColor { - return [MGLStyleAttribute mbgl_colorPropertyValueWith:self.layer->getTextColor()]; + return [MGLStyleAttribute mbgl_colorWithPropertyValueColor:self.layer->getTextColor()]; } - (void)setTextHaloColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textHaloColor { @@ -426,7 +426,7 @@ } - (id <MGLStyleAttributeValue>)textHaloColor { - return [MGLStyleAttribute mbgl_colorPropertyValueWith:self.layer->getTextHaloColor()]; + return [MGLStyleAttribute mbgl_colorWithPropertyValueColor:self.layer->getTextHaloColor()]; } - (void)setTextHaloWidth:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textHaloWidth { @@ -435,7 +435,7 @@ } - (id <MGLStyleAttributeValue>)textHaloWidth { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getTextHaloWidth()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getTextHaloWidth()]; } - (void)setTextHaloBlur:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textHaloBlur { @@ -444,7 +444,7 @@ } - (id <MGLStyleAttributeValue>)textHaloBlur { - return [MGLStyleAttribute mbgl_numberPropertyValueWith:self.layer->getTextHaloBlur()]; + return [MGLStyleAttribute mbgl_numberWithPropertyValueNumber:self.layer->getTextHaloBlur()]; } - (void)setTextTranslate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textTranslate { @@ -453,7 +453,7 @@ } - (id <MGLStyleAttributeValue>)textTranslate { - return [MGLStyleAttribute mbgl_offsetPropertyValueWith:self.layer->getTextTranslate()]; + return [MGLStyleAttribute mbgl_offsetWithPropertyValueOffset:self.layer->getTextTranslate()]; } - (void)setTextTranslateAnchor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textTranslateAnchor { |