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

Keep start/end in tue merged index pointing to final geometry offsets

Browse Source
This commit is contained in:
Eric Fischer
2016-10-11 15:13:27 -07:00
parent 08310d9564
commit 9d37bd104a
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.cpp
+10 -7
View File
@@ -244,7 +244,7 @@ int calc_feature_minzoom(struct index *ix, struct drop_state *ds, int maxzoom, i
return feature_minzoom; return feature_minzoom;
} }
static void merge(struct mergelist *merges, int nmerges, unsigned char *map, FILE *f, int bytes, long long nrec, char *geom_map, FILE *geom_out, long long *geompos, long long *progress, long long *progress_max, long long *progress_reported, int maxzoom, int basezoom, double droprate, double gamma, struct drop_state *ds) { static void merge(struct mergelist *merges, int nmerges, unsigned char *map, FILE *indexfile, int bytes, long long nrec, char *geom_map, FILE *geom_out, long long *geompos, long long *progress, long long *progress_max, long long *progress_reported, int maxzoom, int basezoom, double droprate, double gamma, struct drop_state *ds) {
struct mergelist *head = NULL; struct mergelist *head = NULL;
for (size_t i = 0; i < nmerges; i++) { for (size_t i = 0; i < nmerges; i++) {
@@ -254,20 +254,23 @@ static void merge(struct mergelist *merges, int nmerges, unsigned char *map, FIL
} }
while (head != NULL) { while (head != NULL) {
struct index *ix = (struct index *) (map + head->start); struct index ix = *((struct index *) (map + head->start));
fwrite_check(geom_map + ix->start, 1, ix->end - ix->start, geom_out, "merge geometry"); long long pos = *geompos;
*geompos += ix->end - ix->start; fwrite_check(geom_map + ix.start, 1, ix.end - ix.start, geom_out, "merge geometry");
double feature_minzoom = calc_feature_minzoom(ix, ds, maxzoom, basezoom, droprate, gamma); *geompos += ix.end - ix.start;
double feature_minzoom = calc_feature_minzoom(&ix, ds, maxzoom, basezoom, droprate, gamma);
serialize_byte(geom_out, feature_minzoom, geompos, "merge geometry"); serialize_byte(geom_out, feature_minzoom, geompos, "merge geometry");
// Count this as an 75%-accomplishment, since we already 25%-counted it // Count this as an 75%-accomplishment, since we already 25%-counted it
*progress += (ix->end - ix->start) * 3 / 4; *progress += (ix.end - ix.start) * 3 / 4;
if (!quiet && 100 * *progress / *progress_max != *progress_reported) { if (!quiet && 100 * *progress / *progress_max != *progress_reported) {
fprintf(stderr, "Reordering geometry: %lld%% \r", 100 * *progress / *progress_max); fprintf(stderr, "Reordering geometry: %lld%% \r", 100 * *progress / *progress_max);
*progress_reported = 100 * *progress / *progress_max; *progress_reported = 100 * *progress / *progress_max;
} }
fwrite_check(map + head->start, bytes, 1, f, "merge temporary"); ix.start = pos;
ix.end = *geompos;
fwrite_check(&ix, bytes, 1, indexfile, "merge temporary");
head->start += bytes; head->start += bytes;
struct mergelist *m = head; struct mergelist *m = head;