[ios, macos] #5626 - removed unused function and added support for more datatypes

Author: frederoni

platform/darwin/scripts/generate-style-code.js

@@ -53,11 +53,11 @@ global.propertyType = function (property, layerType = null) {
 global.setterImplementation = function(property, layerType = null) {
     switch (property.type) {
         case 'boolean':
-            return '// TODO: setterBool';
+            return `${layerType}Layer->set${camelize(property.name)}(${camelizeWithLeadingLowercase(property.name)});`;
         case 'number':
             return `${layerType}Layer->set${camelize(property.name)}(${camelizeWithLeadingLowercase(property.name)});`;
         case 'string':
-            return '// TODO: setterString';
+            return `${layerType}Layer->set${camelize(property.name)}(std::string(${camelizeWithLeadingLowercase(property.name)}.UTF8String));`;
         case 'enum':
             return `// TODO: setterEnum`; 
         case 'color':
@@ -71,11 +71,11 @@ global.setterImplementation = function(property, layerType = null) {
 global.getterImplementation = function(property, layerType = null) {
     switch (property.type) {
         case 'boolean':
-            return 'return YES; // TODO: getterBool';
+            return `return ${layerType}Layer->get${camelize(property.name)}().asConstant();`;
         case 'number':
-            return 'return 0; // TODO: getterNumber';
+            return `return ${layerType}Layer->get${camelize(property.name)}().asConstant();`;
         case 'string':
-            return 'return @""; // TODO: getterString';
+            return `return @(std::string(${layerType}Layer->get${camelize(property.name)}().asConstant()).c_str());`
         case 'enum':
             return `return ${prefix}${camelize(layerType)}${suffix}${camelize(property.name)}${camelize(property.values[0])};`
         case 'color':

platform/darwin/src/MGLBackgroundStyleLayer.mm

@@ -29,19 +29,19 @@ - (MGLColor *)backgroundColor
 }
 - (void)setBackgroundPattern:(NSString*)backgroundPattern
 {
-    // TODO: setterString
+    backgroundLayer->setBackgroundPattern(std::string(backgroundPattern.UTF8String));
 }
 - (NSString *)backgroundPattern
 {
-    return @""; // TODO: getterString
+    return @(std::string(backgroundLayer->getBackgroundPattern().asConstant()).c_str());
 }
 - (void)setBackgroundOpacity:(CGFloat)backgroundOpacity
 {
     backgroundLayer->setBackgroundOpacity(backgroundOpacity);
 }
 - (CGFloat)backgroundOpacity
 {
-    return 0; // TODO: getterNumber
+    return backgroundLayer->getBackgroundOpacity().asConstant();
 }
 
 @end

platform/darwin/src/MGLCircleStyleLayer.mm

@@ -25,7 +25,7 @@ - (void)setCircleRadius:(CGFloat)circleRadius
 }
 - (CGFloat)circleRadius
 {
-    return 0; // TODO: getterNumber
+    return circleLayer->getCircleRadius().asConstant();
 }
 - (void)setCircleColor:(MGLColor*)circleColor
 {
@@ -41,15 +41,15 @@ - (void)setCircleBlur:(CGFloat)circleBlur
 }
 - (CGFloat)circleBlur
 {
-    return 0; // TODO: getterNumber
+    return circleLayer->getCircleBlur().asConstant();
 }
 - (void)setCircleOpacity:(CGFloat)circleOpacity
 {
     circleLayer->setCircleOpacity(circleOpacity);
 }
 - (CGFloat)circleOpacity
 {
-    return 0; // TODO: getterNumber
+    return circleLayer->getCircleOpacity().asConstant();
 }
 - (void)setCircleTranslate:(NSArray*)circleTranslate
 {

platform/darwin/src/MGLFillStyleLayer.mm

@@ -21,19 +21,19 @@ - (void)setLayer:(mbgl::style::Layer *)layer
 
 - (void)setFillAntialias:(BOOL)fillAntialias
 {
-    // TODO: setterBool
+    fillLayer->setFillAntialias(fillAntialias);
 }
 - (BOOL)fillAntialias
 {
-    return YES; // TODO: getterBool
+    return fillLayer->getFillAntialias().asConstant();
 }
 - (void)setFillOpacity:(CGFloat)fillOpacity
 {
     fillLayer->setFillOpacity(fillOpacity);
 }
 - (CGFloat)fillOpacity
 {
-    return 0; // TODO: getterNumber
+    return fillLayer->getFillOpacity().asConstant();
 }
 - (void)setFillColor:(MGLColor*)fillColor
 {
@@ -69,11 +69,11 @@ - (MGLFillStyleLayerFillTranslateAnchor)fillTranslateAnchor
 }
 - (void)setFillPattern:(NSString*)fillPattern
 {
-    // TODO: setterString
+    fillLayer->setFillPattern(std::string(fillPattern.UTF8String));
 }
 - (NSString *)fillPattern
 {
-    return @""; // TODO: getterString
+    return @(std::string(fillLayer->getFillPattern().asConstant()).c_str());
 }
 
 @end

platform/darwin/src/MGLLineStyleLayer.mm

@@ -47,7 +47,7 @@ - (void)setLineMiterLimit:(CGFloat)lineMiterLimit
 
 - (CGFloat)lineMiterLimit
 {
-    return 0; // TODO: getterNumber
+    return lineLayer->getLineMiterLimit().asConstant();
 }
 
 - (void)setLineRoundLimit:(CGFloat)lineRoundLimit
@@ -57,7 +57,7 @@ - (void)setLineRoundLimit:(CGFloat)lineRoundLimit
 
 - (CGFloat)lineRoundLimit
 {
-    return 0; // TODO: getterNumber
+    return lineLayer->getLineRoundLimit().asConstant();
 }
 #pragma mark - Accessing the Paint Attributes
 
@@ -67,7 +67,7 @@ - (void)setLineOpacity:(CGFloat)lineOpacity
 }
 - (CGFloat)lineOpacity
 {
-    return 0; // TODO: getterNumber
+    return lineLayer->getLineOpacity().asConstant();
 }
 - (void)setLineColor:(MGLColor*)lineColor
 {
@@ -99,31 +99,31 @@ - (void)setLineWidth:(CGFloat)lineWidth
 }
 - (CGFloat)lineWidth
 {
-    return 0; // TODO: getterNumber
+    return lineLayer->getLineWidth().asConstant();
 }
 - (void)setLineGapWidth:(CGFloat)lineGapWidth
 {
     lineLayer->setLineGapWidth(lineGapWidth);
 }
 - (CGFloat)lineGapWidth
 {
-    return 0; // TODO: getterNumber
+    return lineLayer->getLineGapWidth().asConstant();
 }
 - (void)setLineOffset:(CGFloat)lineOffset
 {
     lineLayer->setLineOffset(lineOffset);
 }
 - (CGFloat)lineOffset
 {
-    return 0; // TODO: getterNumber
+    return lineLayer->getLineOffset().asConstant();
 }
 - (void)setLineBlur:(CGFloat)lineBlur
 {
     lineLayer->setLineBlur(lineBlur);
 }
 - (CGFloat)lineBlur
 {
-    return 0; // TODO: getterNumber
+    return lineLayer->getLineBlur().asConstant();
 }
 - (void)setLineDasharray:(NSArray*)lineDasharray
 {
@@ -135,11 +135,11 @@ - (NSArray *)lineDasharray
 }
 - (void)setLinePattern:(NSString*)linePattern
 {
-    // TODO: setterString
+    lineLayer->setLinePattern(std::string(linePattern.UTF8String));
 }
 - (NSString *)linePattern
 {
-    return @""; // TODO: getterString
+    return @(std::string(lineLayer->getLinePattern().asConstant()).c_str());
 }
 
 @end

platform/darwin/src/MGLRasterStyleLayer.mm

@@ -25,55 +25,55 @@ - (void)setRasterOpacity:(CGFloat)rasterOpacity
 }
 - (CGFloat)rasterOpacity
 {
-    return 0; // TODO: getterNumber
+    return rasterLayer->getRasterOpacity().asConstant();
 }
 - (void)setRasterHueRotate:(CGFloat)rasterHueRotate
 {
     rasterLayer->setRasterHueRotate(rasterHueRotate);
 }
 - (CGFloat)rasterHueRotate
 {
-    return 0; // TODO: getterNumber
+    return rasterLayer->getRasterHueRotate().asConstant();
 }
 - (void)setRasterBrightnessMin:(CGFloat)rasterBrightnessMin
 {
     rasterLayer->setRasterBrightnessMin(rasterBrightnessMin);
 }
 - (CGFloat)rasterBrightnessMin
 {
-    return 0; // TODO: getterNumber
+    return rasterLayer->getRasterBrightnessMin().asConstant();
 }
 - (void)setRasterBrightnessMax:(CGFloat)rasterBrightnessMax
 {
     rasterLayer->setRasterBrightnessMax(rasterBrightnessMax);
 }
 - (CGFloat)rasterBrightnessMax
 {
-    return 0; // TODO: getterNumber
+    return rasterLayer->getRasterBrightnessMax().asConstant();
 }
 - (void)setRasterSaturation:(CGFloat)rasterSaturation
 {
     rasterLayer->setRasterSaturation(rasterSaturation);
 }
 - (CGFloat)rasterSaturation
 {
-    return 0; // TODO: getterNumber
+    return rasterLayer->getRasterSaturation().asConstant();
 }
 - (void)setRasterContrast:(CGFloat)rasterContrast
 {
     rasterLayer->setRasterContrast(rasterContrast);
 }
 - (CGFloat)rasterContrast
 {
-    return 0; // TODO: getterNumber
+    return rasterLayer->getRasterContrast().asConstant();
 }
 - (void)setRasterFadeDuration:(CGFloat)rasterFadeDuration
 {
     rasterLayer->setRasterFadeDuration(rasterFadeDuration);
 }
 - (CGFloat)rasterFadeDuration
 {
-    return 0; // TODO: getterNumber
+    return rasterLayer->getRasterFadeDuration().asConstant();
 }
 
 @end