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

Add a filter extension to allow filtering individual attributes

Browse Source
This commit is contained in:
Eric Fischer
2018-06-18 11:26:22 -07:00
parent 54983c7536
commit 8d6bd4e10f
9 changed files with 148 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile-join.cpp
+4 -3
View File
@@ -126,6 +126,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, std::map<std::st
for (size_t f = 0; f < layer.features.size(); f++) {
mvt_feature feat = layer.features[f];
std::set<std::string> exclude_attributes;
if (filter != NULL) {
std::map<std::string, mvt_value> attributes;
@@ -164,7 +165,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, std::map<std::st
attributes.insert(std::pair<std::string, mvt_value>("$zoom", v2));
if (!evaluate(attributes, layer.name, filter)) {
if (!evaluate(attributes, layer.name, filter, exclude_attributes)) {
continue;
}
}
@@ -215,7 +216,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, std::map<std::st
continue;
}
if (exclude.count(std::string(key)) == 0) {
if (exclude.count(std::string(key)) == 0 && exclude_attributes.count(std::string(key)) == 0) {
type_and_string tas;
tas.type = type;
tas.string = value;
@@ -246,7 +247,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, std::map<std::st
const char *sjoinkey = joinkey.c_str();
if (exclude.count(joinkey) == 0) {
if (exclude.count(joinkey) == 0 && exclude_attributes.count(joinkey) == 0) {
mvt_value outval;
if (attr_type == mvt_string) {
outval.type = mvt_string;