diff options
| author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-11-01 17:33:59 +0200 |
|---|---|---|
| committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-11-11 18:20:01 +0200 |
| commit | 3f7ed99d89be9cad32fc1ecdfcc256aa3030f166 (patch) | |
| tree | 540cf621bf8be76aa06316713a07cfc0d5c27fa1 | |
| parent | 461460fc8798921bd2efadedbbd800e96c900261 (diff) | |
| download | qtlocation-mapboxgl-3f7ed99d89be9cad32fc1ecdfcc256aa3030f166.tar.gz | |
[darwin] Update image expression evaluated type name
| -rwxr-xr-x | platform/darwin/scripts/generate-style-code.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js index 75dbdf367c..5d0434f9ea 100755 --- a/platform/darwin/scripts/generate-style-code.js +++ b/platform/darwin/scripts/generate-style-code.js @@ -159,7 +159,7 @@ global.objCTestValue = function (property, layerType, arraysAsStructs, indent) { `@"'${_.startCase(propertyName)}'"` : `@"${_.startCase(propertyName)}"`; case 'string': - case 'image': // TODO: replace once we implement image expressions + case 'resolvedImage': // TODO: replace once we implement image expressions return `@"'${_.startCase(propertyName)}'"`; case 'enum': return `@"'${_.last(_.keys(property.values))}'"`; @@ -209,7 +209,7 @@ global.mbglTestValue = function (property, layerType) { return '1.0'; case 'formatted': case 'string': - case 'image': // TODO: replace once we implement image expressions + case 'resolvedImage': // TODO: replace once we implement image expressions return `"${_.startCase(propertyName)}"`; case 'enum': { let type = camelize(originalPropertyName(property)); @@ -477,7 +477,7 @@ global.describeType = function (property) { return 'numeric'; case 'formatted': case 'string': - case 'image': // TODO: replace once we implement image expressions + case 'resolvedImage': // TODO: replace once we implement image expressions return 'string'; case 'enum': return '`MGL' + camelize(property.name) + '`'; @@ -613,7 +613,7 @@ global.propertyType = function (property) { return 'NSNumber *'; case 'formatted': case 'string': - case 'image': // TODO: replace once we implement image expressions + case 'resolvedImage': // TODO: replace once we implement image expressions return 'NSString *'; case 'enum': return 'NSValue *'; @@ -646,7 +646,7 @@ global.isInterpolatable = function (property) { return type !== 'boolean' && type !== 'enum' && type !== 'string' && - type !== 'image' && + type !== 'resolvedImage' && type !== 'formatted'; }; @@ -660,7 +660,7 @@ global.valueTransformerArguments = function (property) { case 'formatted': return ['mbgl::style::expression::Formatted', objCType]; case 'string': - case 'image': // TODO: replace once we implement image expressions + case 'resolvedImage': // TODO: replace once we implement image expressions return ['std::string', objCType]; case 'enum': return [mbglType(property), 'NSValue *', mbglType(property), `MGL${camelize(property.name)}`]; @@ -700,7 +700,7 @@ global.mbglType = function(property) { case 'formatted': return 'mbgl::style::expression::Formatted'; case 'string': - case 'image': // TODO: replace once we implement image expressions + case 'resolvedImage': // TODO: replace once we implement image expressions return 'std::string'; case 'enum': { let type = camelize(originalPropertyName(property)); |