ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get value type only once

Browse Source
This commit is contained in:
Maximilian Krög
2020-12-19 14:11:33 +01:00
parent 8363e66d1e
commit d2027c1640
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/style/expressions.js
+7 -5
View File
@@ -259,21 +259,23 @@ export function expressionToGlsl(context, value, typeHint) {
); );
} }
return operator.toGlsl(context, value.slice(1), 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)); return numberToGlsl(/** @type {number} */ (value));
} else if ((getValueType(value) & ValueTypes.BOOLEAN) > 0) { } else if ((valueType & ValueTypes.BOOLEAN) > 0) {
return value.toString(); return value.toString();
} else if ( } else if (
(getValueType(value) & ValueTypes.STRING) > 0 && (valueType & ValueTypes.STRING) > 0 &&
(typeHint === undefined || typeHint == ValueTypes.STRING) (typeHint === undefined || typeHint == ValueTypes.STRING)
) { ) {
return stringToGlsl(context, value.toString()); return stringToGlsl(context, value.toString());
} else if ( } else if (
(getValueType(value) & ValueTypes.COLOR) > 0 && (valueType & ValueTypes.COLOR) > 0 &&
(typeHint === undefined || typeHint == ValueTypes.COLOR) (typeHint === undefined || typeHint == ValueTypes.COLOR)
) { ) {
return colorToGlsl(/** @type {number[]|string} */ (value)); 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)); return arrayToGlsl(/** @type {number[]} */ (value));
} }
} }