[ios, macos] modified key strings imp

mapbox · Mar 7, 2017 · 2e51b1e · 2e51b1e
1 parent 7cedbff
commit 2e51b1e
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 90 deletions.
diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.mm b/platform/darwin/src/MGLBackgroundStyleLayer.mm
@@ -87,12 +87,11 @@ - (void)removeFromMapView:(MGLMapView *)mapView
 
 + (NSArray *)transitionKeys
 {
-    NSMutableArray *transitionKeys = [NSMutableArray array];
-    [transitionKeys addObject:@"backgroundColor"];
-    [transitionKeys addObject:@"backgroundOpacity"];
-    [transitionKeys addObject:@"backgroundPattern"];
-
-    return transitionKeys;
+    return @[
+        @"backgroundColor",
+        @"backgroundOpacity",
+        @"backgroundPattern",
+    ];
 }
 
 - (void)setBackgroundColor:(MGLStyleValue<MGLColor *> *)backgroundColor {

diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm
@@ -137,22 +137,21 @@ - (void)removeFromMapView:(MGLMapView *)mapView
 
 + (NSArray *)transitionKeys
 {
-    NSMutableArray *transitionKeys = [NSMutableArray array];
-    [transitionKeys addObject:@"circleBlur"];
-    [transitionKeys addObject:@"circleColor"];
-    [transitionKeys addObject:@"circleOpacity"];
-    [transitionKeys addObject:@"circleRadius"];
-    [transitionKeys addObject:@"circleScaleAlignment"];
-    [transitionKeys addObject:@"circlePitchScale"];
-    [transitionKeys addObject:@"circleStrokeColor"];
-    [transitionKeys addObject:@"circleStrokeOpacity"];
-    [transitionKeys addObject:@"circleStrokeWidth"];
-    [transitionKeys addObject:@"circleTranslation"];
-    [transitionKeys addObject:@"circleTranslate"];
-    [transitionKeys addObject:@"circleTranslationAnchor"];
-    [transitionKeys addObject:@"circleTranslateAnchor"];
-
-    return transitionKeys;
+    return @[
+        @"circleBlur",
+        @"circleColor",
+        @"circleOpacity",
+        @"circleRadius",
+        @"circleScaleAlignment",
+        @"circlePitchScale",
+        @"circleStrokeColor",
+        @"circleStrokeOpacity",
+        @"circleStrokeWidth",
+        @"circleTranslation",
+        @"circleTranslate",
+        @"circleTranslationAnchor",
+        @"circleTranslateAnchor",
+    ];
 }
 
 - (void)setCircleBlur:(MGLStyleValue<NSNumber *> *)circleBlur {

diff --git a/platform/darwin/src/MGLFillStyleLayer.mm b/platform/darwin/src/MGLFillStyleLayer.mm
@@ -132,19 +132,18 @@ - (void)removeFromMapView:(MGLMapView *)mapView
 
 + (NSArray *)transitionKeys
 {
-    NSMutableArray *transitionKeys = [NSMutableArray array];
-    [transitionKeys addObject:@"fillAntialiased"];
-    [transitionKeys addObject:@"fillAntialias"];
-    [transitionKeys addObject:@"fillColor"];
-    [transitionKeys addObject:@"fillOpacity"];
-    [transitionKeys addObject:@"fillOutlineColor"];
-    [transitionKeys addObject:@"fillPattern"];
-    [transitionKeys addObject:@"fillTranslation"];
-    [transitionKeys addObject:@"fillTranslate"];
-    [transitionKeys addObject:@"fillTranslationAnchor"];
-    [transitionKeys addObject:@"fillTranslateAnchor"];
-
-    return transitionKeys;
+    return @[
+        @"fillAntialiased",
+        @"fillAntialias",
+        @"fillColor",
+        @"fillOpacity",
+        @"fillOutlineColor",
+        @"fillPattern",
+        @"fillTranslation",
+        @"fillTranslate",
+        @"fillTranslationAnchor",
+        @"fillTranslateAnchor",
+    ];
 }
 
 - (void)setFillAntialiased:(MGLStyleValue<NSNumber *> *)fillAntialiased {

diff --git a/platform/darwin/src/MGLLineStyleLayer.mm b/platform/darwin/src/MGLLineStyleLayer.mm
@@ -214,22 +214,21 @@ - (void)setLineRoundLimit:(MGLStyleValue<NSNumber *> *)lineRoundLimit {
 
 + (NSArray *)transitionKeys
 {
-    NSMutableArray *transitionKeys = [NSMutableArray array];
-    [transitionKeys addObject:@"lineBlur"];
-    [transitionKeys addObject:@"lineColor"];
-    [transitionKeys addObject:@"lineDashPattern"];
-    [transitionKeys addObject:@"lineDasharray"];
-    [transitionKeys addObject:@"lineGapWidth"];
-    [transitionKeys addObject:@"lineOffset"];
-    [transitionKeys addObject:@"lineOpacity"];
-    [transitionKeys addObject:@"linePattern"];
-    [transitionKeys addObject:@"lineTranslation"];
-    [transitionKeys addObject:@"lineTranslate"];
-    [transitionKeys addObject:@"lineTranslationAnchor"];
-    [transitionKeys addObject:@"lineTranslateAnchor"];
-    [transitionKeys addObject:@"lineWidth"];
-
-    return transitionKeys;
+    return @[
+        @"lineBlur",
+        @"lineColor",
+        @"lineDashPattern",
+        @"lineDasharray",
+        @"lineGapWidth",
+        @"lineOffset",
+        @"lineOpacity",
+        @"linePattern",
+        @"lineTranslation",
+        @"lineTranslate",
+        @"lineTranslationAnchor",
+        @"lineTranslateAnchor",
+        @"lineWidth",
+    ];
 }
 
 - (void)setLineBlur:(MGLStyleValue<NSNumber *> *)lineBlur {

diff --git a/platform/darwin/src/MGLRasterStyleLayer.mm b/platform/darwin/src/MGLRasterStyleLayer.mm
@@ -94,19 +94,18 @@ - (void)removeFromMapView:(MGLMapView *)mapView
 
 + (NSArray *)transitionKeys
 {
-    NSMutableArray *transitionKeys = [NSMutableArray array];
-    [transitionKeys addObject:@"maximumRasterBrightness"];
-    [transitionKeys addObject:@"rasterBrightnessMax"];
-    [transitionKeys addObject:@"minimumRasterBrightness"];
-    [transitionKeys addObject:@"rasterBrightnessMin"];
-    [transitionKeys addObject:@"rasterContrast"];
-    [transitionKeys addObject:@"rasterFadeDuration"];
-    [transitionKeys addObject:@"rasterHueRotation"];
-    [transitionKeys addObject:@"rasterHueRotate"];
-    [transitionKeys addObject:@"rasterOpacity"];
-    [transitionKeys addObject:@"rasterSaturation"];
-
-    return transitionKeys;
+    return @[
+        @"maximumRasterBrightness",
+        @"rasterBrightnessMax",
+        @"minimumRasterBrightness",
+        @"rasterBrightnessMin",
+        @"rasterContrast",
+        @"rasterFadeDuration",
+        @"rasterHueRotation",
+        @"rasterHueRotate",
+        @"rasterOpacity",
+        @"rasterSaturation",
+    ];
 }
 
 - (void)setMaximumRasterBrightness:(MGLStyleValue<NSNumber *> *)maximumRasterBrightness {

diff --git a/platform/darwin/src/MGLStyleLayer.mm.ejs b/platform/darwin/src/MGLStyleLayer.mm.ejs
@@ -232,15 +232,14 @@ namespace mbgl {
 
 + (NSArray *)transitionKeys
 {
-    NSMutableArray *transitionKeys = [NSMutableArray array];
+    return @[
 <% for (const property of paintProperties) { -%>
-    [transitionKeys addObject:@"<%- camelizeWithLeadingLowercase(property.name) %>"];
+        @"<%- camelizeWithLeadingLowercase(property.name) %>",
 <% if (property.original) { -%>
-    [transitionKeys addObject:@"<%- camelizeWithLeadingLowercase(originalPropertyName(property)) %>"];
+        @"<%- camelizeWithLeadingLowercase(originalPropertyName(property)) %>",
 <% } -%>
 <% } -%>
-
-    return transitionKeys;
+    ];
 }
 
 <% for (const property of paintProperties) { -%>

diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm
@@ -890,27 +890,26 @@ - (void)setTextTransform:(MGLStyleValue<NSValue *> *)textTransform {
 
 + (NSArray *)transitionKeys
 {
-    NSMutableArray *transitionKeys = [NSMutableArray array];
-    [transitionKeys addObject:@"iconColor"];
-    [transitionKeys addObject:@"iconHaloBlur"];
-    [transitionKeys addObject:@"iconHaloColor"];
-    [transitionKeys addObject:@"iconHaloWidth"];
-    [transitionKeys addObject:@"iconOpacity"];
-    [transitionKeys addObject:@"iconTranslation"];
-    [transitionKeys addObject:@"iconTranslate"];
-    [transitionKeys addObject:@"iconTranslationAnchor"];
-    [transitionKeys addObject:@"iconTranslateAnchor"];
-    [transitionKeys addObject:@"textColor"];
-    [transitionKeys addObject:@"textHaloBlur"];
-    [transitionKeys addObject:@"textHaloColor"];
-    [transitionKeys addObject:@"textHaloWidth"];
-    [transitionKeys addObject:@"textOpacity"];
-    [transitionKeys addObject:@"textTranslation"];
-    [transitionKeys addObject:@"textTranslate"];
-    [transitionKeys addObject:@"textTranslationAnchor"];
-    [transitionKeys addObject:@"textTranslateAnchor"];
-
-    return transitionKeys;
+    return @[
+        @"iconColor",
+        @"iconHaloBlur",
+        @"iconHaloColor",
+        @"iconHaloWidth",
+        @"iconOpacity",
+        @"iconTranslation",
+        @"iconTranslate",
+        @"iconTranslationAnchor",
+        @"iconTranslateAnchor",
+        @"textColor",
+        @"textHaloBlur",
+        @"textHaloColor",
+        @"textHaloWidth",
+        @"textOpacity",
+        @"textTranslation",
+        @"textTranslate",
+        @"textTranslationAnchor",
+        @"textTranslateAnchor",
+    ];
 }
 
 - (void)setIconColor:(MGLStyleValue<MGLColor *> *)iconColor {