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

Merge pull request #11197 from RydingM/master

Browse Source 
Added '&&' logical operator to expressions
This commit is contained in:
Olivier Guyot
2020-07-17 14:37:12 +02:00
committed by GitHub
parent f8732cd0a8 b25d7bc58a
commit 15553f7aec
2 changed files with 72 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/style/expressions.test.js
+47
View File
@@ -179,6 +179,12 @@ describe('ol.style.expressions', function () {
expect(getValueType(['!=', 10, ['get', 'attr4']])).to.eql(
ValueTypes.BOOLEAN
);
expect(getValueType(['all', true, ['get', 'attr4']])).to.eql(
ValueTypes.BOOLEAN
);
expect(getValueType(['any', true, ['get', 'attr4']])).to.eql(
ValueTypes.BOOLEAN
);
expect(getValueType(['between', ['get', 'attr4'], -4.0, 5.0])).to.eql(
ValueTypes.BOOLEAN
);
@@ -244,6 +250,15 @@ describe('ol.style.expressions', function () {
expect(expressionToGlsl(context, ['!=', 10, ['get', 'attr4']])).to.eql(
'(10.0 != a_attr4)'
);
expect(expressionToGlsl(context, ['all', true, ['get', 'attr4']])).to.eql(
'(true && a_attr4)'
);
expect(expressionToGlsl(context, ['any', true, ['get', 'attr4']])).to.eql(
'(true || a_attr4)'
);
expect(
expressionToGlsl(context, ['any', true, ['get', 'attr4'], true])
).to.eql('(true || a_attr4 || true)');
expect(
expressionToGlsl(context, ['between', ['get', 'attr4'], -4.0, 5.0])
).to.eql('(a_attr4 >= -4.0 && a_attr4 <= 5.0)');
@@ -294,6 +309,22 @@ describe('ol.style.expressions', function () {
}
expect(thrown).to.be(true);
thrown = false;
try {
expressionToGlsl(context, ['any', ['var', 'aa'], 10]);
} catch (e) {
thrown = true;
}
expect(thrown).to.be(true);
thrown = false;
try {
expressionToGlsl(context, ['all', ['var', 'aa'], 10]);
} catch (e) {
thrown = true;
}
expect(thrown).to.be(true);
thrown = false;
try {
expressionToGlsl(context, ['<', 0, 'aa']);
@@ -336,6 +367,22 @@ describe('ol.style.expressions', function () {
}
expect(thrown).to.be(true);
thrown = false;
try {
expressionToGlsl(context, ['all', ['var', true], ['get', true], true]);
} catch (e) {
thrown = true;
}
expect(thrown).to.be(true);
thrown = false;
try {
expressionToGlsl(context, ['any', ['var', true]]);
} catch (e) {
thrown = true;
}
expect(thrown).to.be(true);
thrown = false;
try {
expressionToGlsl(context, ['<', 4]);