Merge pull request #123 from CartoDB/fix-and-expression

Fix "AND" expression
CartoDB · Mar 1, 2018 · b0f5d63 · b0f5d63
2 parents 31a16fd + b791bb9
commit b0f5d63
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/style/expressions/binary.js b/src/core/style/expressions/binary.js
@@ -19,8 +19,8 @@ export const LessThanOrEqualTo = genBinaryOp((x, y) => x <= y ? 1 : 0, (x, y) =>
 export const Equals = genBinaryOp((x, y) => x == y ? 1 : 0, (x, y) => `(${x}==${y}? 1.:0.)`);
 export const NotEquals = genBinaryOp((x, y) => x != y ? 1 : 0, (x, y) => `(${x}!=${y}? 1.:0.)`);
 
-export const Or = genBinaryOp((x, y) => Math.min(x + y, 1), (x, y) => `min(${x} + ${y}, 1.)`);
-export const And = genBinaryOp((x, y) => x * y, (x, y) => `(${x} * ${y})`);
+export const  Or = genBinaryOp((x, y) => Math.min(x + y, 1), (x, y) => `min(${x} + ${y}, 1.)`);
+export const And = genBinaryOp((x, y) => Math.min(x * y, 1), (x, y) => `min(${x} * ${y}, 1.)`);
 
 function genBinaryOp(jsFn, glsl) {
     return class BinaryOperation extends Expression {