[ios, macos] #5626 - cleanup and use appropiate data types

Author: frederoni

platform/darwin/src/MGLBackgroundStyleLayer.h

@@ -4,6 +4,7 @@
 
 #import "MGLTypes.h"
 
+
 @interface MGLBackgroundStyleLayer : MGLStyleLayer
 
 // Paint properties
@@ -12,7 +13,7 @@
 
 @property (nonatomic) NSString *backgroundPattern;
 
-@property (nonatomic) float backgroundOpacity;
+@property (nonatomic) CGFloat backgroundOpacity;
 
 @end
 

platform/darwin/src/MGLCircleStyleLayer.h

@@ -4,23 +4,32 @@
 
 #import "MGLTypes.h"
 
+typedef NS_ENUM(NSUInteger, MGLCircleStyleLayerCircleTranslateAnchor) {
+    MGLCircleStyleLayerCircleTranslateAnchorMap,
+    MGLCircleStyleLayerCircleTranslateAnchorViewport,
+};
+typedef NS_ENUM(NSUInteger, MGLCircleStyleLayerCirclePitchScale) {
+    MGLCircleStyleLayerCirclePitchScaleMap,
+    MGLCircleStyleLayerCirclePitchScaleViewport,
+};
+
 @interface MGLCircleStyleLayer : MGLStyleLayer
 
 // Paint properties
 
-@property (nonatomic) float circleRadius;
+@property (nonatomic) CGFloat circleRadius;
 
 @property (nonatomic) MGLColor *circleColor;
 
-@property (nonatomic) float circleBlur;
+@property (nonatomic) CGFloat circleBlur;
 
-@property (nonatomic) float circleOpacity;
+@property (nonatomic) CGFloat circleOpacity;
 
-@property (nonatomic) NSMutableArray *circleTranslate;
+@property (nonatomic) NSArray *circleTranslate;
 
-@property (nonatomic) NSString *circleTranslateAnchor;
+@property (nonatomic) MGLCircleStyleLayerCircleTranslateAnchor circleTranslateAnchor;
 
-@property (nonatomic) NSString *circlePitchScale;
+@property (nonatomic) MGLCircleStyleLayerCirclePitchScale circlePitchScale;
 
 @end
 

platform/darwin/src/MGLFillStyleLayer.h

@@ -4,21 +4,26 @@
 
 #import "MGLTypes.h"
 
+typedef NS_ENUM(NSUInteger, MGLFillStyleLayerFillTranslateAnchor) {
+    MGLFillStyleLayerFillTranslateAnchorMap,
+    MGLFillStyleLayerFillTranslateAnchorViewport,
+};
+
 @interface MGLFillStyleLayer : MGLStyleLayer
 
 // Paint properties
 
 @property (nonatomic) BOOL fillAntialias;
 
-@property (nonatomic) float fillOpacity;
+@property (nonatomic) CGFloat fillOpacity;
 
 @property (nonatomic) MGLColor *fillColor;
 
 @property (nonatomic) MGLColor *fillOutlineColor;
 
-@property (nonatomic) NSMutableArray *fillTranslate;
+@property (nonatomic) NSArray *fillTranslate;
 
-@property (nonatomic) NSString *fillTranslateAnchor;
+@property (nonatomic) MGLFillStyleLayerFillTranslateAnchor fillTranslateAnchor;
 
 @property (nonatomic) NSString *fillPattern;
 

platform/darwin/src/MGLLineStyleLayer.h

@@ -4,37 +4,52 @@
 
 #import "MGLTypes.h"
 
+typedef NS_ENUM(NSUInteger, MGLLineStyleLayerLineCap) {
+    MGLLineStyleLayerLineCapButt,
+    MGLLineStyleLayerLineCapRound,
+    MGLLineStyleLayerLineCapSquare,
+};
+typedef NS_ENUM(NSUInteger, MGLLineStyleLayerLineJoin) {
+    MGLLineStyleLayerLineJoinBevel,
+    MGLLineStyleLayerLineJoinRound,
+    MGLLineStyleLayerLineJoinMiter,
+};
+typedef NS_ENUM(NSUInteger, MGLLineStyleLayerLineTranslateAnchor) {
+    MGLLineStyleLayerLineTranslateAnchorMap,
+    MGLLineStyleLayerLineTranslateAnchorViewport,
+};
+
 @interface MGLLineStyleLayer : MGLStyleLayer
 
 // Layout properties
 
-@property (nonatomic) NSString *lineCap;
+@property (nonatomic) MGLLineStyleLayerLineCap lineCap;
 
-@property (nonatomic) NSString *lineJoin;
+@property (nonatomic) MGLLineStyleLayerLineJoin lineJoin;
 
-@property (nonatomic) float lineMiterLimit;
+@property (nonatomic) CGFloat lineMiterLimit;
 
-@property (nonatomic) float lineRoundLimit;
+@property (nonatomic) CGFloat lineRoundLimit;
 
 // Paint properties
 
-@property (nonatomic) float lineOpacity;
+@property (nonatomic) CGFloat lineOpacity;
 
 @property (nonatomic) MGLColor *lineColor;
 
-@property (nonatomic) NSMutableArray *lineTranslate;
+@property (nonatomic) NSArray *lineTranslate;
 
-@property (nonatomic) NSString *lineTranslateAnchor;
+@property (nonatomic) MGLLineStyleLayerLineTranslateAnchor lineTranslateAnchor;
 
-@property (nonatomic) float lineWidth;
+@property (nonatomic) CGFloat lineWidth;
 
-@property (nonatomic) float lineGapWidth;
+@property (nonatomic) CGFloat lineGapWidth;
 
-@property (nonatomic) float lineOffset;
+@property (nonatomic) CGFloat lineOffset;
 
-@property (nonatomic) float lineBlur;
+@property (nonatomic) CGFloat lineBlur;
 
-@property (nonatomic) CGVector *lineDasharray;
+@property (nonatomic) NSArray *lineDasharray;
 
 @property (nonatomic) NSString *linePattern;
 

platform/darwin/src/MGLRasterStyleLayer.h

@@ -4,23 +4,24 @@
 
 #import "MGLTypes.h"
 
+
 @interface MGLRasterStyleLayer : MGLStyleLayer
 
 // Paint properties
 
-@property (nonatomic) float rasterOpacity;
+@property (nonatomic) CGFloat rasterOpacity;
 
-@property (nonatomic) float rasterHueRotate;
+@property (nonatomic) CGFloat rasterHueRotate;
 
-@property (nonatomic) float rasterBrightnessMin;
+@property (nonatomic) CGFloat rasterBrightnessMin;
 
-@property (nonatomic) float rasterBrightnessMax;
+@property (nonatomic) CGFloat rasterBrightnessMax;
 
-@property (nonatomic) float rasterSaturation;
+@property (nonatomic) CGFloat rasterSaturation;
 
-@property (nonatomic) float rasterContrast;
+@property (nonatomic) CGFloat rasterContrast;
 
-@property (nonatomic) float rasterFadeDuration;
+@property (nonatomic) CGFloat rasterFadeDuration;
 
 @end
 

platform/darwin/src/MGLStyleLayer.h.ejs

@@ -9,20 +9,39 @@
 
 #import "MGLTypes.h"
 
+<% for (const property of layoutProperties) { -%>
+<% if (property.type == "enum") { -%>
+typedef NS_ENUM(NSUInteger, MGL<%- camelize(type) %>StyleLayer<%- camelize(property.name) %>) {
+<% for (const value of property.values) { -%>
+    MGL<%- camelize(type) %>StyleLayer<%- camelize(property.name) %><%- camelize(value) %>,
+<% } -%>
+};
+<% } -%>
+<% } -%>
+<% for (const property of paintProperties) { -%>
+<% if (property.type == "enum") { -%>
+typedef NS_ENUM(NSUInteger, MGL<%- camelize(type) %>StyleLayer<%- camelize(property.name) %>) {
+<% for (const value of property.values) { -%>
+    MGL<%- camelize(type) %>StyleLayer<%- camelize(property.name) %><%- camelize(value) %>,
+<% } -%>
+};
+<% } -%>
+<% } -%>
+
 @interface MGL<%- camelize(type) %>StyleLayer : MGLStyleLayer
 
 <% if (layoutProperties.length) { -%>
 // Layout properties
 
 <% for (const property of layoutProperties) { -%>
-@property (nonatomic) <%- propertyType(property) %> <% if (isObject(property)) { -%>*<% } -%><%- camelizeWithLeadingLowercase(property.name) %>;
+@property (nonatomic) <%- propertyType(property, type) %> <% if (isObject(property)) { -%>*<% } -%><%- camelizeWithLeadingLowercase(property.name) %>;
 
 <% } -%>
 <% } -%>
 // Paint properties
 
 <% for (const property of paintProperties) { -%>
-@property (nonatomic) <%- propertyType(property) %> <% if (isObject(property)) { -%>*<% } -%><%- camelizeWithLeadingLowercase(property.name) %>;
+@property (nonatomic) <%- propertyType(property, type) %> <% if (isObject(property)) { -%>*<% } -%><%- camelizeWithLeadingLowercase(property.name) %>;
 
 <% } -%>
 @end