Rename to --generate-variable-depth-tile-pyramid

CHANGELOG.md

@@ -1,6 +1,6 @@
 # 2.58.0
 
-* Add --truncate-zooms option
+* Add --generate-variable-depth-tile-pyramid option
 * Add --line-simplification and --tiny-polygon-size options to tippecanoe-overzoom
 * Adjust tile feature limit for --retain-points-multiplier
 * Tune convergence rate for --coalesce-densest and --drop-densest

README.md

@@ -352,7 +352,7 @@ Parallel processing will also be automatic if the input file is in FlatGeobuf fo
    specified maximum zoom and to any levels added beyond that.
  * `--extend-zooms-if-still-dropping-maximum=`_count_: Increase the maxzoom if features are still being dropped at that zoom level
    by up to _count_ zoom levels.
- * `-at` or `--truncate-zooms`: Don't produce child tiles for any tile that should be sufficient to be overzoomed to any higher zoom level. Such tiles will be produced with maximum detail and no simplification. Tiles with point features below the basezoom or where any features have to be dropped dynamically, or which contain too many features or bytes with full detail, will be written out with normal detail and split into child tiles.
+ * `-at` or `--generate-variable-depth-tile-pyramid`: Don't produce child tiles for any tile that should be sufficient to be overzoomed to any higher zoom level. Such tiles will be produced with maximum detail and no simplification or polygon cleaning. Tiles with point features below the basezoom or where any features have to be dropped dynamically, or which contain too many features or bytes with full detail, will be written out with normal detail and split into child tiles. Tilesets generated with this option are suitable for use only with tile servers that will find the appropriate tile to overzoom from and will simplify and clean the geometries appropriately before serving the tile.
  * `-R` _zoom_`/`_x_`/`_y_ or `--one-tile=`_zoom_`/`_x_`/`_y_: Set the minzoom and maxzoom to _zoom_ and produce only
    the single specified tile at that zoom level.
 

main.cpp

@@ -3067,7 +3067,7 @@ int main(int argc, char **argv) {
 		{"smallest-maximum-zoom-guess", required_argument, 0, '~'},
 		{"extend-zooms-if-still-dropping", no_argument, &additional[A_EXTEND_ZOOMS], 1},
 		{"extend-zooms-if-still-dropping-maximum", required_argument, 0, '~'},
-		{"truncate-zooms", no_argument, &additional[A_TRUNCATE_ZOOMS], 1},
+		{"generate-variable-depth-tile-pyramid", no_argument, &additional[A_VARIABLE_DEPTH_PYRAMID], 1},
 		{"one-tile", required_argument, 0, 'R'},
 
 		{"Tile resolution", 0, 0, 0},

man/tippecanoe.1

@@ -416,7 +416,7 @@ specified maximum zoom and to any levels added beyond that.
 \fB\fC\-\-extend\-zooms\-if\-still\-dropping\-maximum=\fR\fIcount\fP: Increase the maxzoom if features are still being dropped at that zoom level
 by up to \fIcount\fP zoom levels.
 .IP \(bu 2
-\fB\fC\-at\fR or \fB\fC\-\-truncate\-zooms\fR: Don't produce child tiles for any tile that should be sufficient to be overzoomed to any higher zoom level. Such tiles will be produced with maximum detail and no simplification. Tiles with point features below the basezoom or where any features have to be dropped dynamically, or which contain too many features or bytes with full detail, will be written out with normal detail and split into child tiles.
+\fB\fC\-at\fR or \fB\fC\-\-generate\-variable\-depth\-tile\-pyramid\fR: Don't produce child tiles for any tile that should be sufficient to be overzoomed to any higher zoom level. Such tiles will be produced with maximum detail and no simplification or polygon cleaning. Tiles with point features below the basezoom or where any features have to be dropped dynamically, or which contain too many features or bytes with full detail, will be written out with normal detail and split into child tiles. Tilesets generated with this option are suitable for use only with tile servers that will find the appropriate tile to overzoom from and will simplify and clean the geometries appropriately before serving the tile.
 .IP \(bu 2
 \fB\fC\-R\fR \fIzoom\fP\fB\fC/\fR\fIx\fP\fB\fC/\fR\fIy\fP or \fB\fC\-\-one\-tile=\fR\fIzoom\fP\fB\fC/\fR\fIx\fP\fB\fC/\fR\fIy\fP: Set the minzoom and maxzoom to \fIzoom\fP and produce only
 the single specified tile at that zoom level.

options.hpp

@@ -26,7 +26,7 @@
 #define A_HILBERT ((int) 'h')
 #define A_VISVALINGAM ((int) 'v')
 #define A_GENERATE_POLYGON_LABEL_POINTS ((int) 'P')
-#define A_TRUNCATE_ZOOMS ((int) 't')
+#define A_VARIABLE_DEPTH_PYRAMID ((int) 't')
 
 #define P_SIMPLIFY ((int) 's')
 #define P_SIMPLIFY_LOW ((int) 'S')

tests/tl_2022_11_tract/out/-z14_-Z12_--coalesce-densest-as-needed_--truncate-zooms_-M25000.json → tests/tl_2022_11_tract/out/-z14_-Z12_--coalesce-densest-as-needed_--generate-variable-depth-tile-pyramid_-M25000.json

@@ -2,13 +2,13 @@
 "antimeridian_adjusted_bounds": "-77.119756,38.791645,-76.909390,38.995845",
 "bounds": "-77.119756,38.791645,-76.909390,38.995845",
 "center": "-77.113037,38.950865,14",
-"description": "tests/tl_2022_11_tract/out/-z14_-Z12_--coalesce-densest-as-needed_--truncate-zooms_-M25000.json.check.mbtiles",
+"description": "tests/tl_2022_11_tract/out/-z14_-Z12_--coalesce-densest-as-needed_--generate-variable-depth-tile-pyramid_-M25000.json.check.mbtiles",
 "format": "pbf",
-"generator_options": "./tippecanoe -q -a@ -f -o tests/tl_2022_11_tract/out/-z14_-Z12_--coalesce-densest-as-needed_--truncate-zooms_-M25000.json.check.mbtiles -z14 -Z12 --coalesce-densest-as-needed --truncate-zooms -M25000 tests/tl_2022_11_tract/in.json.gz",
+"generator_options": "./tippecanoe -q -a@ -f -o tests/tl_2022_11_tract/out/-z14_-Z12_--coalesce-densest-as-needed_--generate-variable-depth-tile-pyramid_-M25000.json.check.mbtiles -z14 -Z12 --coalesce-densest-as-needed --generate-variable-depth-tile-pyramid -M25000 tests/tl_2022_11_tract/in.json.gz",
 "json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":12,\"maxzoom\":14,\"fields\":{\"ALAND\":\"Number\",\"AWATER\":\"Number\",\"COUNTYFP\":\"String\",\"FUNCSTAT\":\"String\",\"GEOID\":\"String\",\"INTPTLAT\":\"String\",\"INTPTLON\":\"String\",\"MTFCC\":\"String\",\"NAME\":\"String\",\"NAMELSAD\":\"String\",\"STATEFP\":\"String\",\"TRACTCE\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":206,\"geometry\":\"Polygon\",\"attributeCount\":12,\"attributes\":[{\"attribute\":\"ALAND\",\"count\":206,\"type\":\"number\",\"values\":[1017741,1033168,1033208,1037012,1042156,1069487,1084591,1109091,1115359,1136289,1168294,117635,119532,120715,1209113,1219204,1226616,1232841,124124,1294556,1306709,1369580,1423609,1427114,143156,1441865,1471925,148928,152450,1541239,1542277,1582882,163863,164749,1676650,168769,1688582,1706484,171910,172840,174883,1816287,183977,185309,1867106,1905262,194755,198509,199776,200745,200969,2010924,2024710,204237,204529,207186,207646,2102150,2106150,210636,213338,219939,224811,229696,232137,232951,236694,2381079,244750,246292,246895,247945,251302,252684,2566768,2602393,260891,263879,266513,2667590,271037,271866,273491,274180,274746,280108,285156,2855501,288793,290284,292105,295290,295339,296819,300632,303970,305616,305651,308153,308465],\"min\":93419,\"max\":6514228},{\"attribute\":\"AWATER\",\"count\":61,\"type\":\"number\",\"values\":[0,1059,11205,1132,1275,129100,136359,14058,141529,149901,159593,167978,189666,200980,2305,2414,2427,243648,26550,2933589,29503,307257,312419,31550,31909,3427,366232,367035,3755,3756,39895,439661,4682,477741,4996393,5139082,516665,5261,5274,5298,5609,566,5705,5767,60195,6261,65762,669985,67073,69,7006,71,7175,7303,75151,7722,7820,7884,82685,8983,9432],\"min\":0,\"max\":5139082},{\"attribute\":\"COUNTYFP\",\"count\":1,\"type\":\"string\",\"values\":[\"001\"]},{\"attribute\":\"FUNCSTAT\",\"count\":1,\"type\":\"string\",\"values\":[\"S\"]},{\"attribute\":\"GEOID\",\"count\":206,\"type\":\"string\",\"values\":[\"11001000101\",\"11001000102\",\"11001000201\",\"11001000202\",\"11001000300\",\"11001000400\",\"11001000501\",\"11001000502\",\"11001000600\",\"11001000702\",\"11001000703\",\"11001000704\",\"11001000802\",\"11001000803\",\"11001000804\",\"11001000902\",\"11001000903\",\"11001000904\",\"11001001002\",\"11001001003\",\"11001001004\",\"11001001100\",\"11001001200\",\"11001001301\",\"11001001303\",\"11001001304\",\"11001001401\",\"11001001402\",\"11001001500\",\"11001001600\",\"11001001702\",\"11001001803\",\"11001001804\",\"11001001901\",\"11001001902\",\"11001002001\",\"11001002002\",\"11001002101\",\"11001002102\",\"11001002201\",\"11001002202\",\"11001002301\",\"11001002302\",\"11001002400\",\"11001002501\",\"11001002503\",\"11001002504\",\"11001002600\",\"11001002702\",\"11001002703\",\"11001002704\",\"11001002801\",\"11001002802\",\"11001002900\",\"11001003000\",\"11001003100\",\"11001003200\",\"11001003301\",\"11001003302\",\"11001003400\",\"11001003500\",\"11001003600\",\"11001003701\",\"11001003702\",\"11001003801\",\"11001003802\",\"11001003901\",\"11001003902\",\"11001004001\",\"11001004002\",\"11001004100\",\"11001004201\",\"11001004202\",\"11001004300\",\"11001004401\",\"11001004402\",\"11001004600\",\"11001004702\",\"11001004703\",\"11001004704\",\"11001004801\",\"11001004802\",\"11001004901\",\"11001004902\",\"11001005001\",\"11001005003\",\"11001005004\",\"11001005202\",\"11001005203\",\"11001005302\",\"11001005303\",\"11001005501\",\"11001005502\",\"11001005503\",\"11001005601\",\"11001005602\",\"11001005801\",\"11001005802\",\"11001005900\",\"11001006400\"]},{\"attribute\":\"INTPTLAT\",\"count\":206,\"type\":\"string\",\"values\":[\"+38.8132364\",\"+38.8260370\",\"+38.8266510\",\"+38.8292038\",\"+38.8307312\",\"+38.8328939\",\"+38.8349280\",\"+38.8354183\",\"+38.8356929\",\"+38.8417979\",\"+38.8420148\",\"+38.8445818\",\"+38.8484714\",\"+38.8503364\",\"+38.8512668\",\"+38.8525662\",\"+38.8555543\",\"+38.8568592\",\"+38.8574823\",\"+38.8591090\",\"+38.8609955\",\"+38.8640724\",\"+38.8660433\",\"+38.8660921\",\"+38.8675208\",\"+38.8681789\",\"+38.8688572\",\"+38.8716327\",\"+38.8717861\",\"+38.8738481\",\"+38.8741656\",\"+38.8753461\",\"+38.8771811\",\"+38.8779453\",\"+38.8779576\",\"+38.8781777\",\"+38.8786426\",\"+38.8798620\",\"+38.8809933\",\"+38.8812697\",\"+38.8818529\",\"+38.8827718\",\"+38.8832158\",\"+38.8836933\",\"+38.8838480\",\"+38.8843295\",\"+38.8843563\",\"+38.8851712\",\"+38.8863224\",\"+38.8863842\",\"+38.8871944\",\"+38.8875984\",\"+38.8877413\",\"+38.8877585\",\"+38.8879464\",\"+38.8883180\",\"+38.8915403\",\"+38.8918285\",\"+38.8918309\",\"+38.8922212\",\"+38.8931572\",\"+38.8931710\",\"+38.8942107\",\"+38.8959944\",\"+38.8961726\",\"+38.8962674\",\"+38.8963061\",\"+38.8964252\",\"+38.8965543\",\"+38.8970372\",\"+38.8973521\",\"+38.8975634\",\"+38.8979674\",\"+38.8985783\",\"+38.8985960\",\"+38.8988888\",\"+38.9008601\",\"+38.9009808\",\"+38.9011144\",\"+38.9015402\",\"+38.9015543\",\"+38.9015670\",\"+38.9026971\",\"+38.9033936\",\"+38.9034762\",\"+38.9035769\",\"+38.9039498\",\"+38.9039988\",\"+38.9041579\",\"+38.9045660\",\"+38.9052766\",\"+38.9054220\",\"+38.9055926\",\"+38.9058867\",\"+38.9062118\",\"+38.9062488\",\"+38.9063048\",\"+38.9072520\",\"+38.9074041\",\"+38.9076530\"]},{\"attribute\":\"INTPTLON\",\"count\":206,\"type\":\"string\",\"values\":[\"-076.9192026\",\"-076.9210632\",\"-076.9212121\",\"-076.9250522\",\"-076.9311353\",\"-076.9313427\",\"-076.9321955\",\"-076.9325520\",\"-076.9353432\",\"-076.9359151\",\"-076.9388146\",\"-076.9407751\",\"-076.9445542\",\"-076.9474550\",\"-076.9477195\",\"-076.9490606\",\"-076.9523616\",\"-076.9545101\",\"-076.9553332\",\"-076.9585043\",\"-076.9585469\",\"-076.9606349\",\"-076.9638007\",\"-076.9675363\",\"-076.9681631\",\"-076.9697843\",\"-076.9704836\",\"-076.9706266\",\"-076.9742464\",\"-076.9743021\",\"-076.9743805\",\"-076.9748514\",\"-076.9751650\",\"-076.9752566\",\"-076.9777180\",\"-076.9796257\",\"-076.9798185\",\"-076.9801087\",\"-076.9804319\",\"-076.9812669\",\"-076.9814483\",\"-076.9820932\",\"-076.9827594\",\"-076.9845276\",\"-076.9850206\",\"-076.9855591\",\"-076.9864892\",\"-076.9866524\",\"-076.9866786\",\"-076.9868380\",\"-076.9870248\",\"-076.9870900\",\"-076.9873112\",\"-076.9888946\",\"-076.9895582\",\"-076.9899590\",\"-076.9907773\",\"-076.9910210\",\"-076.9911234\",\"-076.9913622\",\"-076.9925272\",\"-076.9931121\",\"-076.9950319\",\"-076.9959451\",\"-076.9963306\",\"-076.9965578\",\"-076.9966527\",\"-076.9972580\",\"-076.9977787\",\"-076.9982439\",\"-076.9984594\",\"-076.9985582\",\"-076.9987071\",\"-076.9990184\",\"-076.9991203\",\"-076.9994636\",\"-076.9994857\",\"-076.9999179\",\"-077.0006040\",\"-077.0008008\",\"-077.0009082\",\"-077.0010516\",\"-077.0013085\",\"-077.0033314\",\"-077.0037886\",\"-077.0043421\",\"-077.0046255\",\"-077.0051999\",\"-077.0054956\",\"-077.0062645\",\"-077.0063018\",\"-077.0063567\",\"-077.0070741\",\"-077.0095843\",\"-077.0111677\",\"-077.0114293\",\"-077.0114342\",\"-077.0114767\",\"-077.0117577\",\"-077.0118821\"]},{\"attribute\":\"MTFCC\",\"count\":1,\"type\":\"string\",\"values\":[\"G5020\"]},{\"attribute\":\"NAME\",\"count\":206,\"type\":\"string\",\"values\":[\"1.01\",\"1.02\",\"10.02\",\"10.03\",\"10.04\",\"101\",\"102.01\",\"102.02\",\"103\",\"104\",\"105\",\"106.01\",\"106.02\",\"106.03\",\"107\",\"108\",\"109\",\"11\",\"110.01\",\"110.02\",\"111\",\"12\",\"13.01\",\"13.03\",\"13.04\",\"14.01\",\"14.02\",\"15\",\"16\",\"17.02\",\"18.03\",\"18.04\",\"19.01\",\"19.02\",\"2.01\",\"2.02\",\"20.01\",\"20.02\",\"21.01\",\"21.02\",\"22.01\",\"22.02\",\"23.01\",\"23.02\",\"24\",\"25.01\",\"25.03\",\"25.04\",\"26\",\"27.02\",\"27.03\",\"27.04\",\"28.01\",\"28.02\",\"29\",\"3\",\"30\",\"31\",\"32\",\"33.01\",\"33.02\",\"34\",\"35\",\"36\",\"37.01\",\"37.02\",\"38.01\",\"38.02\",\"39.01\",\"39.02\",\"4\",\"40.01\",\"40.02\",\"41\",\"42.01\",\"42.02\",\"43\",\"44.01\",\"44.02\",\"46\",\"47.02\",\"47.03\",\"47.04\",\"48.01\",\"48.02\",\"49.01\",\"49.02\",\"5.01\",\"5.02\",\"50.01\",\"50.03\",\"50.04\",\"52.02\",\"52.03\",\"53.02\",\"53.03\",\"55.01\",\"55.02\",\"55.03\",\"56.01\"]},{\"attribute\":\"NAMELSAD\",\"count\":206,\"type\":\"string\",\"values\":[\"Census Tract 1.01\",\"Census Tract 1.02\",\"Census Tract 10.02\",\"Census Tract 10.03\",\"Census Tract 10.04\",\"Census Tract 101\",\"Census Tract 102.01\",\"Census Tract 102.02\",\"Census Tract 103\",\"Census Tract 104\",\"Census Tract 105\",\"Census Tract 106.01\",\"Census Tract 106.02\",\"Census Tract 106.03\",\"Census Tract 107\",\"Census Tract 108\",\"Census Tract 109\",\"Census Tract 11\",\"Census Tract 110.01\",\"Census Tract 110.02\",\"Census Tract 111\",\"Census Tract 12\",\"Census Tract 13.01\",\"Census Tract 13.03\",\"Census Tract 13.04\",\"Census Tract 14.01\",\"Census Tract 14.02\",\"Census Tract 15\",\"Census Tract 16\",\"Census Tract 17.02\",\"Census Tract 18.03\",\"Census Tract 18.04\",\"Census Tract 19.01\",\"Census Tract 19.02\",\"Census Tract 2.01\",\"Census Tract 2.02\",\"Census Tract 20.01\",\"Census Tract 20.02\",\"Census Tract 21.01\",\"Census Tract 21.02\",\"Census Tract 22.01\",\"Census Tract 22.02\",\"Census Tract 23.01\",\"Census Tract 23.02\",\"Census Tract 24\",\"Census Tract 25.01\",\"Census Tract 25.03\",\"Census Tract 25.04\",\"Census Tract 26\",\"Census Tract 27.02\",\"Census Tract 27.03\",\"Census Tract 27.04\",\"Census Tract 28.01\",\"Census Tract 28.02\",\"Census Tract 29\",\"Census Tract 3\",\"Census Tract 30\",\"Census Tract 31\",\"Census Tract 32\",\"Census Tract 33.01\",\"Census Tract 33.02\",\"Census Tract 34\",\"Census Tract 35\",\"Census Tract 36\",\"Census Tract 37.01\",\"Census Tract 37.02\",\"Census Tract 38.01\",\"Census Tract 38.02\",\"Census Tract 39.01\",\"Census Tract 39.02\",\"Census Tract 4\",\"Census Tract 40.01\",\"Census Tract 40.02\",\"Census Tract 41\",\"Census Tract 42.01\",\"Census Tract 42.02\",\"Census Tract 43\",\"Census Tract 44.01\",\"Census Tract 44.02\",\"Census Tract 46\",\"Census Tract 47.02\",\"Census Tract 47.03\",\"Census Tract 47.04\",\"Census Tract 48.01\",\"Census Tract 48.02\",\"Census Tract 49.01\",\"Census Tract 49.02\",\"Census Tract 5.01\",\"Census Tract 5.02\",\"Census Tract 50.01\",\"Census Tract 50.03\",\"Census Tract 50.04\",\"Census Tract 52.02\",\"Census Tract 52.03\",\"Census Tract 53.02\",\"Census Tract 53.03\",\"Census Tract 55.01\",\"Census Tract 55.02\",\"Census Tract 55.03\",\"Census Tract 56.01\"]},{\"attribute\":\"STATEFP\",\"count\":1,\"type\":\"string\",\"values\":[\"11\"]},{\"attribute\":\"TRACTCE\",\"count\":206,\"type\":\"string\",\"values\":[\"000101\",\"000102\",\"000201\",\"000202\",\"000300\",\"000400\",\"000501\",\"000502\",\"000600\",\"000702\",\"000703\",\"000704\",\"000802\",\"000803\",\"000804\",\"000902\",\"000903\",\"000904\",\"001002\",\"001003\",\"001004\",\"001100\",\"001200\",\"001301\",\"001303\",\"001304\",\"001401\",\"001402\",\"001500\",\"001600\",\"001702\",\"001803\",\"001804\",\"001901\",\"001902\",\"002001\",\"002002\",\"002101\",\"002102\",\"002201\",\"002202\",\"002301\",\"002302\",\"002400\",\"002501\",\"002503\",\"002504\",\"002600\",\"002702\",\"002703\",\"002704\",\"002801\",\"002802\",\"002900\",\"003000\",\"003100\",\"003200\",\"003301\",\"003302\",\"003400\",\"003500\",\"003600\",\"003701\",\"003702\",\"003801\",\"003802\",\"003901\",\"003902\",\"004001\",\"004002\",\"004100\",\"004201\",\"004202\",\"004300\",\"004401\",\"004402\",\"004600\",\"004702\",\"004703\",\"004704\",\"004801\",\"004802\",\"004901\",\"004902\",\"005001\",\"005003\",\"005004\",\"005202\",\"005203\",\"005302\",\"005303\",\"005501\",\"005502\",\"005503\",\"005601\",\"005602\",\"005801\",\"005802\",\"005900\",\"006400\"]}]}]}}",
 "maxzoom": "14",
 "minzoom": "12",
-"name": "tests/tl_2022_11_tract/out/-z14_-Z12_--coalesce-densest-as-needed_--truncate-zooms_-M25000.json.check.mbtiles",
+"name": "tests/tl_2022_11_tract/out/-z14_-Z12_--coalesce-densest-as-needed_--generate-variable-depth-tile-pyramid_-M25000.json.check.mbtiles",
 "strategies": "[{},{},{},{},{},{},{},{},{},{},{},{},{\"coalesced_as_needed\":87,\"tile_size_desired\":39190,\"truncated_zooms\":3},{\"truncated_zooms\":18},{}]",
 "type": "overlay",
 "version": "2"

tile.cpp

@@ -1582,7 +1582,7 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
 	int first_detail = detail, second_detail = detail - 1;
 	bool trying_to_stop_early = false;
 	bool can_stop_early = true;
-	if (additional[A_TRUNCATE_ZOOMS]) {
+	if (additional[A_VARIABLE_DEPTH_PYRAMID]) {
 		// If we are trying to stop early, there is an extra first pass with full+extra detail,
 		// and which loops if everything doesn't fit rather than trying to drop or union features.
 
@@ -2121,7 +2121,7 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
 				geomfile[j]->end(&geompos[j], fname);
 				within[j] = false;
 
-				if (additional[A_TRUNCATE_ZOOMS]) {
+				if (additional[A_VARIABLE_DEPTH_PYRAMID]) {
 					fflush(geomfile[j]->fp);
 					if (pwrite(fileno(geomfile[j]->fp), &estimated_complexity_out, sizeof(estimated_complexity_out), start_geompos[j]) != sizeof(estimated_complexity_out)) {
 						perror("pwrite complexity");