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

Merge pull request #149 from mapbox/fix-progress

Browse Source 
Progress indicator improvements
This commit is contained in:
Eric Fischer 2016-01-11 13:27:36 -08:00
commit 29db0e8988
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
geojson.c
View File

@ -1319,6 +1319,8 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
progress_seq = indexpos / sizeof(struct index);
if (basezoom < 0 || droprate < 0) { if (basezoom < 0 || droprate < 0) {
struct index *map = mmap(NULL, indexpos, PROT_READ, MAP_PRIVATE, indexfd, 0); struct index *map = mmap(NULL, indexpos, PROT_READ, MAP_PRIVATE, indexfd, 0);
if (map == MAP_FAILED) { if (map == MAP_FAILED) {
@ -1344,12 +1346,22 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
} }
} }
long long progress = -1;
long long indices = indexpos / sizeof(struct index); long long indices = indexpos / sizeof(struct index);
long long i; long long i;
for (i = 0; i < indices; i++) { for (i = 0; i < indices; i++) {
unsigned xx, yy; unsigned xx, yy;
decode(map[i].index, &xx, &yy); decode(map[i].index, &xx, &yy);
long long nprogress = 100 * i / indices;
if (nprogress != progress) {
progress = nprogress;
if (!quiet) {
fprintf(stderr, "Base zoom/drop rate: %lld%% \r", progress);
}
}
int z; int z;
for (z = 0; z <= MAX_ZOOM; z++) { for (z = 0; z <= MAX_ZOOM; z++) {
unsigned xxx = 0, yyy = 0; unsigned xxx = 0, yyy = 0;

8
tile.cc
View File

@ -579,7 +579,11 @@ long long write_tile(char **geoms, char *metabase, char *stringpool, int z, unsi
} }
} }
for (line_detail = detail; line_detail >= min_detail || line_detail == detail; line_detail--) { static volatile double oprogress = 0;
// This only loops if the tile data didn't fit, in which case the detail
// goes down and the progress indicator goes backward for the next try.
for (line_detail = detail; line_detail >= min_detail || line_detail == detail; line_detail--, oprogress = 0) {
GOOGLE_PROTOBUF_VERIFY_VERSION; GOOGLE_PROTOBUF_VERIFY_VERSION;
struct pool keys1[nlayers], values1[nlayers]; struct pool keys1[nlayers], values1[nlayers];
@ -622,8 +626,6 @@ long long write_tile(char **geoms, char *metabase, char *stringpool, int z, unsi
memset(within, '\0', sizeof(within)); memset(within, '\0', sizeof(within));
memset(geompos, '\0', sizeof(geompos)); memset(geompos, '\0', sizeof(geompos));
double oprogress = 0;
*geoms = og; *geoms = og;
while (1) { while (1) {