tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Not filter express in in filter.

Browse Source
This commit is contained in:
kevin
2020-03-04 14:26:00 +08:00
committed by Thiago Marcos P. Santos
parent 901a960487
commit f98cf0cd4b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mbgl/style/conversion/filter.cpp
View File

@@ -53,9 +53,14 @@ bool isExpression(const Convertible& filter) {
optional<std::string> operand = toString(arrayMember(filter, 1));
return operand && *operand != "$id" && *operand != "$type";
} else if (*op == "in" || *op == "!in" || *op == "!has" || *op == "none") {
} else if (*op == "!in" || *op == "!has" || *op == "none") {
return false;
} else if (*op == "in") {
optional<std::string> str = toString(arrayMember(filter, 1));
return arrayLength(filter) >= 3 && (!str || isArray(arrayMember(filter, 2)));
} else if (*op == "==" || *op == "!=" || *op == ">" || *op == ">=" || *op == "<" || *op == "<=") {
return arrayLength(filter) != 3 || isArray(arrayMember(filter, 1)) || isArray(arrayMember(filter, 2));