Merge branch 'main' into accumulate-attribute-overzoom-merge

This commit is contained in:
Erica Fischer
2024-01-23 14:36:28 -08:00
8 changed files with 108 additions and 125 deletions
+3 -7
View File
@@ -1812,17 +1812,13 @@ void add_tilestats(std::string const &layername, int z, std::vector<std::map<std
(*layer_unmaps)[tiling_seg][lme.id] = layername;
}
}
auto fk = layermap.find(layername);
if (fk == layermap.end()) {
auto ts = layermap.find(layername);
if (ts == layermap.end()) {
fprintf(stderr, "Internal error: layer %s not found\n", layername.c_str());
exit(EXIT_IMPOSSIBLE);
}
type_and_string attrib;
attrib.type = val.type;
attrib.string = val.s;
add_to_file_keys(fk->second.file_keys, key, attrib);
add_to_tilestats(ts->second.tilestats, key, val);
}
void promote_attribute(std::string const &key, partial &p, char *stringpool, long long *pool_off) {