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

Rename file_keys to the more familiar tilestats

Browse Source
This commit is contained in:
Erica Fischer
2024-01-23 10:18:20 -08:00
parent 1ba8728ca6
commit 0e2b2b8b7c
6 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mbtiles.cpp
+13 -13
View File
@@ -261,7 +261,7 @@ void tilestats(std::map<std::string, layermap_entry> const &layermap1, size_t el
state.nospace = true; state.nospace = true;
state.json_write_string(geomtype); state.json_write_string(geomtype);
size_t attrib_count = layer.second.file_keys.size(); size_t attrib_count = layer.second.tilestats.size();
if (attrib_count > max_tilestats_attributes) { if (attrib_count > max_tilestats_attributes) {
attrib_count = max_tilestats_attributes; attrib_count = max_tilestats_attributes;
} }
@@ -277,7 +277,7 @@ void tilestats(std::map<std::string, layermap_entry> const &layermap1, size_t el
state.json_write_array(); state.json_write_array();
size_t attrs = 0; size_t attrs = 0;
for (auto attribute : layer.second.file_keys) { for (auto attribute : layer.second.tilestats) {
if (attrs == elements) { if (attrs == elements) {
break; break;
} }
@@ -745,7 +745,7 @@ metadata make_metadata(const char *fname, int minzoom, int maxzoom, double minla
bool first = true; bool first = true;
size_t attribute_count = 0; size_t attribute_count = 0;
for (auto j = fk->second.file_keys.begin(); j != fk->second.file_keys.end(); ++j) { for (auto j = fk->second.tilestats.begin(); j != fk->second.tilestats.end(); ++j) {
if (first) { if (first) {
first = false; first = false;
} }
@@ -852,16 +852,16 @@ std::map<std::string, layermap_entry> merge_layermaps(std::vector<std::map<std::
exit(EXIT_IMPOSSIBLE); exit(EXIT_IMPOSSIBLE);
} }
for (auto fk = map->second.file_keys.begin(); fk != map->second.file_keys.end(); ++fk) { for (auto fk = map->second.tilestats.begin(); fk != map->second.tilestats.end(); ++fk) {
std::string attribname = fk->first; std::string attribname = fk->first;
if (trunc) { if (trunc) {
attribname = truncate16(attribname, 256); attribname = truncate16(attribname, 256);
} }
auto fk2 = out_entry->second.file_keys.find(attribname); auto fk2 = out_entry->second.tilestats.find(attribname);
if (fk2 == out_entry->second.file_keys.end()) { if (fk2 == out_entry->second.tilestats.end()) {
out_entry->second.file_keys.insert(std::pair<std::string, tilestat>(attribname, fk->second)); out_entry->second.tilestats.insert(std::pair<std::string, tilestat>(attribname, fk->second));
} else { } else {
for (auto val : fk->second.sample_values) { for (auto val : fk->second.sample_values) {
auto pt = std::lower_bound(fk2->second.sample_values.begin(), fk2->second.sample_values.end(), val); auto pt = std::lower_bound(fk2->second.sample_values.begin(), fk2->second.sample_values.end(), val);
@@ -901,18 +901,18 @@ std::map<std::string, layermap_entry> merge_layermaps(std::vector<std::map<std::
return out; return out;
} }
void add_to_file_keys(std::map<std::string, tilestat> &file_keys, std::string const &attrib, serial_val const &val) { void add_to_tilestats(std::map<std::string, tilestat> &tilestats, std::string const &attrib, serial_val const &val) {
if (val.type == mvt_null) { if (val.type == mvt_null) {
return; return;
} }
auto fka = file_keys.find(attrib); auto fka = tilestats.find(attrib);
if (fka == file_keys.end()) { if (fka == tilestats.end()) {
file_keys.insert(std::pair<std::string, tilestat>(attrib, tilestat())); tilestats.insert(std::pair<std::string, tilestat>(attrib, tilestat()));
fka = file_keys.find(attrib); fka = tilestats.find(attrib);
} }
if (fka == file_keys.end()) { if (fka == tilestats.end()) {
fprintf(stderr, "Can't happen (tilestats)\n"); fprintf(stderr, "Can't happen (tilestats)\n");
exit(EXIT_IMPOSSIBLE); exit(EXIT_IMPOSSIBLE);
} }
mbtiles.hpp
+2 -2
View File
@@ -18,7 +18,7 @@ struct tilestat {
struct layermap_entry { struct layermap_entry {
size_t id = 0; size_t id = 0;
std::map<std::string, tilestat> file_keys{}; std::map<std::string, tilestat> tilestats{};
int minzoom = 0; int minzoom = 0;
int maxzoom = 0; int maxzoom = 0;
std::string description = ""; std::string description = "";
@@ -76,7 +76,7 @@ void mbtiles_close(sqlite3 *outdb, const char *pgm);
std::map<std::string, layermap_entry> merge_layermaps(std::vector<std::map<std::string, layermap_entry> > const &maps); std::map<std::string, layermap_entry> merge_layermaps(std::vector<std::map<std::string, layermap_entry> > const &maps);
std::map<std::string, layermap_entry> merge_layermaps(std::vector<std::map<std::string, layermap_entry> > const &maps, bool trunc); std::map<std::string, layermap_entry> merge_layermaps(std::vector<std::map<std::string, layermap_entry> > const &maps, bool trunc);
void add_to_file_keys(std::map<std::string, tilestat> &file_keys, std::string const &layername, serial_val const &val); void add_to_tilestats(std::map<std::string, tilestat> &tilestats, std::string const &layername, serial_val const &val);
unsigned long long fnv1a(std::string const &s); unsigned long long fnv1a(std::string const &s);
plugin.cpp
+2 -2
View File
@@ -278,7 +278,7 @@ std::vector<mvt_layer> parse_layers(int fd, int z, unsigned x, unsigned y, std::
attrib.type = tp; attrib.type = tp;
attrib.s = s; attrib.s = s;
add_to_file_keys(fk->second.file_keys, std::string(properties->value.object.keys[i]->value.string.string), attrib); add_to_tilestats(fk->second.tilestats, std::string(properties->value.object.keys[i]->value.string.string), attrib);
} }
} }
@@ -520,7 +520,7 @@ serial_feature parse_feature(json_pull *jp, int z, unsigned x, unsigned y, std::
attrib.type = v.type; attrib.type = v.type;
if (!postfilter) { if (!postfilter) {
add_to_file_keys(fk->second.file_keys, std::string(properties->value.object.keys[i]->value.string.string), attrib); add_to_tilestats(fk->second.tilestats, std::string(properties->value.object.keys[i]->value.string.string), attrib);
} }
} }
} }
serial.cpp
+1 -1
View File
@@ -828,7 +828,7 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
if (!sst->filters) { if (!sst->filters) {
for (size_t i = 0; i < sf.full_keys.size(); i++) { for (size_t i = 0; i < sf.full_keys.size(); i++) {
auto fk = sst->layermap->find(sf.layername); auto fk = sst->layermap->find(sf.layername);
add_to_file_keys(fk->second.file_keys, sf.full_keys[i], sf.full_values[i]); add_to_tilestats(fk->second.tilestats, sf.full_keys[i], sf.full_values[i]);
} }
} }
tile-join.cpp
+13 -13
View File
@@ -149,7 +149,7 @@ void append_tile(std::string message, int z, unsigned x, unsigned y, std::map<st
} }
} }
auto file_keys = layermap.find(layer.name); auto tilestats = layermap.find(layer.name);
for (size_t f = 0; f < layer.features.size(); f++) { for (size_t f = 0; f < layer.features.size(); f++) {
mvt_feature feat = layer.features[f]; mvt_feature feat = layer.features[f];
@@ -269,11 +269,11 @@ void append_tile(std::string message, int z, unsigned x, unsigned y, std::map<st
} }
if (matched || !ifmatched) { if (matched || !ifmatched) {
if (file_keys == layermap.end()) { if (tilestats == layermap.end()) {
layermap.insert(std::pair<std::string, layermap_entry>(layer.name, layermap_entry(layermap.size()))); layermap.insert(std::pair<std::string, layermap_entry>(layer.name, layermap_entry(layermap.size())));
file_keys = layermap.find(layer.name); tilestats = layermap.find(layer.name);
file_keys->second.minzoom = z; tilestats->second.minzoom = z;
file_keys->second.maxzoom = z; tilestats->second.maxzoom = z;
} }
// To keep attributes in their original order instead of alphabetical // To keep attributes in their original order instead of alphabetical
@@ -282,7 +282,7 @@ void append_tile(std::string message, int z, unsigned x, unsigned y, std::map<st
if (fa != attributes.end()) { if (fa != attributes.end()) {
outlayer.tag(outfeature, k, fa->second.first); outlayer.tag(outfeature, k, fa->second.first);
add_to_file_keys(file_keys->second.file_keys, k, fa->second.second); add_to_tilestats(tilestats->second.tilestats, k, fa->second.second);
attributes.erase(fa); attributes.erase(fa);
} }
} }
@@ -300,19 +300,19 @@ void append_tile(std::string message, int z, unsigned x, unsigned y, std::map<st
features_added++; features_added++;
outlayer.features.push_back(outfeature); outlayer.features.push_back(outfeature);
if (z < file_keys->second.minzoom) { if (z < tilestats->second.minzoom) {
file_keys->second.minzoom = z; tilestats->second.minzoom = z;
} }
if (z > file_keys->second.maxzoom) { if (z > tilestats->second.maxzoom) {
file_keys->second.maxzoom = z; tilestats->second.maxzoom = z;
} }
if (feat.type == mvt_point) { if (feat.type == mvt_point) {
file_keys->second.points++; tilestats->second.points++;
} else if (feat.type == mvt_linestring) { } else if (feat.type == mvt_linestring) {
file_keys->second.lines++; tilestats->second.lines++;
} else if (feat.type == mvt_polygon) { } else if (feat.type == mvt_polygon) {
file_keys->second.polygons++; tilestats->second.polygons++;
} }
} }
} }
tile.cpp
+1 -1
View File
@@ -1822,7 +1822,7 @@ void add_tilestats(std::string const &layername, int z, std::vector<std::map<std
exit(EXIT_IMPOSSIBLE); exit(EXIT_IMPOSSIBLE);
} }
add_to_file_keys(fk->second.file_keys, key, val); add_to_tilestats(fk->second.tilestats, key, val);
} }
void preserve_attribute(attribute_op op, serial_feature &, char *stringpool, long long *pool_off, std::string &key, serial_val &val, partial &p) { void preserve_attribute(attribute_op op, serial_feature &, char *stringpool, long long *pool_off, std::string &key, serial_val &val, partial &p) {