diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-10-30 10:21:17 +0200 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-11-11 18:20:01 +0200 |
commit | c6f3cc8b60e0cff032020a780d4fd3de1cb2a112 (patch) | |
tree | 155fe444f21ae88dda664e81cfc8378e28297b0e /scripts | |
parent | e1556fc539607db626b978040895716c1564c9b9 (diff) | |
download | qtlocation-mapboxgl-c6f3cc8b60e0cff032020a780d4fd3de1cb2a112.tar.gz |
[core] Implement image expression (#15877)
* [core] Bump gl-js version
* [core] Implement image expression
* [core] Use new image expression
* [core] Coerce image expression to / from string
* [core] Serialize evaluated image
* [core] Pass available images to layout
* [core] Pass images to evaluation context
* [core] Set available flag value based on image availability
* [core] Allow image coercion to boolean to indicate image availability
* [core] Coalesce image expression
* [core] Add image expression to next build system
* [core] Align serialization format and evaluated type with gl-js
* [core] Add images to expression evaluation method
* [core] Add support for Image expression to expression test runner
* [core] Unskip image expression tests
* [core] Update unit tests
* [core] Use image expression in annotation manager
* [core] Add string to ImageExpression conversion
* [core] Add image expression to expression dsl
* [core] Convert tokens for implicitly created Image literal
* [core] Fix clang format
* [core] Split generated style code lines that are over 120 characters
* [core] Add unit test for image expression equality
* [core] Add image property expression evaluation unit test
* [core] Unskip image expression render test
* [core] Skip 'in' expression tests
* [core] Ignore fill-pattern/update-feature-state render test
* [core] Rename Image::serialize to Image::toValue
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/generate-style-code.js | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js index 0aedba909b..db2548680e 100755 --- a/scripts/generate-style-code.js +++ b/scripts/generate-style-code.js @@ -35,8 +35,9 @@ global.expressionType = function (property) { case 'number': case 'enum': return 'NumberType'; + case 'image': + return 'ImageType'; case 'string': - case 'image': // TODO: replace once we implement image expressions return 'StringType'; case 'color': return `ColorType`; @@ -66,10 +67,11 @@ global.evaluatedType = function (property) { return 'bool'; case 'number': return 'float'; + case 'resolvedImage': + return 'expression::Image'; case 'formatted': return 'expression::Formatted'; case 'string': - case 'image': // TODO: replace once we implement image expressions return 'std::string'; case 'enum': return (isLightProperty(property) ? 'Light' : '') + `${camelize(property.name)}Type`; @@ -168,8 +170,8 @@ global.defaultValue = function (property) { } case 'formatted': case 'string': - case 'image': // TODO: replace once we implement image expressions - return JSON.stringify(property.default || ""); + case 'resolvedImage': + return property.default ? `{${JSON.stringify(property.default)}}` : '{}'; case 'enum': if (property.default === undefined) { return `${evaluatedType(property)}::Undefined`; @@ -191,9 +193,9 @@ global.defaultValue = function (property) { case 'array': const defaults = (property.default || []).map((e) => defaultValue({ type: property.value, default: e })); if (property.length) { - return `{{ ${defaults.join(', ')} }}`; + return `{{${defaults.join(', ')}}}`; } else { - return `{ ${defaults.join(', ')} }`; + return `{${defaults.join(', ')}}`; } default: return property.default; |