Use appropriate part of speech for properties (#7457)

* [ios, macos] Use appropriate part of speech for properties

Fixed overridden property references in requirements lists. Boolean-typed properties can now have getters beginning with “is”.

Renamed a number of layout properties according to the following rules: Boolean-typed properties should include a verb; other properties must be noun phrases; all properties must be grammatical.

* [ios, macos] Added style spec names as unavailable aliases

Renamed properties now have aliases based on their style specification names, marked unavailable, for wayfinding purposes.

* [ios, macos] Fixed autosynthesis warnings

* [ios, macos] Moved style layer test template to test folder

* [ios, macos] Customized iconOptional getter

* [ios, macos] Avoid autosynthesis of aliases

* [ios, macos] Test that property names are grammatical

Run property getter names through a basic battery of tests to see if they’re grammatical. Most part-of-speech tagging tests are guarded by a compile-time flag, off by default, because NSLinguisticTagger does a poor job of telling nouns from verbs, and we’ve intentionally kept many words in property names that could be read as either verbs or nouns (like “transform” or “scale”).

10 files changed, 334 insertions, 57 deletions

diff --git a/platform/darwin/test/MGLBackgroundStyleLayerTests.m b/platform/darwin/test/MGLBackgroundStyleLayerTests.m
index 09bed76654..934021d6b8 100644
--- a/platform/darwin/test/MGLBackgroundStyleLayerTests.m
+++ b/platform/darwin/test/MGLBackgroundStyleLayerTests.m
@@ -8,6 +8,10 @@
 
 @implementation MGLBackgroundLayerTests
 
++ (NSString *)layerType {
+    return @"background";
+}
+
 - (void)testBackgroundLayer {
     MGLBackgroundStyleLayer *layer = [[MGLBackgroundStyleLayer alloc] initWithIdentifier:@"layerID"];
     [self.mapView.style addLayer:layer];
@@ -31,4 +35,10 @@
     XCTAssertEqualObjects(gLayer.backgroundPattern, [MGLRuntimeStylingHelper testStringFunction]);
 }
 
+- (void)testPropertyNames {
+    [self testPropertyName:@"background-color" isBoolean:NO];
+    [self testPropertyName:@"background-opacity" isBoolean:NO];
+    [self testPropertyName:@"background-pattern" isBoolean:NO];
+}
+
 @end
diff --git a/platform/darwin/test/MGLCircleStyleLayerTests.m b/platform/darwin/test/MGLCircleStyleLayerTests.m
index f98e731354..66c05f15c9 100644
--- a/platform/darwin/test/MGLCircleStyleLayerTests.m
+++ b/platform/darwin/test/MGLCircleStyleLayerTests.m
@@ -8,6 +8,10 @@
 
 @implementation MGLCircleLayerTests
 
++ (NSString *)layerType {
+    return @"circle";
+}
+
 - (void)testCircleLayer {
     NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
     NSURL *url = [NSURL fileURLWithPath:filePath];
@@ -53,4 +57,14 @@
     XCTAssertEqualObjects(gLayer.circleTranslateAnchor, [MGLRuntimeStylingHelper testEnumFunction:MGLCircleTranslateAnchorViewport type:@encode(MGLCircleTranslateAnchor)]);
 }
 
+- (void)testPropertyNames {
+    [self testPropertyName:@"circle-blur" isBoolean:NO];
+    [self testPropertyName:@"circle-color" isBoolean:NO];
+    [self testPropertyName:@"circle-opacity" isBoolean:NO];
+    [self testPropertyName:@"circle-pitch-scale" isBoolean:NO];
+    [self testPropertyName:@"circle-radius" isBoolean:NO];
+    [self testPropertyName:@"circle-translate" isBoolean:NO];
+    [self testPropertyName:@"circle-translate-anchor" isBoolean:NO];
+}
+
 @end
diff --git a/platform/darwin/test/MGLFillStyleLayerTests.m b/platform/darwin/test/MGLFillStyleLayerTests.m
index dd16214a71..7d51c15cf4 100644
--- a/platform/darwin/test/MGLFillStyleLayerTests.m
+++ b/platform/darwin/test/MGLFillStyleLayerTests.m
@@ -8,6 +8,10 @@
 
 @implementation MGLFillLayerTests
 
++ (NSString *)layerType {
+    return @"fill";
+}
+
 - (void)testFillLayer {
     NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
     NSURL *url = [NSURL fileURLWithPath:filePath];
@@ -16,7 +20,7 @@
     MGLFillStyleLayer *layer = [[MGLFillStyleLayer alloc] initWithIdentifier:@"layerID" source:source];
     [self.mapView.style addLayer:layer];
 
-    layer.fillAntialias = [MGLRuntimeStylingHelper testBool];
+    layer.fillAntialiased = [MGLRuntimeStylingHelper testBool];
     layer.fillColor = [MGLRuntimeStylingHelper testColor];
     layer.fillOpacity = [MGLRuntimeStylingHelper testNumber];
     layer.fillOutlineColor = [MGLRuntimeStylingHelper testColor];
@@ -26,7 +30,7 @@
 
     MGLFillStyleLayer *gLayer = (MGLFillStyleLayer *)[self.mapView.style layerWithIdentifier:@"layerID"];
     XCTAssertTrue([gLayer isKindOfClass:[MGLFillStyleLayer class]]);
-    XCTAssertEqualObjects(gLayer.fillAntialias, [MGLRuntimeStylingHelper testBool]);
+    XCTAssertEqualObjects(gLayer.fillAntialiased, [MGLRuntimeStylingHelper testBool]);
     XCTAssertEqualObjects(gLayer.fillColor, [MGLRuntimeStylingHelper testColor]);
     XCTAssertEqualObjects(gLayer.fillOpacity, [MGLRuntimeStylingHelper testNumber]);
     XCTAssertEqualObjects(gLayer.fillOutlineColor, [MGLRuntimeStylingHelper testColor]);
@@ -35,7 +39,7 @@
     XCTAssert([gLayer.fillTranslateAnchor isKindOfClass:[MGLStyleConstantValue class]]);
     XCTAssertEqualObjects(gLayer.fillTranslateAnchor, [MGLRuntimeStylingHelper testEnum:MGLFillTranslateAnchorViewport type:@encode(MGLFillTranslateAnchor)]);
 
-    layer.fillAntialias = [MGLRuntimeStylingHelper testBoolFunction];
+    layer.fillAntialiased = [MGLRuntimeStylingHelper testBoolFunction];
     layer.fillColor = [MGLRuntimeStylingHelper testColorFunction];
     layer.fillOpacity = [MGLRuntimeStylingHelper testNumberFunction];
     layer.fillOutlineColor = [MGLRuntimeStylingHelper testColorFunction];
@@ -43,7 +47,7 @@
     layer.fillTranslate = [MGLRuntimeStylingHelper testOffsetFunction];
     layer.fillTranslateAnchor = [MGLRuntimeStylingHelper testEnumFunction:MGLFillTranslateAnchorViewport type:@encode(MGLFillTranslateAnchor)];
 
-    XCTAssertEqualObjects(gLayer.fillAntialias, [MGLRuntimeStylingHelper testBoolFunction]);
+    XCTAssertEqualObjects(gLayer.fillAntialiased, [MGLRuntimeStylingHelper testBoolFunction]);
     XCTAssertEqualObjects(gLayer.fillColor, [MGLRuntimeStylingHelper testColorFunction]);
     XCTAssertEqualObjects(gLayer.fillOpacity, [MGLRuntimeStylingHelper testNumberFunction]);
     XCTAssertEqualObjects(gLayer.fillOutlineColor, [MGLRuntimeStylingHelper testColorFunction]);
@@ -52,4 +56,14 @@
     XCTAssertEqualObjects(gLayer.fillTranslateAnchor, [MGLRuntimeStylingHelper testEnumFunction:MGLFillTranslateAnchorViewport type:@encode(MGLFillTranslateAnchor)]);
 }
 
+- (void)testPropertyNames {
+    [self testPropertyName:@"is-fill-antialiased" isBoolean:YES];
+    [self testPropertyName:@"fill-color" isBoolean:NO];
+    [self testPropertyName:@"fill-opacity" isBoolean:NO];
+    [self testPropertyName:@"fill-outline-color" isBoolean:NO];
+    [self testPropertyName:@"fill-pattern" isBoolean:NO];
+    [self testPropertyName:@"fill-translate" isBoolean:NO];
+    [self testPropertyName:@"fill-translate-anchor" isBoolean:NO];
+}
+
 @end
diff --git a/platform/darwin/test/MGLLineStyleLayerTests.m b/platform/darwin/test/MGLLineStyleLayerTests.m
index 49dd1f2198..e877c1d57a 100644
--- a/platform/darwin/test/MGLLineStyleLayerTests.m
+++ b/platform/darwin/test/MGLLineStyleLayerTests.m
@@ -8,6 +8,10 @@
 
 @implementation MGLLineLayerTests
 
++ (NSString *)layerType {
+    return @"line";
+}
+
 - (void)testLineLayer {
     NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
     NSURL *url = [NSURL fileURLWithPath:filePath];
@@ -82,4 +86,21 @@
     XCTAssertEqualObjects(gLayer.lineWidth, [MGLRuntimeStylingHelper testNumberFunction]);
 }
 
+- (void)testPropertyNames {
+    [self testPropertyName:@"line-cap" isBoolean:NO];
+    [self testPropertyName:@"line-join" isBoolean:NO];
+    [self testPropertyName:@"line-miter-limit" isBoolean:NO];
+    [self testPropertyName:@"line-round-limit" isBoolean:NO];
+    [self testPropertyName:@"line-blur" isBoolean:NO];
+    [self testPropertyName:@"line-color" isBoolean:NO];
+    [self testPropertyName:@"line-dash-pattern" isBoolean:NO];
+    [self testPropertyName:@"line-gap-width" isBoolean:NO];
+    [self testPropertyName:@"line-offset" isBoolean:NO];
+    [self testPropertyName:@"line-opacity" isBoolean:NO];
+    [self testPropertyName:@"line-pattern" isBoolean:NO];
+    [self testPropertyName:@"line-translate" isBoolean:NO];
+    [self testPropertyName:@"line-translate-anchor" isBoolean:NO];
+    [self testPropertyName:@"line-width" isBoolean:NO];
+}
+
 @end
diff --git a/platform/darwin/test/MGLRasterStyleLayerTests.m b/platform/darwin/test/MGLRasterStyleLayerTests.m
index 485664c986..f8de191da0 100644
--- a/platform/darwin/test/MGLRasterStyleLayerTests.m
+++ b/platform/darwin/test/MGLRasterStyleLayerTests.m
@@ -8,6 +8,10 @@
 
 @implementation MGLRasterLayerTests
 
++ (NSString *)layerType {
+    return @"raster";
+}
+
 - (void)testRasterLayer {
     NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
     NSURL *url = [NSURL fileURLWithPath:filePath];
@@ -51,4 +55,14 @@
     XCTAssertEqualObjects(gLayer.rasterSaturation, [MGLRuntimeStylingHelper testNumberFunction]);
 }
 
+- (void)testPropertyNames {
+    [self testPropertyName:@"maximum-raster-brightness" isBoolean:NO];
+    [self testPropertyName:@"minimum-raster-brightness" isBoolean:NO];
+    [self testPropertyName:@"raster-contrast" isBoolean:NO];
+    [self testPropertyName:@"raster-fade-duration" isBoolean:NO];
+    [self testPropertyName:@"raster-hue-rotation" isBoolean:NO];
+    [self testPropertyName:@"raster-opacity" isBoolean:NO];
+    [self testPropertyName:@"raster-saturation" isBoolean:NO];
+}
+
 @end
diff --git a/platform/darwin/test/MGLStyleLayerTests.h b/platform/darwin/test/MGLStyleLayerTests.h
index f81e075e03..74ce62e894 100644
--- a/platform/darwin/test/MGLStyleLayerTests.h
+++ b/platform/darwin/test/MGLStyleLayerTests.h
@@ -6,5 +6,15 @@
 
 @property (nonatomic) IBOutlet MGLMapView *mapView;
 @property (nonatomic) XCTestExpectation *expectation;
+@property (nonatomic, copy, readonly, class) NSString *layerType;
+
+- (void)testPropertyName:(NSString *)name isBoolean:(BOOL)isBoolean;
+
+@end
+
+@interface NSString (MGLStyleLayerTestAdditions)
+
+@property (nonatomic, readonly, copy) NS_ARRAY_OF(NSString *) *lexicalClasses;
+@property (nonatomic, readonly, copy) NSString *lemma;
 
 @end
diff --git a/platform/darwin/test/MGLStyleLayerTests.m b/platform/darwin/test/MGLStyleLayerTests.m
index 74c6b2f906..590d6eda7f 100644
--- a/platform/darwin/test/MGLStyleLayerTests.m
+++ b/platform/darwin/test/MGLStyleLayerTests.m
@@ -1,7 +1,13 @@
 #import "MGLStyleLayerTests.h"
 
+#import "NSString+MGLAdditions.h"
+
+#define TEST_STRICT_NAMING_CONVENTIONS 0
+
 @implementation MGLStyleLayerTests
 
+@dynamic layerType;
+
 - (void)setUp {
     [super setUp];
 #if TARGET_OS_IPHONE
@@ -19,4 +25,65 @@
 #endif
 }
 
+- (void)testPropertyName:(NSString *)name isBoolean:(BOOL)isBoolean {
+    NS_MUTABLE_ARRAY_OF(NSString *) *components = [name componentsSeparatedByString:@"-"].mutableCopy;
+    if (isBoolean) {
+        if ([components.firstObject isEqualToString:@"is"]) {
+            [components removeObjectAtIndex:0];
+            if (![components.lastObject.lexicalClasses containsObject:NSLinguisticTagAdjective]) {
+                XCTAssertTrue([components.lastObject.lexicalClasses containsObject:NSLinguisticTagVerb],
+                              @"Boolean getter %@ that starts with “is” should contain an adjective, past participle, or verb.", name);
+                XCTAssertNotEqualObjects(components.lastObject.lemma, components.lastObject,
+                                         @"Boolean getter %@ should not have infinitive, imperative, or present tense verb.", name);
+            }
+        } else {
+            if ([components.firstObject isEqualToString:[self class].layerType]
+                || [components.firstObject isEqualToString:@"icon"] || [components.firstObject isEqualToString:@"text"]) {
+                [components removeObjectAtIndex:0];
+            }
+#if TEST_STRICT_NAMING_CONVENTIONS
+            XCTAssertTrue([components.firstObject.lexicalClasses containsObject:NSLinguisticTagVerb],
+                          @"Boolean getter %@ that doesn’t start with “is” should contain a verb.", name);
+            XCTAssertNotEqualObjects(components.firstObject.lemma, components.lastObject);
+#endif
+        }
+    } else {
+        XCTAssertFalse([components.firstObject isEqualToString:@"is"]);
+#if TEST_STRICT_NAMING_CONVENTIONS
+        XCTAssertTrue([components.lastObject.lexicalClasses containsObject:NSLinguisticTagNoun],
+                      @"Non-Boolean getter %@ should contain a noun.", name);
+#endif
+    }
+}
+
+@end
+
+@implementation NSString (MGLStyleLayerTestAdditions)
+
+- (NS_ARRAY_OF(NSString *) *)lexicalClasses {
+    NSOrthography *orthography = [NSOrthography orthographyWithDominantScript:@"Latn"
+                                                                  languageMap:@{@"Latn": @[@"en"]}];
+    NSLinguisticTaggerOptions options = (NSLinguisticTaggerOmitPunctuation
+                                         | NSLinguisticTaggerOmitWhitespace
+                                         | NSLinguisticTaggerOmitOther);
+    return [self linguisticTagsInRange:self.mgl_wholeRange
+                                scheme:NSLinguisticTagSchemeLexicalClass
+                               options:options
+                           orthography:orthography
+                           tokenRanges:NULL];
+}
+
+- (NSString *)lemma {
+    NSOrthography *orthography = [NSOrthography orthographyWithDominantScript:@"Latn"
+                                                                  languageMap:@{@"Latn": @[@"en"]}];
+    NSLinguisticTaggerOptions options = (NSLinguisticTaggerOmitPunctuation
+                                         | NSLinguisticTaggerOmitWhitespace
+                                         | NSLinguisticTaggerOmitOther);
+    return [self linguisticTagsInRange:self.mgl_wholeRange
+                                scheme:NSLinguisticTagSchemeLemma
+                               options:options
+                           orthography:orthography
+                           tokenRanges:NULL].firstObject;
+}
+
 @end
diff --git a/platform/darwin/test/MGLStyleLayerTests.m.ejs b/platform/darwin/test/MGLStyleLayerTests.m.ejs
new file mode 100644
index 0000000000..6b7bfe2f1c
--- /dev/null
+++ b/platform/darwin/test/MGLStyleLayerTests.m.ejs
@@ -0,0 +1,72 @@
+<%
+  const type = locals.type;
+  const layoutProperties = locals.layoutProperties;
+  const paintProperties = locals.paintProperties;
+-%>
+// This file is generated. 
+// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
+
+#import "MGLStyleLayerTests.h"
+
+@interface MGL<%- camelize(type) %>LayerTests : MGLStyleLayerTests
+@end
+
+@implementation MGL<%- camelize(type) %>LayerTests
+
++ (NSString *)layerType {
+    return @"<%- type %>";
+}
+
+- (void)test<%- camelize(type) %>Layer {
+<% if (type === 'background') { -%>
+    MGL<%- camelize(type) %>StyleLayer *layer = [[MGL<%- camelize(type) %>StyleLayer alloc] initWithIdentifier:@"layerID"];
+<% } else { -%>
+    NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
+    NSURL *url = [NSURL fileURLWithPath:filePath];
+    MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
+    [self.mapView.style addSource:source];
+    MGL<%- camelize(type) %>StyleLayer *layer = [[MGL<%- camelize(type) %>StyleLayer alloc] initWithIdentifier:@"layerID" source:source];
+<% } -%>
+    [self.mapView.style addLayer:layer];
+
+<% for (const property of layoutProperties) { -%>
+    <%- testImplementation(property, type) %>
+<% } -%>
+<% for (const property of paintProperties) { -%>
+    <%- testImplementation(property, type) %>
+<% } -%>
+
+    MGL<%- camelize(type) %>StyleLayer *gLayer = (MGL<%- camelize(type) %>StyleLayer *)[self.mapView.style layerWithIdentifier:@"layerID"];
+    XCTAssertTrue([gLayer isKindOfClass:[MGL<%- camelize(type) %>StyleLayer class]]);
+<% for (const property of layoutProperties) { -%>
+    <%- testGetterImplementation(property, type) %>
+<% } -%>
+<% for (const property of paintProperties) { -%>
+    <%- testGetterImplementation(property, type) %>
+<% } -%>
+
+<% for (const property of layoutProperties) { -%>
+    <%- testImplementation(property, type, true) %>
+<% } -%>
+<% for (const property of paintProperties) { -%>
+    <%- testImplementation(property, type, true) %>
+<% } -%>
+
+<% for (const property of layoutProperties) { -%>
+    <%- testGetterImplementation(property, type, true) %>
+<% } -%>
+<% for (const property of paintProperties) { -%>
+    <%- testGetterImplementation(property, type, true) %>
+<% } -%>
+}
+
+- (void)testPropertyNames {
+<% for (const property of layoutProperties) { -%>
+    [self testPropertyName:@"<%- property.getter || property.name %>" isBoolean:<%- property.type === 'boolean' ? 'YES' : 'NO' %>];
+<% } -%>
+<% for (const property of paintProperties) { -%>
+    [self testPropertyName:@"<%- property.getter || property.name %>" isBoolean:<%- property.type === 'boolean' ? 'YES' : 'NO' %>];
+<% } -%>
+}
+
+@end
diff --git a/platform/darwin/test/MGLStyleValueTests.swift b/platform/darwin/test/MGLStyleValueTests.swift
index e529af0634..bf01435114 100644
--- a/platform/darwin/test/MGLStyleValueTests.swift
+++ b/platform/darwin/test/MGLStyleValueTests.swift
@@ -9,8 +9,8 @@ extension MGLStyleValueTests {
         let symbolStyleLayer = MGLSymbolStyleLayer(identifier: "test", source: shapeSource)
         
         // Boolean
-        symbolStyleLayer.iconAllowOverlap = MGLStyleConstantValue(rawValue: true)
-        XCTAssertEqual((symbolStyleLayer.iconAllowOverlap as! MGLStyleConstantValue<NSNumber>).rawValue, true)
+        symbolStyleLayer.iconAllowsOverlap = MGLStyleConstantValue(rawValue: true)
+        XCTAssertEqual((symbolStyleLayer.iconAllowsOverlap as! MGLStyleConstantValue<NSNumber>).rawValue, true)
         
         // Number
         symbolStyleLayer.iconHaloWidth = MGLStyleConstantValue(rawValue: 3)
@@ -32,7 +32,7 @@ extension MGLStyleValueTests {
             3: MGLStyleValue(rawValue: true),
             4: MGLStyleValue(rawValue: false),
             ]
-        symbolStyleLayer.iconAllowOverlap = MGLStyleFunction<NSNumber>(base: 1, stops: stops)
-        XCTAssertEqual((symbolStyleLayer.iconAllowOverlap as! MGLStyleFunction<NSNumber>), MGLStyleFunction(base: 1, stops: stops))
+        symbolStyleLayer.iconAllowsOverlap = MGLStyleFunction<NSNumber>(base: 1, stops: stops)
+        XCTAssertEqual((symbolStyleLayer.iconAllowsOverlap as! MGLStyleFunction<NSNumber>), MGLStyleFunction(base: 1, stops: stops))
     }
 }
diff --git a/platform/darwin/test/MGLSymbolStyleLayerTests.m b/platform/darwin/test/MGLSymbolStyleLayerTests.m
index fc8d848a0a..40250a8c72 100644
--- a/platform/darwin/test/MGLSymbolStyleLayerTests.m
+++ b/platform/darwin/test/MGLSymbolStyleLayerTests.m
@@ -8,6 +8,10 @@
 
 @implementation MGLSymbolLayerTests
 
++ (NSString *)layerType {
+    return @"symbol";
+}
+
 - (void)testSymbolLayer {
     NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
     NSURL *url = [NSURL fileURLWithPath:filePath];
@@ -16,37 +20,37 @@
     MGLSymbolStyleLayer *layer = [[MGLSymbolStyleLayer alloc] initWithIdentifier:@"layerID" source:source];
     [self.mapView.style addLayer:layer];
 
-    layer.iconAllowOverlap = [MGLRuntimeStylingHelper testBool];
-    layer.iconIgnorePlacement = [MGLRuntimeStylingHelper testBool];
+    layer.iconAllowsOverlap = [MGLRuntimeStylingHelper testBool];
+    layer.iconIgnoresPlacement = [MGLRuntimeStylingHelper testBool];
     layer.iconImageName = [MGLRuntimeStylingHelper testString];
-    layer.iconKeepUpright = [MGLRuntimeStylingHelper testBool];
     layer.iconOffset = [MGLRuntimeStylingHelper testOffset];
     layer.iconOptional = [MGLRuntimeStylingHelper testBool];
     layer.iconPadding = [MGLRuntimeStylingHelper testNumber];
-    layer.iconRotate = [MGLRuntimeStylingHelper testNumber];
+    layer.iconRotation = [MGLRuntimeStylingHelper testNumber];
     layer.iconRotationAlignment = [MGLRuntimeStylingHelper testEnum:MGLIconRotationAlignmentAuto type:@encode(MGLIconRotationAlignment)];
     layer.iconScale = [MGLRuntimeStylingHelper testNumber];
     layer.iconTextFit = [MGLRuntimeStylingHelper testEnum:MGLIconTextFitBoth type:@encode(MGLIconTextFit)];
     layer.iconTextFitPadding = [MGLRuntimeStylingHelper testPadding];
-    layer.symbolAvoidEdges = [MGLRuntimeStylingHelper testBool];
+    layer.keepsIconUpright = [MGLRuntimeStylingHelper testBool];
+    layer.keepsTextUpright = [MGLRuntimeStylingHelper testBool];
+    layer.maximumTextAngle = [MGLRuntimeStylingHelper testNumber];
+    layer.maximumTextWidth = [MGLRuntimeStylingHelper testNumber];
+    layer.symbolAvoidsEdges = [MGLRuntimeStylingHelper testBool];
     layer.symbolPlacement = [MGLRuntimeStylingHelper testEnum:MGLSymbolPlacementLine type:@encode(MGLSymbolPlacement)];
     layer.symbolSpacing = [MGLRuntimeStylingHelper testNumber];
-    layer.textAllowOverlap = [MGLRuntimeStylingHelper testBool];
+    layer.textAllowsOverlap = [MGLRuntimeStylingHelper testBool];
     layer.textAnchor = [MGLRuntimeStylingHelper testEnum:MGLTextAnchorBottomRight type:@encode(MGLTextAnchor)];
     layer.textField = [MGLRuntimeStylingHelper testString];
     layer.textFont = [MGLRuntimeStylingHelper testFont];
-    layer.textIgnorePlacement = [MGLRuntimeStylingHelper testBool];
-    layer.textJustify = [MGLRuntimeStylingHelper testEnum:MGLTextJustifyRight type:@encode(MGLTextJustify)];
-    layer.textKeepUpright = [MGLRuntimeStylingHelper testBool];
+    layer.textIgnoresPlacement = [MGLRuntimeStylingHelper testBool];
+    layer.textJustification = [MGLRuntimeStylingHelper testEnum:MGLTextJustificationRight type:@encode(MGLTextJustification)];
     layer.textLetterSpacing = [MGLRuntimeStylingHelper testNumber];
     layer.textLineHeight = [MGLRuntimeStylingHelper testNumber];
-    layer.textMaxAngle = [MGLRuntimeStylingHelper testNumber];
-    layer.textMaxWidth = [MGLRuntimeStylingHelper testNumber];
     layer.textOffset = [MGLRuntimeStylingHelper testOffset];
     layer.textOptional = [MGLRuntimeStylingHelper testBool];
     layer.textPadding = [MGLRuntimeStylingHelper testNumber];
     layer.textPitchAlignment = [MGLRuntimeStylingHelper testEnum:MGLTextPitchAlignmentAuto type:@encode(MGLTextPitchAlignment)];
-    layer.textRotate = [MGLRuntimeStylingHelper testNumber];
+    layer.textRotation = [MGLRuntimeStylingHelper testNumber];
     layer.textRotationAlignment = [MGLRuntimeStylingHelper testEnum:MGLTextRotationAlignmentAuto type:@encode(MGLTextRotationAlignment)];
     layer.textSize = [MGLRuntimeStylingHelper testNumber];
     layer.textTransform = [MGLRuntimeStylingHelper testEnum:MGLTextTransformLowercase type:@encode(MGLTextTransform)];
@@ -67,43 +71,43 @@
 
     MGLSymbolStyleLayer *gLayer = (MGLSymbolStyleLayer *)[self.mapView.style layerWithIdentifier:@"layerID"];
     XCTAssertTrue([gLayer isKindOfClass:[MGLSymbolStyleLayer class]]);
-    XCTAssertEqualObjects(gLayer.iconAllowOverlap, [MGLRuntimeStylingHelper testBool]);
-    XCTAssertEqualObjects(gLayer.iconIgnorePlacement, [MGLRuntimeStylingHelper testBool]);
+    XCTAssertEqualObjects(gLayer.iconAllowsOverlap, [MGLRuntimeStylingHelper testBool]);
+    XCTAssertEqualObjects(gLayer.iconIgnoresPlacement, [MGLRuntimeStylingHelper testBool]);
     XCTAssertEqualObjects(gLayer.iconImageName, [MGLRuntimeStylingHelper testString]);
-    XCTAssertEqualObjects(gLayer.iconKeepUpright, [MGLRuntimeStylingHelper testBool]);
     XCTAssertEqualObjects(gLayer.iconOffset, [MGLRuntimeStylingHelper testOffset]);
     XCTAssertEqualObjects(gLayer.iconOptional, [MGLRuntimeStylingHelper testBool]);
     XCTAssertEqualObjects(gLayer.iconPadding, [MGLRuntimeStylingHelper testNumber]);
-    XCTAssertEqualObjects(gLayer.iconRotate, [MGLRuntimeStylingHelper testNumber]);
+    XCTAssertEqualObjects(gLayer.iconRotation, [MGLRuntimeStylingHelper testNumber]);
     XCTAssert([gLayer.iconRotationAlignment isKindOfClass:[MGLStyleConstantValue class]]);
     XCTAssertEqualObjects(gLayer.iconRotationAlignment, [MGLRuntimeStylingHelper testEnum:MGLIconRotationAlignmentAuto type:@encode(MGLIconRotationAlignment)]);
     XCTAssertEqualObjects(gLayer.iconScale, [MGLRuntimeStylingHelper testNumber]);
     XCTAssert([gLayer.iconTextFit isKindOfClass:[MGLStyleConstantValue class]]);
     XCTAssertEqualObjects(gLayer.iconTextFit, [MGLRuntimeStylingHelper testEnum:MGLIconTextFitBoth type:@encode(MGLIconTextFit)]);
     XCTAssertEqualObjects(gLayer.iconTextFitPadding, [MGLRuntimeStylingHelper testPadding]);
-    XCTAssertEqualObjects(gLayer.symbolAvoidEdges, [MGLRuntimeStylingHelper testBool]);
+    XCTAssertEqualObjects(gLayer.keepsIconUpright, [MGLRuntimeStylingHelper testBool]);
+    XCTAssertEqualObjects(gLayer.keepsTextUpright, [MGLRuntimeStylingHelper testBool]);
+    XCTAssertEqualObjects(gLayer.maximumTextAngle, [MGLRuntimeStylingHelper testNumber]);
+    XCTAssertEqualObjects(gLayer.maximumTextWidth, [MGLRuntimeStylingHelper testNumber]);
+    XCTAssertEqualObjects(gLayer.symbolAvoidsEdges, [MGLRuntimeStylingHelper testBool]);
     XCTAssert([gLayer.symbolPlacement isKindOfClass:[MGLStyleConstantValue class]]);
     XCTAssertEqualObjects(gLayer.symbolPlacement, [MGLRuntimeStylingHelper testEnum:MGLSymbolPlacementLine type:@encode(MGLSymbolPlacement)]);
     XCTAssertEqualObjects(gLayer.symbolSpacing, [MGLRuntimeStylingHelper testNumber]);
-    XCTAssertEqualObjects(gLayer.textAllowOverlap, [MGLRuntimeStylingHelper testBool]);
+    XCTAssertEqualObjects(gLayer.textAllowsOverlap, [MGLRuntimeStylingHelper testBool]);
     XCTAssert([gLayer.textAnchor isKindOfClass:[MGLStyleConstantValue class]]);
     XCTAssertEqualObjects(gLayer.textAnchor, [MGLRuntimeStylingHelper testEnum:MGLTextAnchorBottomRight type:@encode(MGLTextAnchor)]);
     XCTAssertEqualObjects(gLayer.textField, [MGLRuntimeStylingHelper testString]);
     XCTAssertEqualObjects(gLayer.textFont, [MGLRuntimeStylingHelper testFont]);
-    XCTAssertEqualObjects(gLayer.textIgnorePlacement, [MGLRuntimeStylingHelper testBool]);
-    XCTAssert([gLayer.textJustify isKindOfClass:[MGLStyleConstantValue class]]);
-    XCTAssertEqualObjects(gLayer.textJustify, [MGLRuntimeStylingHelper testEnum:MGLTextJustifyRight type:@encode(MGLTextJustify)]);
-    XCTAssertEqualObjects(gLayer.textKeepUpright, [MGLRuntimeStylingHelper testBool]);
+    XCTAssertEqualObjects(gLayer.textIgnoresPlacement, [MGLRuntimeStylingHelper testBool]);
+    XCTAssert([gLayer.textJustification isKindOfClass:[MGLStyleConstantValue class]]);
+    XCTAssertEqualObjects(gLayer.textJustification, [MGLRuntimeStylingHelper testEnum:MGLTextJustificationRight type:@encode(MGLTextJustification)]);
     XCTAssertEqualObjects(gLayer.textLetterSpacing, [MGLRuntimeStylingHelper testNumber]);
     XCTAssertEqualObjects(gLayer.textLineHeight, [MGLRuntimeStylingHelper testNumber]);
-    XCTAssertEqualObjects(gLayer.textMaxAngle, [MGLRuntimeStylingHelper testNumber]);
-    XCTAssertEqualObjects(gLayer.textMaxWidth, [MGLRuntimeStylingHelper testNumber]);
     XCTAssertEqualObjects(gLayer.textOffset, [MGLRuntimeStylingHelper testOffset]);
     XCTAssertEqualObjects(gLayer.textOptional, [MGLRuntimeStylingHelper testBool]);
     XCTAssertEqualObjects(gLayer.textPadding, [MGLRuntimeStylingHelper testNumber]);
     XCTAssert([gLayer.textPitchAlignment isKindOfClass:[MGLStyleConstantValue class]]);
     XCTAssertEqualObjects(gLayer.textPitchAlignment, [MGLRuntimeStylingHelper testEnum:MGLTextPitchAlignmentAuto type:@encode(MGLTextPitchAlignment)]);
-    XCTAssertEqualObjects(gLayer.textRotate, [MGLRuntimeStylingHelper testNumber]);
+    XCTAssertEqualObjects(gLayer.textRotation, [MGLRuntimeStylingHelper testNumber]);
     XCTAssert([gLayer.textRotationAlignment isKindOfClass:[MGLStyleConstantValue class]]);
     XCTAssertEqualObjects(gLayer.textRotationAlignment, [MGLRuntimeStylingHelper testEnum:MGLTextRotationAlignmentAuto type:@encode(MGLTextRotationAlignment)]);
     XCTAssertEqualObjects(gLayer.textSize, [MGLRuntimeStylingHelper testNumber]);
@@ -126,37 +130,37 @@
     XCTAssert([gLayer.textTranslateAnchor isKindOfClass:[MGLStyleConstantValue class]]);
     XCTAssertEqualObjects(gLayer.textTranslateAnchor, [MGLRuntimeStylingHelper testEnum:MGLTextTranslateAnchorViewport type:@encode(MGLTextTranslateAnchor)]);
 
-    layer.iconAllowOverlap = [MGLRuntimeStylingHelper testBoolFunction];
-    layer.iconIgnorePlacement = [MGLRuntimeStylingHelper testBoolFunction];
+    layer.iconAllowsOverlap = [MGLRuntimeStylingHelper testBoolFunction];
+    layer.iconIgnoresPlacement = [MGLRuntimeStylingHelper testBoolFunction];
     layer.iconImageName = [MGLRuntimeStylingHelper testStringFunction];
-    layer.iconKeepUpright = [MGLRuntimeStylingHelper testBoolFunction];
     layer.iconOffset = [MGLRuntimeStylingHelper testOffsetFunction];
     layer.iconOptional = [MGLRuntimeStylingHelper testBoolFunction];
     layer.iconPadding = [MGLRuntimeStylingHelper testNumberFunction];
-    layer.iconRotate = [MGLRuntimeStylingHelper testNumberFunction];
+    layer.iconRotation = [MGLRuntimeStylingHelper testNumberFunction];
     layer.iconRotationAlignment = [MGLRuntimeStylingHelper testEnumFunction:MGLIconRotationAlignmentAuto type:@encode(MGLIconRotationAlignment)];
     layer.iconScale = [MGLRuntimeStylingHelper testNumberFunction];
     layer.iconTextFit = [MGLRuntimeStylingHelper testEnumFunction:MGLIconTextFitBoth type:@encode(MGLIconTextFit)];
     layer.iconTextFitPadding = [MGLRuntimeStylingHelper testPaddingFunction];
-    layer.symbolAvoidEdges = [MGLRuntimeStylingHelper testBoolFunction];
+    layer.keepsIconUpright = [MGLRuntimeStylingHelper testBoolFunction];
+    layer.keepsTextUpright = [MGLRuntimeStylingHelper testBoolFunction];
+    layer.maximumTextAngle = [MGLRuntimeStylingHelper testNumberFunction];
+    layer.maximumTextWidth = [MGLRuntimeStylingHelper testNumberFunction];
+    layer.symbolAvoidsEdges = [MGLRuntimeStylingHelper testBoolFunction];
     layer.symbolPlacement = [MGLRuntimeStylingHelper testEnumFunction:MGLSymbolPlacementLine type:@encode(MGLSymbolPlacement)];
     layer.symbolSpacing = [MGLRuntimeStylingHelper testNumberFunction];
-    layer.textAllowOverlap = [MGLRuntimeStylingHelper testBoolFunction];
+    layer.textAllowsOverlap = [MGLRuntimeStylingHelper testBoolFunction];
     layer.textAnchor = [MGLRuntimeStylingHelper testEnumFunction:MGLTextAnchorBottomRight type:@encode(MGLTextAnchor)];
     layer.textField = [MGLRuntimeStylingHelper testStringFunction];
     layer.textFont = [MGLRuntimeStylingHelper testFontFunction];
-    layer.textIgnorePlacement = [MGLRuntimeStylingHelper testBoolFunction];
-    layer.textJustify = [MGLRuntimeStylingHelper testEnumFunction:MGLTextJustifyRight type:@encode(MGLTextJustify)];
-    layer.textKeepUpright = [MGLRuntimeStylingHelper testBoolFunction];
+    layer.textIgnoresPlacement = [MGLRuntimeStylingHelper testBoolFunction];
+    layer.textJustification = [MGLRuntimeStylingHelper testEnumFunction:MGLTextJustificationRight type:@encode(MGLTextJustification)];
     layer.textLetterSpacing = [MGLRuntimeStylingHelper testNumberFunction];
     layer.textLineHeight = [MGLRuntimeStylingHelper testNumberFunction];
-    layer.textMaxAngle = [MGLRuntimeStylingHelper testNumberFunction];
-    layer.textMaxWidth = [MGLRuntimeStylingHelper testNumberFunction];
     layer.textOffset = [MGLRuntimeStylingHelper testOffsetFunction];
     layer.textOptional = [MGLRuntimeStylingHelper testBoolFunction];
     layer.textPadding = [MGLRuntimeStylingHelper testNumberFunction];
     layer.textPitchAlignment = [MGLRuntimeStylingHelper testEnumFunction:MGLTextPitchAlignmentAuto type:@encode(MGLTextPitchAlignment)];
-    layer.textRotate = [MGLRuntimeStylingHelper testNumberFunction];
+    layer.textRotation = [MGLRuntimeStylingHelper testNumberFunction];
     layer.textRotationAlignment = [MGLRuntimeStylingHelper testEnumFunction:MGLTextRotationAlignmentAuto type:@encode(MGLTextRotationAlignment)];
     layer.textSize = [MGLRuntimeStylingHelper testNumberFunction];
     layer.textTransform = [MGLRuntimeStylingHelper testEnumFunction:MGLTextTransformLowercase type:@encode(MGLTextTransform)];
@@ -175,37 +179,37 @@
     layer.textTranslate = [MGLRuntimeStylingHelper testOffsetFunction];
     layer.textTranslateAnchor = [MGLRuntimeStylingHelper testEnumFunction:MGLTextTranslateAnchorViewport type:@encode(MGLTextTranslateAnchor)];
 
-    XCTAssertEqualObjects(gLayer.iconAllowOverlap, [MGLRuntimeStylingHelper testBoolFunction]);
-    XCTAssertEqualObjects(gLayer.iconIgnorePlacement, [MGLRuntimeStylingHelper testBoolFunction]);
+    XCTAssertEqualObjects(gLayer.iconAllowsOverlap, [MGLRuntimeStylingHelper testBoolFunction]);
+    XCTAssertEqualObjects(gLayer.iconIgnoresPlacement, [MGLRuntimeStylingHelper testBoolFunction]);
     XCTAssertEqualObjects(gLayer.iconImageName, [MGLRuntimeStylingHelper testStringFunction]);
-    XCTAssertEqualObjects(gLayer.iconKeepUpright, [MGLRuntimeStylingHelper testBoolFunction]);
     XCTAssertEqualObjects(gLayer.iconOffset, [MGLRuntimeStylingHelper testOffsetFunction]);
     XCTAssertEqualObjects(gLayer.iconOptional, [MGLRuntimeStylingHelper testBoolFunction]);
     XCTAssertEqualObjects(gLayer.iconPadding, [MGLRuntimeStylingHelper testNumberFunction]);
-    XCTAssertEqualObjects(gLayer.iconRotate, [MGLRuntimeStylingHelper testNumberFunction]);
+    XCTAssertEqualObjects(gLayer.iconRotation, [MGLRuntimeStylingHelper testNumberFunction]);
     XCTAssertEqualObjects(gLayer.iconRotationAlignment, [MGLRuntimeStylingHelper testEnumFunction:MGLIconRotationAlignmentAuto type:@encode(MGLIconRotationAlignment)]);
     XCTAssertEqualObjects(gLayer.iconScale, [MGLRuntimeStylingHelper testNumberFunction]);
     XCTAssertEqualObjects(gLayer.iconTextFit, [MGLRuntimeStylingHelper testEnumFunction:MGLIconTextFitBoth type:@encode(MGLIconTextFit)]);
     XCTAssertEqualObjects(gLayer.iconTextFitPadding, [MGLRuntimeStylingHelper testPaddingFunction]);
-    XCTAssertEqualObjects(gLayer.symbolAvoidEdges, [MGLRuntimeStylingHelper testBoolFunction]);
+    XCTAssertEqualObjects(gLayer.keepsIconUpright, [MGLRuntimeStylingHelper testBoolFunction]);
+    XCTAssertEqualObjects(gLayer.keepsTextUpright, [MGLRuntimeStylingHelper testBoolFunction]);
+    XCTAssertEqualObjects(gLayer.maximumTextAngle, [MGLRuntimeStylingHelper testNumberFunction]);
+    XCTAssertEqualObjects(gLayer.maximumTextWidth, [MGLRuntimeStylingHelper testNumberFunction]);
+    XCTAssertEqualObjects(gLayer.symbolAvoidsEdges, [MGLRuntimeStylingHelper testBoolFunction]);
     XCTAssertEqualObjects(gLayer.symbolPlacement, [MGLRuntimeStylingHelper testEnumFunction:MGLSymbolPlacementLine type:@encode(MGLSymbolPlacement)]);
     XCTAssertEqualObjects(gLayer.symbolSpacing, [MGLRuntimeStylingHelper testNumberFunction]);
-    XCTAssertEqualObjects(gLayer.textAllowOverlap, [MGLRuntimeStylingHelper testBoolFunction]);
+    XCTAssertEqualObjects(gLayer.textAllowsOverlap, [MGLRuntimeStylingHelper testBoolFunction]);
     XCTAssertEqualObjects(gLayer.textAnchor, [MGLRuntimeStylingHelper testEnumFunction:MGLTextAnchorBottomRight type:@encode(MGLTextAnchor)]);
     XCTAssertEqualObjects(gLayer.textField, [MGLRuntimeStylingHelper testStringFunction]);
     XCTAssertEqualObjects(gLayer.textFont, [MGLRuntimeStylingHelper testFontFunction]);
-    XCTAssertEqualObjects(gLayer.textIgnorePlacement, [MGLRuntimeStylingHelper testBoolFunction]);
-    XCTAssertEqualObjects(gLayer.textJustify, [MGLRuntimeStylingHelper testEnumFunction:MGLTextJustifyRight type:@encode(MGLTextJustify)]);
-    XCTAssertEqualObjects(gLayer.textKeepUpright, [MGLRuntimeStylingHelper testBoolFunction]);
+    XCTAssertEqualObjects(gLayer.textIgnoresPlacement, [MGLRuntimeStylingHelper testBoolFunction]);
+    XCTAssertEqualObjects(gLayer.textJustification, [MGLRuntimeStylingHelper testEnumFunction:MGLTextJustificationRight type:@encode(MGLTextJustification)]);
     XCTAssertEqualObjects(gLayer.textLetterSpacing, [MGLRuntimeStylingHelper testNumberFunction]);
     XCTAssertEqualObjects(gLayer.textLineHeight, [MGLRuntimeStylingHelper testNumberFunction]);
-    XCTAssertEqualObjects(gLayer.textMaxAngle, [MGLRuntimeStylingHelper testNumberFunction]);
-    XCTAssertEqualObjects(gLayer.textMaxWidth, [MGLRuntimeStylingHelper testNumberFunction]);
     XCTAssertEqualObjects(gLayer.textOffset, [MGLRuntimeStylingHelper testOffsetFunction]);
     XCTAssertEqualObjects(gLayer.textOptional, [MGLRuntimeStylingHelper testBoolFunction]);
     XCTAssertEqualObjects(gLayer.textPadding, [MGLRuntimeStylingHelper testNumberFunction]);
     XCTAssertEqualObjects(gLayer.textPitchAlignment, [MGLRuntimeStylingHelper testEnumFunction:MGLTextPitchAlignmentAuto type:@encode(MGLTextPitchAlignment)]);
-    XCTAssertEqualObjects(gLayer.textRotate, [MGLRuntimeStylingHelper testNumberFunction]);
+    XCTAssertEqualObjects(gLayer.textRotation, [MGLRuntimeStylingHelper testNumberFunction]);
     XCTAssertEqualObjects(gLayer.textRotationAlignment, [MGLRuntimeStylingHelper testEnumFunction:MGLTextRotationAlignmentAuto type:@encode(MGLTextRotationAlignment)]);
     XCTAssertEqualObjects(gLayer.textSize, [MGLRuntimeStylingHelper testNumberFunction]);
     XCTAssertEqualObjects(gLayer.textTransform, [MGLRuntimeStylingHelper testEnumFunction:MGLTextTransformLowercase type:@encode(MGLTextTransform)]);
@@ -225,4 +229,55 @@
     XCTAssertEqualObjects(gLayer.textTranslateAnchor, [MGLRuntimeStylingHelper testEnumFunction:MGLTextTranslateAnchorViewport type:@encode(MGLTextTranslateAnchor)]);
 }
 
+- (void)testPropertyNames {
+    [self testPropertyName:@"icon-allows-overlap" isBoolean:YES];
+    [self testPropertyName:@"icon-ignores-placement" isBoolean:YES];
+    [self testPropertyName:@"icon-image-name" isBoolean:NO];
+    [self testPropertyName:@"icon-offset" isBoolean:NO];
+    [self testPropertyName:@"is-icon-optional" isBoolean:YES];
+    [self testPropertyName:@"icon-padding" isBoolean:NO];
+    [self testPropertyName:@"icon-rotation" isBoolean:NO];
+    [self testPropertyName:@"icon-rotation-alignment" isBoolean:NO];
+    [self testPropertyName:@"icon-scale" isBoolean:NO];
+    [self testPropertyName:@"icon-text-fit" isBoolean:NO];
+    [self testPropertyName:@"icon-text-fit-padding" isBoolean:NO];
+    [self testPropertyName:@"keeps-icon-upright" isBoolean:YES];
+    [self testPropertyName:@"keeps-text-upright" isBoolean:YES];
+    [self testPropertyName:@"maximum-text-angle" isBoolean:NO];
+    [self testPropertyName:@"maximum-text-width" isBoolean:NO];
+    [self testPropertyName:@"symbol-avoids-edges" isBoolean:YES];
+    [self testPropertyName:@"symbol-placement" isBoolean:NO];
+    [self testPropertyName:@"symbol-spacing" isBoolean:NO];
+    [self testPropertyName:@"text-allows-overlap" isBoolean:YES];
+    [self testPropertyName:@"text-anchor" isBoolean:NO];
+    [self testPropertyName:@"text-field" isBoolean:NO];
+    [self testPropertyName:@"text-font" isBoolean:NO];
+    [self testPropertyName:@"text-ignores-placement" isBoolean:YES];
+    [self testPropertyName:@"text-justification" isBoolean:NO];
+    [self testPropertyName:@"text-letter-spacing" isBoolean:NO];
+    [self testPropertyName:@"text-line-height" isBoolean:NO];
+    [self testPropertyName:@"text-offset" isBoolean:NO];
+    [self testPropertyName:@"is-text-optional" isBoolean:YES];
+    [self testPropertyName:@"text-padding" isBoolean:NO];
+    [self testPropertyName:@"text-pitch-alignment" isBoolean:NO];
+    [self testPropertyName:@"text-rotation" isBoolean:NO];
+    [self testPropertyName:@"text-rotation-alignment" isBoolean:NO];
+    [self testPropertyName:@"text-size" isBoolean:NO];
+    [self testPropertyName:@"text-transform" isBoolean:NO];
+    [self testPropertyName:@"icon-color" isBoolean:NO];
+    [self testPropertyName:@"icon-halo-blur" isBoolean:NO];
+    [self testPropertyName:@"icon-halo-color" isBoolean:NO];
+    [self testPropertyName:@"icon-halo-width" isBoolean:NO];
+    [self testPropertyName:@"icon-opacity" isBoolean:NO];
+    [self testPropertyName:@"icon-translate" isBoolean:NO];
+    [self testPropertyName:@"icon-translate-anchor" isBoolean:NO];
+    [self testPropertyName:@"text-color" isBoolean:NO];
+    [self testPropertyName:@"text-halo-blur" isBoolean:NO];
+    [self testPropertyName:@"text-halo-color" isBoolean:NO];
+    [self testPropertyName:@"text-halo-width" isBoolean:NO];
+    [self testPropertyName:@"text-opacity" isBoolean:NO];
+    [self testPropertyName:@"text-translate" isBoolean:NO];
+    [self testPropertyName:@"text-translate-anchor" isBoolean:NO];
+}
+
 @end