[ios, macos] Rename featureProperties to featureAttributes.

3 files changed, 17 insertions, 6 deletions

diff --git a/platform/darwin/src/NSExpression+MGLAdditions.h b/platform/darwin/src/NSExpression+MGLAdditions.h
index 64cbe97418..cfdf27aade 100644
--- a/platform/darwin/src/NSExpression+MGLAdditions.h
+++ b/platform/darwin/src/NSExpression+MGLAdditions.h
@@ -80,7 +80,9 @@ extern MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionInterpolatio
  <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-properties"><code>properties</code></a>
  expression operator in the Mapbox Style Specification.
  */
-@property (class, nonatomic, readonly) NSExpression *featurePropertiesVariableExpression;
+@property (class, nonatomic, readonly) NSExpression *featureAttributesVariableExpression;
+
+@property (class, nonatomic, readonly) NSExpression *featurePropertiesVariableExpression __attribute__((deprecated("Use -featureAttributesVariableExpression.")));
 
 #pragma mark Creating Conditional Expressions
 
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm
index df7e3e98f4..f0edd6e05b 100644
--- a/platform/darwin/src/NSExpression+MGLAdditions.mm
+++ b/platform/darwin/src/NSExpression+MGLAdditions.mm
@@ -656,6 +656,10 @@ NS_DICTIONARY_OF(NSNumber *, NSExpression *) *MGLStopDictionaryByReplacingTokens
     return [NSExpression expressionForVariable:@"featureIdentifier"];
 }
 
++ (NSExpression *)featureAttributesVariableExpression {
+    return [NSExpression expressionForVariable:@"featureAttributes"];
+}
+
 + (NSExpression *)featurePropertiesVariableExpression {
     return [NSExpression expressionForVariable:@"featureProperties"];
 }
@@ -901,7 +905,7 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) {
         } else if ([op isEqualToString:@"id"]) {
             return NSExpression.featureIdentifierVariableExpression;
         }  else if ([op isEqualToString:@"properties"]) {
-            return NSExpression.featurePropertiesVariableExpression;
+            return NSExpression.featureAttributesVariableExpression;
         } else if ([op isEqualToString:@"var"]) {
             return [NSExpression expressionForVariable:argumentObjects.firstObject];
         } else if ([op isEqualToString:@"case"]) {
@@ -1000,7 +1004,8 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) {
             if ([self.variable isEqualToString:@"featureIdentifier"]) {
                 return @[@"id"];
             }
-            if ([self.variable isEqualToString:@"featureProperties"]) {
+            if ([self.variable isEqualToString:@"featureProperties"] ||
+                [self.variable isEqualToString:@"featureAttributes"]) {
                 return @[@"properties"];
             }
             return @[@"var", self.variable];
diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm
index d7c86ed07c..320b98696b 100644
--- a/platform/darwin/test/MGLExpressionTests.mm
+++ b/platform/darwin/test/MGLExpressionTests.mm
@@ -183,12 +183,16 @@ using namespace std::string_literals;
         XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:@[@"id"]], expression);
     }
     {
-        NSExpression *expression = [NSExpression expressionForVariable:@"featureProperties"];
+        NSExpression *expression = [NSExpression expressionForVariable:@"featureAttributes"];
         XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, @[@"properties"]);
-        XCTAssertEqualObjects([NSExpression expressionWithFormat:@"$featureProperties"].mgl_jsonExpressionObject, @[@"properties"]);
+        XCTAssertEqualObjects([NSExpression expressionWithFormat:@"$featureAttributes"].mgl_jsonExpressionObject, @[@"properties"]);
         XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:@[@"properties"]], expression);
     }
     {
+        NSExpression *expression = [NSExpression expressionForVariable:@"featureProperties"];
+        XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, @[@"properties"]);
+    }
+    {
         NSExpression *expression = [NSExpression expressionForVariable:@"loremIpsum"];
         NSArray *jsonExpression = @[@"var", @"loremIpsum"];
         XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression);
@@ -867,7 +871,7 @@ using namespace std::string_literals;
     }
     {
         NSExpression *expression = [NSExpression expressionForFunction:@"mgl_does:have:"
-                                                             arguments:@[[NSExpression expressionForVariable:@"featureProperties"],
+                                                             arguments:@[[NSExpression expressionForVariable:@"featureAttributes"],
                                                                          [NSExpression expressionForConstantValue:@"x"]]];
         NSArray *jsonExpression = @[@"has", @"x", @[@"properties"]];
         XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression);