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

Add an option to set the directory for the temporary files

Browse Source
This commit is contained in:
Eric Fischer
2014-11-05 10:34:44 -08:00
parent 097d6ccf7d
commit bc4527b25d
1 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geojson.c
+31 -7
View File
@@ -286,15 +286,34 @@ static void merge(struct merge *merges, int nmerges, unsigned char *map, FILE *f
} }
} }
void read_json(FILE *f, char *fname, char *layername, int maxzoom, int minzoom, sqlite3 *outdb, struct pool *exclude, int exclude_all, double droprate, int buffer) { void read_json(FILE *f, char *fname, char *layername, int maxzoom, int minzoom, sqlite3 *outdb, struct pool *exclude, int exclude_all, double droprate, int buffer, char *tmpdir) {
char metaname[] = "/tmp/meta.XXXXXXXX"; char metaname[strlen(tmpdir) + strlen("/meta.XXXXXXXX") + 1];
char indexname[] = "/tmp/index.XXXXXXXX"; char indexname[strlen(tmpdir) + strlen("/index.XXXXXXXX") + 1];
sprintf(metaname, "%s%s", tmpdir, "/meta.XXXXXXXX");
sprintf(indexname, "%s%s", tmpdir, "/index.XXXXXXXX");
int metafd = mkstemp(metaname); int metafd = mkstemp(metaname);
if (metafd < 0) {
perror(metaname);
exit(EXIT_FAILURE);
}
int indexfd = mkstemp(indexname); int indexfd = mkstemp(indexname);
if (indexfd < 0) {
perror(indexname);
exit(EXIT_FAILURE);
}
FILE *metafile = fopen(metaname, "wb"); FILE *metafile = fopen(metaname, "wb");
if (metafile == NULL) {
perror(metaname);
exit(EXIT_FAILURE);
}
FILE *indexfile = fopen(indexname, "wb"); FILE *indexfile = fopen(indexname, "wb");
if (indexfile == NULL) {
perror(indexname);
exit(EXIT_FAILURE);
}
long long fpos = 0; long long fpos = 0;
unlink(metaname); unlink(metaname);
@@ -673,12 +692,13 @@ int main(int argc, char **argv) {
int force = 0; int force = 0;
double droprate = 2.5; double droprate = 2.5;
int buffer = 5; int buffer = 5;
char *tmpdir = "/tmp";
struct pool exclude; struct pool exclude;
pool_init(&exclude, 0); pool_init(&exclude, 0);
int exclude_all = 0; int exclude_all = 0;
while ((i = getopt(argc, argv, "l:n:z:Z:d:D:o:x:r:b:fX")) != -1) { while ((i = getopt(argc, argv, "l:n:z:Z:d:D:o:x:r:b:fXt:")) != -1) {
switch (i) { switch (i) {
case 'n': case 'n':
name = optarg; name = optarg;
@@ -728,8 +748,12 @@ int main(int argc, char **argv) {
force = 1; force = 1;
break; break;
case 't':
tmpdir = optarg;
break;
default: default:
fprintf(stderr, "Usage: %s -o out.mbtiles [-n name] [-l layername] [-z maxzoom] [-Z minzoom] [-d detail] [-D lower-detail] [-x excluded-field ...] [-X] [-r droprate] [-b buffer] [file.json]\n", argv[0]); fprintf(stderr, "Usage: %s -o out.mbtiles [-n name] [-l layername] [-z maxzoom] [-Z minzoom] [-d detail] [-D lower-detail] [-x excluded-field ...] [-X] [-r droprate] [-b buffer] [-t tmpdir] [file.json]\n", argv[0]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
@@ -759,7 +783,7 @@ int main(int argc, char **argv) {
if (f == NULL) { if (f == NULL) {
fprintf(stderr, "%s: %s: %s\n", argv[0], argv[i], strerror(errno)); fprintf(stderr, "%s: %s: %s\n", argv[0], argv[i], strerror(errno));
} else { } else {
read_json(f, name ? name : argv[i], layer, maxzoom, minzoom, outdb, &exclude, exclude_all, droprate, buffer); read_json(f, name ? name : argv[i], layer, maxzoom, minzoom, outdb, &exclude, exclude_all, droprate, buffer, tmpdir);
fclose(f); fclose(f);
} }
} }
@@ -767,7 +791,7 @@ int main(int argc, char **argv) {
fprintf(stderr, "%s: Only accepts one input file\n", argv[0]); fprintf(stderr, "%s: Only accepts one input file\n", argv[0]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} else { } else {
read_json(stdin, name ? name : outdir, layer, maxzoom, minzoom, outdb, &exclude, exclude_all, droprate, buffer); read_json(stdin, name ? name : outdir, layer, maxzoom, minzoom, outdb, &exclude, exclude_all, droprate, buffer, tmpdir);
} }
mbtiles_close(outdb, argv); mbtiles_close(outdb, argv);