Merge pull request #12565 from sebakerckhof/fix/12564
Handle named colors as string in equal operator
This commit is contained in:
@@ -606,6 +606,10 @@ function getEqualOperator(operator) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Since it's not possible to have color types here, we can leave it out
|
||||||
|
// This fixes issues in case the value type is ambiguously detected as a color (e.g. the string 'red')
|
||||||
|
type = type ^ ValueTypes.COLOR;
|
||||||
|
|
||||||
return `(${expressionToGlsl(
|
return `(${expressionToGlsl(
|
||||||
context,
|
context,
|
||||||
args[0],
|
args[0],
|
||||||
|
|||||||
@@ -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(
|
||||||
|
`(${stringToGlsl(context, 'red')} == 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)'
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user