From 0d0a546b1ec53235f2981e1e19810162cd80b1a5 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 17 Dec 2014 11:10:46 -0800 Subject: [PATCH] No need to split features into child tiles when processing the final zoom. --- geojson.c | 2 +- tile.cc | 4 ++-- tile.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/geojson.c b/geojson.c index f0dbbb1..5beb437 100644 --- a/geojson.c +++ b/geojson.c @@ -283,7 +283,7 @@ void check(int geomfd[4], off_t geom_size[4], char *metabase, unsigned *file_bbo fprintf(stderr, " %3.1f%% %d/%u/%u \r", (((geom - geomstart + along) / (double) todo) + z) / (maxzoom + 1) * 100, z, x, y); - long long len = write_tile(&geom, metabase, file_bbox, z, x, y, z == maxzoom ? full_detail : low_detail, maxzoom, file_keys, layername, outdb, droprate, buffer, fname, jp, sub, minzoom); + long long len = write_tile(&geom, metabase, file_bbox, z, x, y, z == maxzoom ? full_detail : low_detail, maxzoom, file_keys, layername, outdb, droprate, buffer, fname, jp, sub, minzoom, maxzoom); if (z == maxzoom && len > most) { *midx = x; diff --git a/tile.cc b/tile.cc index 8a54d4e..5fd82a7 100644 --- a/tile.cc +++ b/tile.cc @@ -342,7 +342,7 @@ void evaluate(std::vector &features, char *metabase, struct pool *file pool_free(&keys); } -long long write_tile(char **geoms, char *metabase, unsigned *file_bbox, int z, unsigned tx, unsigned ty, int detail, int basezoom, struct pool *file_keys, const char *layername, sqlite3 *outdb, double droprate, int buffer, const char *fname, json_pull *jp, FILE *geomfile[4], int file_minzoom) { +long long write_tile(char **geoms, char *metabase, unsigned *file_bbox, int z, unsigned tx, unsigned ty, int detail, int basezoom, struct pool *file_keys, const char *layername, sqlite3 *outdb, double droprate, int buffer, const char *fname, json_pull *jp, FILE *geomfile[4], int file_minzoom, int file_maxzoom) { int line_detail; static bool evaluated = false; @@ -419,7 +419,7 @@ long long write_tile(char **geoms, char *metabase, unsigned *file_bbox, int z, u } if (line_detail == detail) { /* only write out the next zoom once, even if we retry */ - if (geom.size() > 0) { + if (geom.size() > 0 && z + 1 <= file_maxzoom) { int j; for (j = 0; j < 4; j++) { int xo = j & 1; diff --git a/tile.h b/tile.h index 98090db..59e0e68 100644 --- a/tile.h +++ b/tile.h @@ -36,4 +36,4 @@ struct index { int candup : 1; }; -long long write_tile(char **geom, char *metabase, unsigned *file_bbox, int z, unsigned x, unsigned y, int detail, int basezoom, struct pool *file_keys, const char *layername, sqlite3 *outdb, double droprate, int buffer, const char *fname, struct json_pull *jp, FILE *geomfile[4], int file_minzoom); +long long write_tile(char **geom, char *metabase, unsigned *file_bbox, int z, unsigned x, unsigned y, int detail, int basezoom, struct pool *file_keys, const char *layername, sqlite3 *outdb, double droprate, int buffer, const char *fname, struct json_pull *jp, FILE *geomfile[4], int file_minzoom, int file_maxzoom);