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

Fix tilestats with truncated strings. Trim tilestats if TileJSON is huge

Browse Source
This commit is contained in:
Eric Fischer
2017-08-15 11:23:03 -07:00
parent 5fc261020c
commit 205c28bb64
3 changed files with 1954 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mbtiles.cpp
+25 -7
View File
@@ -137,7 +137,7 @@ bool type_and_string::operator!=(const type_and_string &o) const {
return false; return false;
} }
std::string tilestats(std::map<std::string, layermap_entry> const &layermap1) { std::string tilestats(std::map<std::string, layermap_entry> const &layermap1, size_t elements) {
// Consolidate layers/attributes whose names are truncated // Consolidate layers/attributes whose names are truncated
std::vector<std::map<std::string, layermap_entry>> lmv; std::vector<std::map<std::string, layermap_entry>> lmv;
lmv.push_back(layermap1); lmv.push_back(layermap1);
@@ -192,7 +192,7 @@ std::string tilestats(std::map<std::string, layermap_entry> const &layermap1) {
size_t attrs = 0; size_t attrs = 0;
for (auto attribute : layer.second.file_keys) { for (auto attribute : layer.second.file_keys) {
if (attrs == 100) { if (attrs == elements) {
break; break;
} }
if (attrs != 0) { if (attrs != 0) {
@@ -240,21 +240,27 @@ std::string tilestats(std::map<std::string, layermap_entry> const &layermap1) {
size_t vals = 0; size_t vals = 0;
for (auto value : attribute.second.sample_values) { for (auto value : attribute.second.sample_values) {
if (vals == 100) { if (vals == elements) {
break; break;
} }
if (value.type == mvt_double || value.type == mvt_bool) {
if (vals != 0) { if (vals != 0) {
out.append(",\n"); out.append(",\n");
} }
vals++; vals++;
if (value.type == mvt_double || value.type == mvt_bool) {
out.append("\t\t\t\t\t\t"); out.append("\t\t\t\t\t\t");
out.append(value.string); out.append(value.string);
} else { } else {
std::string trunc = truncate16(value.string, 256); std::string trunc = truncate16(value.string, 256);
if (trunc.size() == value.string.size()) { if (trunc.size() == value.string.size()) {
if (vals != 0) {
out.append(",\n");
}
vals++;
out.append("\t\t\t\t\t\t\""); out.append("\t\t\t\t\t\t\"");
quote(out, value.string.c_str()); quote(out, value.string.c_str());
out.append("\""); out.append("\"");
@@ -407,7 +413,11 @@ void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fnam
sqlite3_free(sql); sqlite3_free(sql);
if (vector) { if (vector) {
std::string buf("{"); size_t elements = 100;
std::string buf;
while (1) {
buf = "{";
aprintf(&buf, "\"vector_layers\": [ "); aprintf(&buf, "\"vector_layers\": [ ");
std::vector<std::string> lnames; std::vector<std::string> lnames;
@@ -457,12 +467,20 @@ void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fnam
aprintf(&buf, " ]"); aprintf(&buf, " ]");
if (do_tilestats) { if (do_tilestats && elements > 0) {
aprintf(&buf, ",\"tilestats\": %s", tilestats(layermap).c_str()); aprintf(&buf, ",\"tilestats\": %s", tilestats(layermap, elements).c_str());
} }
aprintf(&buf, "}"); aprintf(&buf, "}");
if (buf.size() >= 60 * 1024 && elements > 0) {
elements = elements / 2;
continue;
} else {
break;
}
}
sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES ('json', %Q);", buf.c_str()); sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES ('json', %Q);", buf.c_str());
if (sqlite3_exec(db, sql, NULL, NULL, &err) != SQLITE_OK) { if (sqlite3_exec(db, sql, NULL, NULL, &err) != SQLITE_OK) {
fprintf(stderr, "set json: %s\n", err); fprintf(stderr, "set json: %s\n", err);
tests/longjson/out/-z0.json
+1236
View File
File diff suppressed because one or more lines are too long
tests/longjson/sherlock.json
+651
View File
File diff suppressed because one or more lines are too long