Scale rgb components output by to-rgba expression

Fixes #5777
mapbox · Nov 30, 2017 · b08ad98 · b08ad98
1 parent f261eb1
commit b08ad98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/style-spec/expression/definitions/index.js b/src/style-spec/expression/definitions/index.js
@@ -117,7 +117,7 @@ CompoundExpression.register(expressions, {
  [ColorType],
  (ctx, [v]) => {
  const {r, g, b, a} = v.evaluate(ctx);
- return [r, g, b, a];
+ return [255 * r, 255 * g, 255 * b, a];
  }
  ],
  'rgb': [

diff --git a/test/integration/expression-tests/interpolate/linear-color/test.json b/test/integration/expression-tests/interpolate/linear-color/test.json
@@ -19,9 +19,9 @@
  ],
  "expected": {
  "outputs": [
- [1, 0, 0, 1],
- [0.6, 0, 0.4, 1],
- [0, 0, 1, 1],
+ [255, 0, 0, 1],
+ [153, 0, 102, 1],
+ [0, 0, 255, 1],
  {"error": "Could not parse color from value 'oops blue'"}
  ],
  "compiled": {