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

Add the mean as an option for accumulating attributes

Browse Source
This commit is contained in:
Eric Fischer
2018-02-27 16:12:29 -08:00
parent f87b71b739
commit d66d05213f
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile.cpp
+22 -3
View File
@@ -1463,7 +1463,7 @@ struct accum_state {
double count = 0; double count = 0;
}; };
void preserve_attribute(attribute_op op, std::map<std::string, accum_state> &attribute_accum_state, serial_feature &sf, char *stringpool, std::string &key, serial_val &val, partial &p) { void preserve_attribute(attribute_op op, std::map<std::string, accum_state> &attribute_accum_state, char *stringpool, std::string &key, serial_val &val, partial &p) {
if (p.need_tilestats.count(key) == 0) { if (p.need_tilestats.count(key) == 0) {
p.need_tilestats.insert(key); p.need_tilestats.insert(key);
} }
@@ -1523,6 +1523,25 @@ void preserve_attribute(attribute_op op, std::map<std::string, accum_state> &att
} }
break; break;
case op_mean:
{
auto state = attribute_accum_state.find(key);
if (state == attribute_accum_state.end()) {
accum_state s;
s.sum = atof(p.full_values[i].s.c_str()) + atof(val.s.c_str());
s.count = 2;
attribute_accum_state.insert(std::pair<std::string, accum_state>(key, s));
p.full_values[i].s = milo::dtoa_milo(s.sum / s.count);
} else {
state->second.sum += atof(val.s.c_str());
state->second.count += 1;
p.full_values[i].s = milo::dtoa_milo(state->second.sum / state->second.count);
}
}
break;
case op_concat: case op_concat:
p.full_values[i].s += val.s; p.full_values[i].s += val.s;
p.full_values[i].type = mvt_string; p.full_values[i].type = mvt_string;
@@ -1547,7 +1566,7 @@ void preserve_attributes(std::map<std::string, attribute_op> const *attribute_ac
auto f = attribute_accum->find(key); auto f = attribute_accum->find(key);
if (f != attribute_accum->end()) { if (f != attribute_accum->end()) {
preserve_attribute(f->second, attribute_accum_state, sf, stringpool, key, sv, p); preserve_attribute(f->second, attribute_accum_state, stringpool, key, sv, p);
} }
} }
for (size_t i = 0; i < sf.full_keys.size(); i++) { for (size_t i = 0; i < sf.full_keys.size(); i++) {
@@ -1556,7 +1575,7 @@ void preserve_attributes(std::map<std::string, attribute_op> const *attribute_ac
auto f = attribute_accum->find(key); auto f = attribute_accum->find(key);
if (f != attribute_accum->end()) { if (f != attribute_accum->end()) {
preserve_attribute(f->second, attribute_accum_state, sf, stringpool, key, sv, p); preserve_attribute(f->second, attribute_accum_state, stringpool, key, sv, p);
} }
} }
} }