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

Reduce tippecanoe memory usage (#5)

Browse Source 
* Change JSON objects to a union type to use less memory

* Stop storing the string representation of JSON numbers

* Restore the ability to create features with large integer attributes

* Make sure large-integer feature IDs still behave as before

* Add missing #include

* Don't preallocate as much space for arrays and objects

* Treat inability to check free disk space as a warning, not an error

* Update changelog and version
This commit is contained in:
Erica Fischer
2022-08-09 15:18:51 -07:00
committed by GitHub
parent 6978a0e102
commit 67cd9d8d85
20 changed files with 911 additions and 827 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.cpp
+9 -7
View File
@@ -1232,10 +1232,12 @@ int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzo
struct statfs fsstat;
if (fstatfs(readers[0].geomfd, &fsstat) != 0) {
perror("fstatfs");
exit(EXIT_FAILURE);
perror("Warning: fstatfs");
fprintf(stderr, "Tippecanoe cannot check whether disk space will run out during tiling.\n");
diskfree = LLONG_MAX;
} else {
diskfree = (long long) fsstat.f_bsize * fsstat.f_bavail;
}
diskfree = (long long) fsstat.f_bsize * fsstat.f_bavail;
std::atomic<long long> progress_seq(0);
@@ -2496,21 +2498,21 @@ void parse_json_source(const char *arg, struct source &src) {
exit(EXIT_FAILURE);
}
src.file = std::string(fname->string);
src.file = std::string(fname->value.string.string);
json_object *layer = json_hash_get(o, "layer");
if (layer != NULL && layer->type == JSON_STRING) {
src.layer = std::string(layer->string);
src.layer = std::string(layer->value.string.string);
}
json_object *description = json_hash_get(o, "description");
if (description != NULL && description->type == JSON_STRING) {
src.description = std::string(description->string);
src.description = std::string(description->value.string.string);
}
json_object *format = json_hash_get(o, "format");
if (format != NULL && format->type == JSON_STRING) {
src.format = std::string(format->string);
src.format = std::string(format->value.string.string);
}
json_free(o);