summaryrefslogtreecommitdiff
path: root/platform/darwin/src/MGLStyleLayer.mm.ejs
diff options
context:
space:
mode:
Diffstat (limited to 'platform/darwin/src/MGLStyleLayer.mm.ejs')
-rw-r--r--platform/darwin/src/MGLStyleLayer.mm.ejs16
1 files changed, 8 insertions, 8 deletions
diff --git a/platform/darwin/src/MGLStyleLayer.mm.ejs b/platform/darwin/src/MGLStyleLayer.mm.ejs
index e8c8d8cfd9..5d9f546cd7 100644
--- a/platform/darwin/src/MGLStyleLayer.mm.ejs
+++ b/platform/darwin/src/MGLStyleLayer.mm.ejs
@@ -26,9 +26,9 @@ namespace mbgl {
<% if (layoutProperties.length) { -%>
<% for (const property of layoutProperties) { -%>
<% if (definesEnum(property, layoutProperties)) { -%>
- MBGL_DEFINE_ENUM(MGL<%- camelize(property.name) %>, {
+ MBGL_DEFINE_ENUM(MGL<%- camelize(enumName(property)) %>, {
<% for (const value in property.values) { -%>
- { MGL<%- camelize(property.name) %><%- camelize(value) %>, "<%-value%>" },
+ { MGL<%- camelize(enumName(property)) %><%- camelize(value) %>, "<%-value%>" },
<% } -%>
});
@@ -38,9 +38,9 @@ namespace mbgl {
<% if (paintProperties.length) { -%>
<% for (const property of paintProperties) { -%>
<% if (definesEnum(property, paintProperties)) { -%>
- MBGL_DEFINE_ENUM(MGL<%- camelize(property.name) %>, {
+ MBGL_DEFINE_ENUM(MGL<%- camelize(enumName(property)) %>, {
<% for (const value in property.values) { -%>
- { MGL<%- camelize(property.name) %><%- camelize(value) %>, "<%-value%>" },
+ { MGL<%- camelize(enumName(property)) %><%- camelize(value) %>, "<%-value%>" },
<% } -%>
});
@@ -239,12 +239,12 @@ namespace mbgl {
@implementation NSValue (MGL<%- camelize(type) %>StyleLayerAdditions)
<% for (let property of enumProperties) { -%>
-+ (NSValue *)valueWithMGL<%- camelize(property.name) %>:(MGL<%- camelize(property.name) %>)<%- objCName(property) %> {
- return [NSValue value:&<%- objCName(property) %> withObjCType:@encode(MGL<%- camelize(property.name) %>)];
++ (NSValue *)valueWithMGL<%- camelize(enumName(property)) %>:(MGL<%- camelize(enumName(property)) %>)<%- objCName(property) %> {
+ return [NSValue value:&<%- objCName(property) %> withObjCType:@encode(MGL<%- camelize(enumName(property)) %>)];
}
-- (MGL<%- camelize(property.name) %>)MGL<%- camelize(property.name) %>Value {
- MGL<%- camelize(property.name) %> <%- objCName(property) %>;
+- (MGL<%- camelize(enumName(property)) %>)MGL<%- camelize(enumName(property)) %>Value {
+ MGL<%- camelize(enumName(property)) %> <%- objCName(property) %>;
[self getValue:&<%- objCName(property) %>];
return <%- objCName(property) %>;
}