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

Working on testing against Mapbox GL JS filter tests

Browse Source
This commit is contained in:
Eric Fischer
2017-09-01 16:27:27 -07:00
parent 0fd4454129
commit c232e565db
8 changed files with 1060 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serial.cpp
+9 -6
View File
@@ -514,22 +514,18 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
for (size_t i = 0; i < sf.full_keys.size(); i++) {
if (sst->exclude_all) {
if (sst->include->count(sf.full_keys[i]) == 0) {
if (sst->include->count(sf.full_keys[i]) == 0 && sf.full_keys[i] != "") {
sf.full_keys[i] = "";
sf.m--;
continue;
}
} else if (sst->exclude->count(sf.full_keys[i]) != 0) {
} else if (sst->exclude->count(sf.full_keys[i]) != 0 && sf.full_keys[i] != "") {
sf.full_keys[i] = "";
sf.m--;
continue;
}
coerce_value(sf.full_keys[i], sf.full_values[i].type, sf.full_values[i].s, sst->attribute_types);
if (sf.full_values[i].type == mvt_null) {
sf.full_keys[i] = "";
sf.m--;
}
}
if (sst->filter != NULL) {
@@ -570,6 +566,13 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
}
}
for (size_t i = 0; i < sf.full_keys.size(); i++) {
if (sf.full_values[i].type == mvt_null && sf.full_keys[i] != "") {
sf.full_keys[i] = "";
sf.m--;
}
}
if (!sst->filters) {
for (size_t i = 0; i < sf.full_keys.size(); i++) {
if (sf.full_keys[i].size() == 0) {