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

Handle named colors as string in equal operator

Browse Source
This commit is contained in:
Seba Kerckhof
2021-07-27 18:54:08 +02:00
parent 1dc336e459
commit db57d9bf89
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/style/expressions.js
View File

@@ -606,6 +606,12 @@ function getEqualOperator(operator) {
); );
} }
if (type === (ValueTypes.COLOR | ValueTypes.STRING)) {
// It's not possible to compare attributes with color values
// So force it to be treated as a string
type = ValueTypes.STRING;
}
return `(${expressionToGlsl( return `(${expressionToGlsl(
context, context,
args[0], args[0],

3
test/browser/spec/ol/style/expressions.test.js
View File

@@ -250,6 +250,9 @@ describe('ol.style.expressions', function () {
expect(expressionToGlsl(context, ['==', 10, ['get', 'attr4']])).to.eql( expect(expressionToGlsl(context, ['==', 10, ['get', 'attr4']])).to.eql(
'(10.0 == a_attr4)' '(10.0 == a_attr4)'
); );
expect(expressionToGlsl(context, ['==', 'red', ['get', 'attr4']])).to.eql(
'(0.0 == a_attr4)'
);
expect(expressionToGlsl(context, ['!=', 10, ['get', 'attr4']])).to.eql( expect(expressionToGlsl(context, ['!=', 10, ['get', 'attr4']])).to.eql(
'(10.0 != a_attr4)' '(10.0 != a_attr4)'
); );