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

Merge pull request #11844 from MoonE/style-expressions-error-message

Browse Source 
Fix Style expressions error message
This commit is contained in:
MoonE
2020-12-19 19:13:21 +01:00
committed by GitHub
parent f7c606c0d1 d2027c1640
commit d151c588a8
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ol/style/expressions.js
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));
} }
} }
@@ -335,7 +337,7 @@ function assertArgsEven(args) {
function assertArgsOdd(args) { function assertArgsOdd(args) {
if (args.length % 2 === 0) { if (args.length % 2 === 0) {
throw new Error( throw new Error(
`An even amount of arguments was expected, got ${args} instead` `An odd amount of arguments was expected, got ${args} instead`
); );
} }
} }