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

Don't convert types of attributes without accumulators

Browse Source
This commit is contained in:
Erica Fischer
2024-01-24 11:14:50 -08:00
parent 0035d40e41
commit bdc0f207ae
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clip.cpp
+11 -2
View File
@@ -815,8 +815,17 @@ static void feature_out(std::vector<tile_feature> const &features, mvt_layer &ou
std::vector<serial_val> full_values; std::vector<serial_val> full_values;
for (size_t i = 0; i + 1 < features[0].tags.size(); i += 2) { for (size_t i = 0; i + 1 < features[0].tags.size(); i += 2) {
full_keys.push_back(features[0].layer->keys[features[0].tags[i]]); auto f = attribute_accum.find(features[0].layer->keys[features[0].tags[i]]);
full_values.push_back(mvt_value_to_serial_val(features[0].layer->values[features[0].tags[i + 1]])); if (f != attribute_accum.end()) {
// this attribute has an accumulator, so convert it
full_keys.push_back(features[0].layer->keys[features[0].tags[i]]);
full_values.push_back(mvt_value_to_serial_val(features[0].layer->values[features[0].tags[i + 1]]));
} else {
// otherwise just tag it directly onto the output feature
if (keep.size() == 0 || keep.find(features[0].layer->keys[features[0].tags[i]]) != keep.end()) {
outlayer.tag(outfeature, features[0].layer->keys[features[0].tags[i]], features[0].layer->values[features[0].tags[i + 1]]);
}
}
} }
// accumulate whatever attributes are specified to be accumulated // accumulate whatever attributes are specified to be accumulated
evaluator.cpp
-4
View File
@@ -667,10 +667,6 @@ json_object *parse_filter(const char *s) {
bool evaluate(mvt_feature const &feat, mvt_layer const &layer, json_object *filter, std::set<std::string> &exclude_attributes, int z) { bool evaluate(mvt_feature const &feat, mvt_layer const &layer, json_object *filter, std::set<std::string> &exclude_attributes, int z) {
if (filter != NULL) { if (filter != NULL) {
if (filter->type == JSON_TRUE) {
return true;
}
std::map<std::string, mvt_value> attributes; std::map<std::string, mvt_value> attributes;
for (size_t t = 0; t + 1 < feat.tags.size(); t += 2) { for (size_t t = 0; t + 1 < feat.tags.size(); t += 2) {