diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-02 08:25:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow non-string types to be used in "in" expressions (#211)

Browse Source 
* Allow non-string types to be used in "in" expressions

* No unidecode smashing in "in" expressions, though!

* Update version and changelog
This commit is contained in:
Erica Fischer
2024-03-04 10:16:48 -08:00
committed by GitHub
parent 6a8f1b83d8
commit 021bb96aeb
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+4
View File
@@ -1,3 +1,7 @@
# 2.49.0
* FSL-style "in" expressions now allow numeric comparisons, but they no longer use unidecode to remove diacritics.
# 2.48.0 # 2.48.0
* Fix some undefined behavior bugs, one of which results in slight changes to line simplification choices * Fix some undefined behavior bugs, one of which results in slight changes to line simplification choices
evaluator.cpp
+7 -8
View File
@@ -387,22 +387,21 @@ static int eval(std::function<mvt_value(std::string const &)> feature, json_obje
if (f->value.array.array[2]->type == JSON_ARRAY && if (f->value.array.array[2]->type == JSON_ARRAY &&
(strcmp(f->value.array.array[1]->value.string.string, "in") == 0 || (strcmp(f->value.array.array[1]->value.string.string, "in") == 0 ||
strcmp(f->value.array.array[1]->value.string.string, "ni") == 0)) { strcmp(f->value.array.array[1]->value.string.string, "ni") == 0)) {
std::string s = mvt_value_to_string(lhs, fail, unidecode_data); static std::vector<std::string> no_unidecode_data;
std::string s = mvt_value_to_string(lhs, fail, no_unidecode_data);
if (fail) { if (fail) {
return -1; // null in anything => false return -1; // null in anything => false
} }
bool contains = false; bool contains = false;
for (size_t i = 0; i < f->value.array.array[2]->value.array.length; i++) { for (size_t i = 0; i < f->value.array.array[2]->value.array.length; i++) {
if (f->value.array.array[2]->value.array.array[i]->type != JSON_STRING) { fail = false;
return -1; // anything in [not-a-string] => null int cmp = compare_fsl(ff, f->value.array.array[2]->value.array.array[i], fail, no_unidecode_data);
if (fail) {
continue; // null
} }
if (unidecode_data.size() > 0) { if (cmp == 0) {
smash(unidecode_data, f->value.array.array[2]->value.array.array[i]);
}
if (strcmp(s.c_str(), f->value.array.array[2]->value.array.array[i]->value.string.string) == 0) {
contains = true; contains = true;
break; break;
} }
version.hpp
+1 -1
View File
@@ -1,6 +1,6 @@
#ifndef VERSION_HPP #ifndef VERSION_HPP
#define VERSION_HPP #define VERSION_HPP
#define VERSION "v2.48.0" #define VERSION "v2.49.0"
#endif #endif