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

Mark unexercised attribute accumulation cases as "can't happen"

Browse Source
This commit is contained in:
Erica Fischer
2024-09-19 09:00:24 -07:00
parent e60ca59502
commit 0299706c47
1 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
attribute.cpp
+6 -31
View File
@@ -175,41 +175,12 @@ void preserve_attribute(attribute_op const &op, std::string const &key, serial_v
serial_val sv; serial_val sv;
switch (op) { switch (op) {
case op_sum: case op_sum:
case op_product:
case op_max: case op_max:
case op_min: case op_min:
sv.s = val.s; sv.s = val.s;
sv.type = mvt_double; sv.type = mvt_double;
break; break;
case op_mean: {
auto state = attribute_accum_state.find(key);
if (state == attribute_accum_state.end()) {
accum_state s;
s.sum = atof(val.s.c_str());
s.count = 1;
attribute_accum_state.insert(std::pair<std::string, accum_state>(key, s));
sv.s = milo::dtoa_milo(s.sum / s.count);
} else {
state->second.sum += atof(val.s.c_str());
state->second.count += 1;
sv.s = milo::dtoa_milo(state->second.sum / state->second.count);
}
break;
}
case op_concat:
sv.s = val.s;
sv.type = mvt_string;
break;
case op_comma:
sv.s = val.s;
sv.type = mvt_string;
break;
case op_count: { case op_count: {
auto state = attribute_accum_state.find(key); auto state = attribute_accum_state.find(key);
if (state == attribute_accum_state.end()) { // not already present if (state == attribute_accum_state.end()) { // not already present
@@ -219,12 +190,16 @@ void preserve_attribute(attribute_op const &op, std::string const &key, serial_v
sv.s = std::to_string(s.count); sv.s = std::to_string(s.count);
} else { // already present, incrementing } else { // already present, incrementing
state->second.count += 1; fprintf(stderr, "preserve_attribute: can't happen (count)\n");
sv.s = std::to_string(state->second.count); exit(EXIT_IMPOSSIBLE);
} }
sv.type = mvt_double; sv.type = mvt_double;
break; break;
} }
default:
fprintf(stderr, "can't happen: operation that isn't used by --accumulate-numeric-attributes\n");
exit(EXIT_IMPOSSIBLE);
} }
full_keys.push_back(key); full_keys.push_back(key);