From ffbddef756061d10c12ac05405b910e67047775a Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Mon, 11 Jan 2016 13:09:10 -0800
Subject: [PATCH] Accurate feature count, more chatty base zoom determination,
 less chatty tiling

---
 geojson.c | 12 ++++++++++++
 tile.cc   |  8 +++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/geojson.c b/geojson.c
index 41a532b..35f06c0 100644
--- a/geojson.c
+++ b/geojson.c
@@ -1319,6 +1319,8 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
 		exit(EXIT_FAILURE);
 	}
 
+	progress_seq = indexpos / sizeof(struct index);
+
 	if (basezoom < 0 || droprate < 0) {
 		struct index *map = mmap(NULL, indexpos, PROT_READ, MAP_PRIVATE, indexfd, 0);
 		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 i;
 		for (i = 0; i < indices; i++) {
 			unsigned 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;
 			for (z = 0; z <= MAX_ZOOM; z++) {
 				unsigned xxx = 0, yyy = 0;
diff --git a/tile.cc b/tile.cc
index 06f44db..0e19cb7 100644
--- a/tile.cc
+++ b/tile.cc
@@ -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;
 
 		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(geompos, '\0', sizeof(geompos));
 
-		double oprogress = 0;
-
 		*geoms = og;
 
 		while (1) {