ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-03-23 20:35:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a progress indicator. Remember to run the optimizer.

Browse Source
This commit is contained in:
Eric Fischer 2014-09-18 16:23:36 -07:00
parent 9fd4da4f7d
commit 1554a59153
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -6,11 +6,13 @@ install: jsonpull.h libjsonpull.a
cp jsonpull.h $(PREFIX)/include/jsonpull.h
cp libjsonpull.a $(PREFIX)/lib/libjsonpull.a
PG=
jsoncat: jsoncat.o jsonpull.o
cc -g -Wall -o $@ $^
cc $(PG) -g -Wall -o $@ $^
geojson: geojson.o jsonpull.o
cc -g -Wall -o $@ $^ -lm
cc $(PG) -O3 -g -Wall -o $@ $^ -lm
jsoncat.o jsonpull.o: jsonpull.h
@ -19,4 +21,4 @@ libjsonpull.a: jsonpull.o
ranlib $@
%.o: %.c
cc -g -Wall -c $<
cc $(PG) -O3 -g -Wall -c $<

10
geojson.c
View File

@ -395,8 +395,6 @@ void check(struct index *ix, long long n, char *metabase, unsigned *file_bbox) {
}
void read_json(FILE *f) {
json_pull *jp = json_begin_file(f);
char metaname[] = "/tmp/meta.XXXXXXXX";
char indexname[] = "/tmp/index.XXXXXXXX";
@ -412,6 +410,9 @@ void read_json(FILE *f) {
unsigned file_bbox[] = { UINT_MAX, UINT_MAX, 0, 0 };
json_pull *jp = json_begin_file(f);
long long seq = 0;
while (1) {
json_object *j = json_read(jp);
if (j == NULL) {
@ -526,6 +527,11 @@ void read_json(FILE *f) {
ix.index = encode_bbox(bbox[0], bbox[1], bbox[2], bbox[3], 0);
ix.fpos = start;
fwrite_check(&ix, sizeof(struct index), 1, indexfile);
if (seq % 100000 == 0) {
fprintf(stderr, "Read %.1f million features\r", seq / 1000000.0);
}
seq++;
}
next_feature: