From d2027c16405690db4f10ac909bbc4593f8fcd0de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sat, 19 Dec 2020 14:11:33 +0100 Subject: [PATCH] Get value type only once --- src/ol/style/expressions.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ol/style/expressions.js b/src/ol/style/expressions.js index f0a4cd7f53..a35e9f05e9 100644 --- a/src/ol/style/expressions.js +++ b/src/ol/style/expressions.js @@ -259,21 +259,23 @@ export function expressionToGlsl(context, value, typeHint) { ); } return operator.toGlsl(context, value.slice(1), typeHint); - } else if ((getValueType(value) & ValueTypes.NUMBER) > 0) { + } + const valueType = getValueType(value); + if ((valueType & ValueTypes.NUMBER) > 0) { return numberToGlsl(/** @type {number} */ (value)); - } else if ((getValueType(value) & ValueTypes.BOOLEAN) > 0) { + } else if ((valueType & ValueTypes.BOOLEAN) > 0) { return value.toString(); } else if ( - (getValueType(value) & ValueTypes.STRING) > 0 && + (valueType & ValueTypes.STRING) > 0 && (typeHint === undefined || typeHint == ValueTypes.STRING) ) { return stringToGlsl(context, value.toString()); } else if ( - (getValueType(value) & ValueTypes.COLOR) > 0 && + (valueType & ValueTypes.COLOR) > 0 && (typeHint === undefined || typeHint == ValueTypes.COLOR) ) { return colorToGlsl(/** @type {number[]|string} */ (value)); - } else if ((getValueType(value) & ValueTypes.NUMBER_ARRAY) > 0) { + } else if ((valueType & ValueTypes.NUMBER_ARRAY) > 0) { return arrayToGlsl(/** @type {number[]} */ (value)); } }