Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

to-color should be idempotent #7260

Merged
merged 1 commit into from
Sep 11, 2018
Merged

to-color should be idempotent #7260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/style-spec/expression/definitions/coercion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ class Coercion implements Expression {
for (const arg of this.args) {
input = arg.evaluate(ctx);
error = null;
if (typeof input === 'string') {
if (input instanceof Color) {
return input;
} else if (typeof input === 'string') {
const c = ctx.parseColor(input);
if (c) return c;
} else if (Array.isArray(input)) {
Expand Down
18 changes: 18 additions & 0 deletions test/integration/expression-tests/to-color/color/test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"expression": ["to-color", ["rgba", 0, 0, 0, 1]],
"inputs": [
[{}, {}]
],
"expected": {
"compiled": {
"result": "success",
"isFeatureConstant": true,
"isZoomConstant": true,
"type": "color"
},
"outputs": [
[0, 0, 0, 1]
],
"serialized": ["rgba", 0, 0, 0, 1]
}
}