From a3a91ad4534bd1a64b376acea9c3e727bd679933 Mon Sep 17 00:00:00 2001 From: Erica Fischer Date: Tue, 7 Nov 2023 11:12:56 -0800 Subject: [PATCH] Make tile-join distrust source tilesets' metadata maxzoom and minzoom --- CHANGELOG.md | 4 ++++ tests/join-population/joined-i.mbtiles.json | 2 +- tests/join-population/joined-no-tile-stats.mbtiles.json | 2 +- tests/join-population/joined-null.mbtiles.json | 2 +- .../joined-tile-stats-attributes-limit.mbtiles.json | 2 +- .../joined-tile-stats-sample-values-limit.mbtiles.json | 2 +- .../joined-tile-stats-values-limit.mbtiles.json | 2 +- tests/join-population/joined.mbtiles.json | 2 +- tests/join-population/just-macarthur.mbtiles.json | 6 +++--- tests/join-population/merged-folder.mbtiles.json | 2 +- tests/join-population/merged.mbtiles.json | 2 +- tests/join-population/no-macarthur.mbtiles.json | 2 +- tests/join-population/raw-merged-folder.json | 2 +- tile-join.cpp | 5 +++++ version.hpp | 2 +- 15 files changed, 24 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c60f171a..0177c61f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 2.36.0 + +* Make tile-join distrust the source tilesets' metadata maxzoom and minzoom + # 2.35.0 * Fix a bug in --detect-longitude-wraparound when there are multiple rings diff --git a/tests/join-population/joined-i.mbtiles.json b/tests/join-population/joined-i.mbtiles.json index e7f1220ac..35a15fd7c 100644 --- a/tests/join-population/joined-i.mbtiles.json +++ b/tests/join-population/joined-i.mbtiles.json @@ -7,7 +7,7 @@ "generator_options": "./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join -q -f -i -o tests/join-population/joined-i.mbtiles -x GEOID10 -c tests/join-population/population.csv tests/join-population/tabblock_06001420.mbtiles", "json": "{\"vector_layers\":[{\"id\":\"tabblock_06001420\",\"description\":\"population\",\"minzoom\":4,\"maxzoom\":12,\"fields\":{\"ALAND10\":\"Land area\",\"AWATER10\":\"Number\",\"BLOCKCE10\":\"String\",\"COUNTYFP10\":\"String\",\"FUNCSTAT10\":\"String\",\"INTPTLAT10\":\"String\",\"INTPTLON10\":\"String\",\"MTFCC10\":\"String\",\"NAME10\":\"String\",\"STATEFP10\":\"String\",\"TRACTCE10\":\"String\",\"UACE10\":\"String\",\"UATYP10\":\"String\",\"UR10\":\"String\",\"population\":\"Mixed\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"tabblock_06001420\",\"count\":1003,\"geometry\":\"Polygon\",\"attributeCount\":15,\"attributes\":[{\"attribute\":\"ALAND10\",\"count\":162,\"type\":\"number\",\"values\":[10019,10125,10320,10339,10769,10776,10975,11206,11297,11306,11372,11825,11928,11997,1201,12044,12062,12213,12579,12945,13013,13106,13452,13985,14000,14042,14044,14053,14087,14101,14158,14169,14185,14193,14219,14237,14270,14291,14449,14452,14523,14541,14557,1457,14593,14639,14791,14799,14980,15100,15240,15260,15494,15574,15665,15730,15921,15930,15974,16117,16120,16165,16183,16238,16246,16253,16332,16353,16431,16453,16535,16537,16605,16635,16691,16994,17210,17230,17265,17308,17581,17622,17780,17893,18064,18095,18377,18586,18637,1878,18897,19453,19544,19676,19773,19818,19896,20277,20386,20486],\"min\":280,\"max\":412555},{\"attribute\":\"AWATER10\",\"count\":1,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":0},{\"attribute\":\"BLOCKCE10\",\"count\":72,\"type\":\"string\",\"values\":[\"1000\",\"1001\",\"1002\",\"1003\",\"1004\",\"1005\",\"1006\",\"1007\",\"1008\",\"1009\",\"1010\",\"1011\",\"1012\",\"1013\",\"1014\",\"1015\",\"1016\",\"1017\",\"1018\",\"1019\",\"1020\",\"1021\",\"1022\",\"1023\",\"1024\",\"1026\",\"1029\",\"1030\",\"1031\",\"2000\",\"2001\",\"2002\",\"2003\",\"2004\",\"2005\",\"2006\",\"2007\",\"2008\",\"2009\",\"2010\",\"2011\",\"2012\",\"2013\",\"2014\",\"2015\",\"3000\",\"3001\",\"3002\",\"3003\",\"3004\",\"3005\",\"3006\",\"3007\",\"3008\",\"3009\",\"3010\",\"3012\",\"3013\",\"3014\",\"3015\",\"3016\",\"3017\",\"3018\",\"3019\",\"3020\",\"3021\",\"3023\",\"3024\",\"3026\",\"3027\",\"3028\",\"3031\"]},{\"attribute\":\"COUNTYFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"001\"]},{\"attribute\":\"FUNCSTAT10\",\"count\":1,\"type\":\"string\",\"values\":[\"S\"]},{\"attribute\":\"INTPTLAT10\",\"count\":161,\"type\":\"string\",\"values\":[\"+37.882724\",\"+37.882857\",\"+37.882965\",\"+37.883224\",\"+37.883323\",\"+37.883462\",\"+37.883481\",\"+37.883493\",\"+37.883527\",\"+37.883536\",\"+37.883579\",\"+37.883693\",\"+37.883707\",\"+37.883836\",\"+37.883875\",\"+37.883973\",\"+37.884009\",\"+37.884079\",\"+37.884338\",\"+37.884369\",\"+37.884677\",\"+37.884743\",\"+37.884747\",\"+37.884896\",\"+37.884919\",\"+37.885307\",\"+37.885308\",\"+37.885448\",\"+37.885491\",\"+37.885646\",\"+37.885811\",\"+37.885997\",\"+37.886159\",\"+37.886194\",\"+37.886197\",\"+37.886322\",\"+37.886339\",\"+37.886460\",\"+37.886495\",\"+37.886596\",\"+37.886608\",\"+37.886830\",\"+37.887238\",\"+37.887570\",\"+37.887789\",\"+37.887945\",\"+37.888027\",\"+37.888238\",\"+37.888332\",\"+37.888340\",\"+37.888416\",\"+37.888418\",\"+37.888441\",\"+37.888458\",\"+37.888540\",\"+37.888616\",\"+37.888634\",\"+37.888734\",\"+37.888782\",\"+37.888848\",\"+37.888859\",\"+37.888863\",\"+37.888908\",\"+37.888930\",\"+37.888934\",\"+37.889007\",\"+37.889049\",\"+37.889126\",\"+37.889177\",\"+37.889251\",\"+37.889326\",\"+37.889411\",\"+37.889518\",\"+37.889545\",\"+37.889669\",\"+37.889828\",\"+37.889955\",\"+37.890058\",\"+37.890110\",\"+37.890166\",\"+37.890172\",\"+37.890209\",\"+37.890214\",\"+37.890278\",\"+37.890696\",\"+37.890858\",\"+37.891028\",\"+37.891101\",\"+37.891200\",\"+37.891205\",\"+37.891320\",\"+37.891425\",\"+37.891538\",\"+37.891658\",\"+37.891713\",\"+37.891785\",\"+37.891804\",\"+37.891809\",\"+37.891823\",\"+37.891824\"]},{\"attribute\":\"INTPTLON10\",\"count\":162,\"type\":\"string\",\"values\":[\"-122.282371\",\"-122.282689\",\"-122.283067\",\"-122.283424\",\"-122.283651\",\"-122.283723\",\"-122.283797\",\"-122.284471\",\"-122.284571\",\"-122.284831\",\"-122.285020\",\"-122.285175\",\"-122.285609\",\"-122.285901\",\"-122.285971\",\"-122.286349\",\"-122.286366\",\"-122.286636\",\"-122.286865\",\"-122.286913\",\"-122.287097\",\"-122.287125\",\"-122.287205\",\"-122.287275\",\"-122.287323\",\"-122.287379\",\"-122.287583\",\"-122.287634\",\"-122.287747\",\"-122.287757\",\"-122.287836\",\"-122.287926\",\"-122.287969\",\"-122.288382\",\"-122.288602\",\"-122.288628\",\"-122.288696\",\"-122.288764\",\"-122.288787\",\"-122.288910\",\"-122.289020\",\"-122.289219\",\"-122.289472\",\"-122.289530\",\"-122.289570\",\"-122.289663\",\"-122.289764\",\"-122.289959\",\"-122.290117\",\"-122.290340\",\"-122.290441\",\"-122.290522\",\"-122.290615\",\"-122.290964\",\"-122.290980\",\"-122.291137\",\"-122.291217\",\"-122.291391\",\"-122.291474\",\"-122.291817\",\"-122.291926\",\"-122.292014\",\"-122.292153\",\"-122.292309\",\"-122.292394\",\"-122.292674\",\"-122.292756\",\"-122.292777\",\"-122.292811\",\"-122.292824\",\"-122.292906\",\"-122.293296\",\"-122.293364\",\"-122.293455\",\"-122.293477\",\"-122.293508\",\"-122.293592\",\"-122.293633\",\"-122.294157\",\"-122.294213\",\"-122.294338\",\"-122.294418\",\"-122.294456\",\"-122.294503\",\"-122.294972\",\"-122.295039\",\"-122.295184\",\"-122.295286\",\"-122.295319\",\"-122.295359\",\"-122.295566\",\"-122.295888\",\"-122.296030\",\"-122.296083\",\"-122.296144\",\"-122.296175\",\"-122.296220\",\"-122.296405\",\"-122.296474\",\"-122.296730\"]},{\"attribute\":\"MTFCC10\",\"count\":1,\"type\":\"string\",\"values\":[\"G5040\"]},{\"attribute\":\"NAME10\",\"count\":72,\"type\":\"string\",\"values\":[\"Block 1000\",\"Block 1001\",\"Block 1002\",\"Block 1003\",\"Block 1004\",\"Block 1005\",\"Block 1006\",\"Block 1007\",\"Block 1008\",\"Block 1009\",\"Block 1010\",\"Block 1011\",\"Block 1012\",\"Block 1013\",\"Block 1014\",\"Block 1015\",\"Block 1016\",\"Block 1017\",\"Block 1018\",\"Block 1019\",\"Block 1020\",\"Block 1021\",\"Block 1022\",\"Block 1023\",\"Block 1024\",\"Block 1026\",\"Block 1029\",\"Block 1030\",\"Block 1031\",\"Block 2000\",\"Block 2001\",\"Block 2002\",\"Block 2003\",\"Block 2004\",\"Block 2005\",\"Block 2006\",\"Block 2007\",\"Block 2008\",\"Block 2009\",\"Block 2010\",\"Block 2011\",\"Block 2012\",\"Block 2013\",\"Block 2014\",\"Block 2015\",\"Block 3000\",\"Block 3001\",\"Block 3002\",\"Block 3003\",\"Block 3004\",\"Block 3005\",\"Block 3006\",\"Block 3007\",\"Block 3008\",\"Block 3009\",\"Block 3010\",\"Block 3012\",\"Block 3013\",\"Block 3014\",\"Block 3015\",\"Block 3016\",\"Block 3017\",\"Block 3018\",\"Block 3019\",\"Block 3020\",\"Block 3021\",\"Block 3023\",\"Block 3024\",\"Block 3026\",\"Block 3027\",\"Block 3028\",\"Block 3031\"]},{\"attribute\":\"STATEFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"06\"]},{\"attribute\":\"TRACTCE10\",\"count\":6,\"type\":\"string\",\"values\":[\"420100\",\"420200\",\"420300\",\"420400\",\"420500\",\"420600\"]},{\"attribute\":\"UACE10\",\"count\":1,\"type\":\"string\",\"values\":[\"78904\"]},{\"attribute\":\"UATYP10\",\"count\":1,\"type\":\"string\",\"values\":[\"U\"]},{\"attribute\":\"UR10\",\"count\":1,\"type\":\"string\",\"values\":[\"U\"]},{\"attribute\":\"population\",\"count\":74,\"type\":\"mixed\",\"values\":[\"\",1,10,11,1118,113,116,12,13,133,145,15,16,17,18,19,2,21,212,22,23,24,27,28,29,30,31,32,33,34,35,36,37,38,39,4,40,41,414,42,43,44,45,46,47,49,50,51,53,54,55,56,57,58,60,62,63,64,65,66,68,69,7,70,73,82,83,84,86,87,9,90,91,98],\"min\":1,\"max\":1118}]}]}}", "maxzoom": "12", -"minzoom": "0", +"minzoom": "4", "name": "tests/join-population/tabblock_06001420.mbtiles", "strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]", "type": "overlay", diff --git a/tests/join-population/joined-no-tile-stats.mbtiles.json b/tests/join-population/joined-no-tile-stats.mbtiles.json index 685bddaaf..6f7cde119 100644 --- a/tests/join-population/joined-no-tile-stats.mbtiles.json +++ b/tests/join-population/joined-no-tile-stats.mbtiles.json @@ -7,7 +7,7 @@ "generator_options": "./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join --quiet --force --no-tile-stats -o tests/join-population/joined-no-tile-stats.mbtiles -x GEOID10 -c tests/join-population/population.csv tests/join-population/tabblock_06001420.mbtiles", "json": "{\"vector_layers\":[{\"id\":\"tabblock_06001420\",\"description\":\"population\",\"minzoom\":3,\"maxzoom\":12,\"fields\":{\"ALAND10\":\"Land area\",\"AWATER10\":\"Number\",\"BLOCKCE10\":\"String\",\"COUNTYFP10\":\"String\",\"FUNCSTAT10\":\"String\",\"INTPTLAT10\":\"String\",\"INTPTLON10\":\"String\",\"MTFCC10\":\"String\",\"NAME10\":\"String\",\"STATEFP10\":\"String\",\"TRACTCE10\":\"String\",\"UACE10\":\"String\",\"UATYP10\":\"String\",\"UR10\":\"String\",\"population\":\"Mixed\"}}]}", "maxzoom": "12", -"minzoom": "0", +"minzoom": "3", "name": "tests/join-population/tabblock_06001420.mbtiles", "strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]", "type": "overlay", diff --git a/tests/join-population/joined-null.mbtiles.json b/tests/join-population/joined-null.mbtiles.json index 05b67b9eb..8339f1946 100644 --- a/tests/join-population/joined-null.mbtiles.json +++ b/tests/join-population/joined-null.mbtiles.json @@ -7,7 +7,7 @@ "generator_options": "./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join --quiet --force -o tests/join-population/joined-null.mbtiles --empty-csv-columns-are-null -x GEOID10 -c tests/join-population/population.csv tests/join-population/tabblock_06001420.mbtiles", "json": "{\"vector_layers\":[{\"id\":\"tabblock_06001420\",\"description\":\"population\",\"minzoom\":3,\"maxzoom\":12,\"fields\":{\"ALAND10\":\"Land area\",\"AWATER10\":\"Number\",\"BLOCKCE10\":\"String\",\"COUNTYFP10\":\"String\",\"FUNCSTAT10\":\"String\",\"INTPTLAT10\":\"String\",\"INTPTLON10\":\"String\",\"MTFCC10\":\"String\",\"NAME10\":\"String\",\"STATEFP10\":\"String\",\"TRACTCE10\":\"String\",\"UACE10\":\"String\",\"UATYP10\":\"String\",\"UR10\":\"String\",\"population\":\"Number\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"tabblock_06001420\",\"count\":1484,\"geometry\":\"Polygon\",\"attributeCount\":15,\"attributes\":[{\"attribute\":\"ALAND10\",\"count\":257,\"type\":\"number\",\"values\":[0,10019,10125,1018,1027,10320,10339,1037,1060,10769,10776,1094,10961,10975,11206,11282,11297,11306,11372,11825,11921,11928,11997,1201,12044,12062,1214,12213,1246,12579,1269,12945,13013,13106,1324,13452,13985,14000,14042,14044,14053,14087,14101,14158,14169,14185,14193,14219,14237,14270,14291,14449,14452,14453,14523,14539,14541,14557,14565,1457,14593,1461,14639,1466,14791,14799,14980,1509,15100,15240,15260,15494,15574,15665,15730,15921,15930,15974,16117,16120,16165,16183,16238,16246,16253,16332,16353,16431,16453,16535,16537,16605,16635,16691,16994,1704,17210,17230,17265,17308],\"min\":0,\"max\":542505},{\"attribute\":\"AWATER10\",\"count\":4,\"type\":\"number\",\"values\":[0,1111196,1632801,24],\"min\":0,\"max\":1632801},{\"attribute\":\"BLOCKCE10\",\"count\":82,\"type\":\"string\",\"values\":[\"1000\",\"1001\",\"1002\",\"1003\",\"1004\",\"1005\",\"1006\",\"1007\",\"1008\",\"1009\",\"1010\",\"1011\",\"1012\",\"1013\",\"1014\",\"1015\",\"1016\",\"1017\",\"1018\",\"1019\",\"1020\",\"1021\",\"1022\",\"1023\",\"1024\",\"1025\",\"1026\",\"1027\",\"1028\",\"1029\",\"1030\",\"1031\",\"2000\",\"2001\",\"2002\",\"2003\",\"2004\",\"2005\",\"2006\",\"2007\",\"2008\",\"2009\",\"2010\",\"2011\",\"2012\",\"2013\",\"2014\",\"2015\",\"2016\",\"2017\",\"3000\",\"3001\",\"3002\",\"3003\",\"3004\",\"3005\",\"3006\",\"3007\",\"3008\",\"3009\",\"3010\",\"3011\",\"3012\",\"3013\",\"3014\",\"3015\",\"3016\",\"3017\",\"3018\",\"3019\",\"3020\",\"3021\",\"3022\",\"3023\",\"3024\",\"3025\",\"3026\",\"3027\",\"3028\",\"3029\",\"3030\",\"3031\"]},{\"attribute\":\"COUNTYFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"001\"]},{\"attribute\":\"FUNCSTAT10\",\"count\":1,\"type\":\"string\",\"values\":[\"S\"]},{\"attribute\":\"INTPTLAT10\",\"count\":257,\"type\":\"string\",\"values\":[\"+37.882724\",\"+37.882857\",\"+37.882965\",\"+37.883224\",\"+37.883323\",\"+37.883462\",\"+37.883465\",\"+37.883481\",\"+37.883493\",\"+37.883527\",\"+37.883536\",\"+37.883579\",\"+37.883655\",\"+37.883693\",\"+37.883707\",\"+37.883745\",\"+37.883836\",\"+37.883871\",\"+37.883875\",\"+37.883931\",\"+37.883973\",\"+37.883995\",\"+37.884009\",\"+37.884079\",\"+37.884198\",\"+37.884202\",\"+37.884338\",\"+37.884369\",\"+37.884436\",\"+37.884677\",\"+37.884743\",\"+37.884747\",\"+37.884757\",\"+37.884896\",\"+37.884902\",\"+37.884919\",\"+37.884942\",\"+37.885307\",\"+37.885308\",\"+37.885399\",\"+37.885448\",\"+37.885491\",\"+37.885644\",\"+37.885646\",\"+37.885673\",\"+37.885811\",\"+37.885827\",\"+37.885997\",\"+37.886159\",\"+37.886194\",\"+37.886197\",\"+37.886237\",\"+37.886278\",\"+37.886322\",\"+37.886339\",\"+37.886439\",\"+37.886460\",\"+37.886495\",\"+37.886587\",\"+37.886596\",\"+37.886608\",\"+37.886758\",\"+37.886830\",\"+37.886929\",\"+37.887099\",\"+37.887163\",\"+37.887238\",\"+37.887267\",\"+37.887324\",\"+37.887379\",\"+37.887412\",\"+37.887570\",\"+37.887764\",\"+37.887776\",\"+37.887789\",\"+37.887852\",\"+37.887885\",\"+37.887916\",\"+37.887945\",\"+37.888027\",\"+37.888122\",\"+37.888238\",\"+37.888325\",\"+37.888332\",\"+37.888340\",\"+37.888416\",\"+37.888418\",\"+37.888441\",\"+37.888458\",\"+37.888506\",\"+37.888511\",\"+37.888540\",\"+37.888616\",\"+37.888634\",\"+37.888734\",\"+37.888782\",\"+37.888823\",\"+37.888848\",\"+37.888859\",\"+37.888863\"]},{\"attribute\":\"INTPTLON10\",\"count\":259,\"type\":\"string\",\"values\":[\"-122.282320\",\"-122.282371\",\"-122.282679\",\"-122.282689\",\"-122.282947\",\"-122.283067\",\"-122.283212\",\"-122.283424\",\"-122.283651\",\"-122.283723\",\"-122.283797\",\"-122.283828\",\"-122.283924\",\"-122.283973\",\"-122.284471\",\"-122.284571\",\"-122.284590\",\"-122.284831\",\"-122.285020\",\"-122.285076\",\"-122.285093\",\"-122.285175\",\"-122.285609\",\"-122.285651\",\"-122.285682\",\"-122.285901\",\"-122.285971\",\"-122.286179\",\"-122.286324\",\"-122.286349\",\"-122.286366\",\"-122.286615\",\"-122.286636\",\"-122.286818\",\"-122.286865\",\"-122.286913\",\"-122.287055\",\"-122.287082\",\"-122.287097\",\"-122.287125\",\"-122.287205\",\"-122.287275\",\"-122.287323\",\"-122.287379\",\"-122.287583\",\"-122.287591\",\"-122.287634\",\"-122.287747\",\"-122.287757\",\"-122.287836\",\"-122.287926\",\"-122.287969\",\"-122.288150\",\"-122.288221\",\"-122.288237\",\"-122.288313\",\"-122.288382\",\"-122.288473\",\"-122.288602\",\"-122.288628\",\"-122.288677\",\"-122.288696\",\"-122.288764\",\"-122.288787\",\"-122.288910\",\"-122.289020\",\"-122.289219\",\"-122.289471\",\"-122.289472\",\"-122.289530\",\"-122.289570\",\"-122.289573\",\"-122.289663\",\"-122.289764\",\"-122.289959\",\"-122.290117\",\"-122.290340\",\"-122.290441\",\"-122.290522\",\"-122.290573\",\"-122.290615\",\"-122.290964\",\"-122.290980\",\"-122.291137\",\"-122.291217\",\"-122.291315\",\"-122.291350\",\"-122.291391\",\"-122.291474\",\"-122.291484\",\"-122.291592\",\"-122.291817\",\"-122.291926\",\"-122.292014\",\"-122.292116\",\"-122.292153\",\"-122.292289\",\"-122.292309\",\"-122.292394\",\"-122.292415\"]},{\"attribute\":\"MTFCC10\",\"count\":1,\"type\":\"string\",\"values\":[\"G5040\"]},{\"attribute\":\"NAME10\",\"count\":82,\"type\":\"string\",\"values\":[\"Block 1000\",\"Block 1001\",\"Block 1002\",\"Block 1003\",\"Block 1004\",\"Block 1005\",\"Block 1006\",\"Block 1007\",\"Block 1008\",\"Block 1009\",\"Block 1010\",\"Block 1011\",\"Block 1012\",\"Block 1013\",\"Block 1014\",\"Block 1015\",\"Block 1016\",\"Block 1017\",\"Block 1018\",\"Block 1019\",\"Block 1020\",\"Block 1021\",\"Block 1022\",\"Block 1023\",\"Block 1024\",\"Block 1025\",\"Block 1026\",\"Block 1027\",\"Block 1028\",\"Block 1029\",\"Block 1030\",\"Block 1031\",\"Block 2000\",\"Block 2001\",\"Block 2002\",\"Block 2003\",\"Block 2004\",\"Block 2005\",\"Block 2006\",\"Block 2007\",\"Block 2008\",\"Block 2009\",\"Block 2010\",\"Block 2011\",\"Block 2012\",\"Block 2013\",\"Block 2014\",\"Block 2015\",\"Block 2016\",\"Block 2017\",\"Block 3000\",\"Block 3001\",\"Block 3002\",\"Block 3003\",\"Block 3004\",\"Block 3005\",\"Block 3006\",\"Block 3007\",\"Block 3008\",\"Block 3009\",\"Block 3010\",\"Block 3011\",\"Block 3012\",\"Block 3013\",\"Block 3014\",\"Block 3015\",\"Block 3016\",\"Block 3017\",\"Block 3018\",\"Block 3019\",\"Block 3020\",\"Block 3021\",\"Block 3022\",\"Block 3023\",\"Block 3024\",\"Block 3025\",\"Block 3026\",\"Block 3027\",\"Block 3028\",\"Block 3029\",\"Block 3030\",\"Block 3031\"]},{\"attribute\":\"STATEFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"06\"]},{\"attribute\":\"TRACTCE10\",\"count\":6,\"type\":\"string\",\"values\":[\"420100\",\"420200\",\"420300\",\"420400\",\"420500\",\"420600\"]},{\"attribute\":\"UACE10\",\"count\":1,\"type\":\"string\",\"values\":[\"78904\"]},{\"attribute\":\"UATYP10\",\"count\":1,\"type\":\"string\",\"values\":[\"U\"]},{\"attribute\":\"UR10\",\"count\":2,\"type\":\"string\",\"values\":[\"R\",\"U\"]},{\"attribute\":\"population\",\"count\":73,\"type\":\"number\",\"values\":[1,10,11,1118,113,116,12,13,133,145,15,16,17,18,19,2,21,212,22,23,24,27,28,29,30,31,32,33,34,35,36,37,38,39,4,40,41,414,42,43,44,45,46,47,49,50,51,53,54,55,56,57,58,60,62,63,64,65,66,68,69,7,70,73,82,83,84,86,87,9,90,91,98],\"min\":1,\"max\":1118}]}]}}", "maxzoom": "12", -"minzoom": "0", +"minzoom": "3", "name": "tests/join-population/tabblock_06001420.mbtiles", "strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]", "type": "overlay", diff --git a/tests/join-population/joined-tile-stats-attributes-limit.mbtiles.json b/tests/join-population/joined-tile-stats-attributes-limit.mbtiles.json index e4a7506f8..37b5326a5 100644 --- a/tests/join-population/joined-tile-stats-attributes-limit.mbtiles.json +++ b/tests/join-population/joined-tile-stats-attributes-limit.mbtiles.json @@ -7,7 +7,7 @@ "generator_options": "./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join --quiet --force '--tile-stats-attributes-limit=1' -o tests/join-population/joined-tile-stats-attributes-limit.mbtiles -x GEOID10 -c tests/join-population/population.csv tests/join-population/tabblock_06001420.mbtiles", "json": "{\"vector_layers\":[{\"id\":\"tabblock_06001420\",\"description\":\"population\",\"minzoom\":3,\"maxzoom\":12,\"fields\":{\"ALAND10\":\"Land area\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"tabblock_06001420\",\"count\":1484,\"geometry\":\"Polygon\",\"attributeCount\":1,\"attributes\":[{\"attribute\":\"ALAND10\",\"count\":257,\"type\":\"number\",\"values\":[0,10019,10125,1018,1027,10320,10339,1037,1060,10769,10776,1094,10961,10975,11206,11282,11297,11306,11372,11825,11921,11928,11997,1201,12044,12062,1214,12213,1246,12579,1269,12945,13013,13106,1324,13452,13985,14000,14042,14044,14053,14087,14101,14158,14169,14185,14193,14219,14237,14270,14291,14449,14452,14453,14523,14539,14541,14557,14565,1457,14593,1461,14639,1466,14791,14799,14980,1509,15100,15240,15260,15494,15574,15665,15730,15921,15930,15974,16117,16120,16165,16183,16238,16246,16253,16332,16353,16431,16453,16535,16537,16605,16635,16691,16994,1704,17210,17230,17265,17308],\"min\":0,\"max\":542505},{\"attribute\":\"AWATER10\",\"count\":4,\"type\":\"number\",\"values\":[0,1111196,1632801,24],\"min\":0,\"max\":1632801},{\"attribute\":\"BLOCKCE10\",\"count\":82,\"type\":\"string\",\"values\":[\"1000\",\"1001\",\"1002\",\"1003\",\"1004\",\"1005\",\"1006\",\"1007\",\"1008\",\"1009\",\"1010\",\"1011\",\"1012\",\"1013\",\"1014\",\"1015\",\"1016\",\"1017\",\"1018\",\"1019\",\"1020\",\"1021\",\"1022\",\"1023\",\"1024\",\"1025\",\"1026\",\"1027\",\"1028\",\"1029\",\"1030\",\"1031\",\"2000\",\"2001\",\"2002\",\"2003\",\"2004\",\"2005\",\"2006\",\"2007\",\"2008\",\"2009\",\"2010\",\"2011\",\"2012\",\"2013\",\"2014\",\"2015\",\"2016\",\"2017\",\"3000\",\"3001\",\"3002\",\"3003\",\"3004\",\"3005\",\"3006\",\"3007\",\"3008\",\"3009\",\"3010\",\"3011\",\"3012\",\"3013\",\"3014\",\"3015\",\"3016\",\"3017\",\"3018\",\"3019\",\"3020\",\"3021\",\"3022\",\"3023\",\"3024\",\"3025\",\"3026\",\"3027\",\"3028\",\"3029\",\"3030\",\"3031\"]},{\"attribute\":\"COUNTYFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"001\"]},{\"attribute\":\"FUNCSTAT10\",\"count\":1,\"type\":\"string\",\"values\":[\"S\"]},{\"attribute\":\"INTPTLAT10\",\"count\":257,\"type\":\"string\",\"values\":[\"+37.882724\",\"+37.882857\",\"+37.882965\",\"+37.883224\",\"+37.883323\",\"+37.883462\",\"+37.883465\",\"+37.883481\",\"+37.883493\",\"+37.883527\",\"+37.883536\",\"+37.883579\",\"+37.883655\",\"+37.883693\",\"+37.883707\",\"+37.883745\",\"+37.883836\",\"+37.883871\",\"+37.883875\",\"+37.883931\",\"+37.883973\",\"+37.883995\",\"+37.884009\",\"+37.884079\",\"+37.884198\",\"+37.884202\",\"+37.884338\",\"+37.884369\",\"+37.884436\",\"+37.884677\",\"+37.884743\",\"+37.884747\",\"+37.884757\",\"+37.884896\",\"+37.884902\",\"+37.884919\",\"+37.884942\",\"+37.885307\",\"+37.885308\",\"+37.885399\",\"+37.885448\",\"+37.885491\",\"+37.885644\",\"+37.885646\",\"+37.885673\",\"+37.885811\",\"+37.885827\",\"+37.885997\",\"+37.886159\",\"+37.886194\",\"+37.886197\",\"+37.886237\",\"+37.886278\",\"+37.886322\",\"+37.886339\",\"+37.886439\",\"+37.886460\",\"+37.886495\",\"+37.886587\",\"+37.886596\",\"+37.886608\",\"+37.886758\",\"+37.886830\",\"+37.886929\",\"+37.887099\",\"+37.887163\",\"+37.887238\",\"+37.887267\",\"+37.887324\",\"+37.887379\",\"+37.887412\",\"+37.887570\",\"+37.887764\",\"+37.887776\",\"+37.887789\",\"+37.887852\",\"+37.887885\",\"+37.887916\",\"+37.887945\",\"+37.888027\",\"+37.888122\",\"+37.888238\",\"+37.888325\",\"+37.888332\",\"+37.888340\",\"+37.888416\",\"+37.888418\",\"+37.888441\",\"+37.888458\",\"+37.888506\",\"+37.888511\",\"+37.888540\",\"+37.888616\",\"+37.888634\",\"+37.888734\",\"+37.888782\",\"+37.888823\",\"+37.888848\",\"+37.888859\",\"+37.888863\"]},{\"attribute\":\"INTPTLON10\",\"count\":259,\"type\":\"string\",\"values\":[\"-122.282320\",\"-122.282371\",\"-122.282679\",\"-122.282689\",\"-122.282947\",\"-122.283067\",\"-122.283212\",\"-122.283424\",\"-122.283651\",\"-122.283723\",\"-122.283797\",\"-122.283828\",\"-122.283924\",\"-122.283973\",\"-122.284471\",\"-122.284571\",\"-122.284590\",\"-122.284831\",\"-122.285020\",\"-122.285076\",\"-122.285093\",\"-122.285175\",\"-122.285609\",\"-122.285651\",\"-122.285682\",\"-122.285901\",\"-122.285971\",\"-122.286179\",\"-122.286324\",\"-122.286349\",\"-122.286366\",\"-122.286615\",\"-122.286636\",\"-122.286818\",\"-122.286865\",\"-122.286913\",\"-122.287055\",\"-122.287082\",\"-122.287097\",\"-122.287125\",\"-122.287205\",\"-122.287275\",\"-122.287323\",\"-122.287379\",\"-122.287583\",\"-122.287591\",\"-122.287634\",\"-122.287747\",\"-122.287757\",\"-122.287836\",\"-122.287926\",\"-122.287969\",\"-122.288150\",\"-122.288221\",\"-122.288237\",\"-122.288313\",\"-122.288382\",\"-122.288473\",\"-122.288602\",\"-122.288628\",\"-122.288677\",\"-122.288696\",\"-122.288764\",\"-122.288787\",\"-122.288910\",\"-122.289020\",\"-122.289219\",\"-122.289471\",\"-122.289472\",\"-122.289530\",\"-122.289570\",\"-122.289573\",\"-122.289663\",\"-122.289764\",\"-122.289959\",\"-122.290117\",\"-122.290340\",\"-122.290441\",\"-122.290522\",\"-122.290573\",\"-122.290615\",\"-122.290964\",\"-122.290980\",\"-122.291137\",\"-122.291217\",\"-122.291315\",\"-122.291350\",\"-122.291391\",\"-122.291474\",\"-122.291484\",\"-122.291592\",\"-122.291817\",\"-122.291926\",\"-122.292014\",\"-122.292116\",\"-122.292153\",\"-122.292289\",\"-122.292309\",\"-122.292394\",\"-122.292415\"]},{\"attribute\":\"MTFCC10\",\"count\":1,\"type\":\"string\",\"values\":[\"G5040\"]},{\"attribute\":\"NAME10\",\"count\":82,\"type\":\"string\",\"values\":[\"Block 1000\",\"Block 1001\",\"Block 1002\",\"Block 1003\",\"Block 1004\",\"Block 1005\",\"Block 1006\",\"Block 1007\",\"Block 1008\",\"Block 1009\",\"Block 1010\",\"Block 1011\",\"Block 1012\",\"Block 1013\",\"Block 1014\",\"Block 1015\",\"Block 1016\",\"Block 1017\",\"Block 1018\",\"Block 1019\",\"Block 1020\",\"Block 1021\",\"Block 1022\",\"Block 1023\",\"Block 1024\",\"Block 1025\",\"Block 1026\",\"Block 1027\",\"Block 1028\",\"Block 1029\",\"Block 1030\",\"Block 1031\",\"Block 2000\",\"Block 2001\",\"Block 2002\",\"Block 2003\",\"Block 2004\",\"Block 2005\",\"Block 2006\",\"Block 2007\",\"Block 2008\",\"Block 2009\",\"Block 2010\",\"Block 2011\",\"Block 2012\",\"Block 2013\",\"Block 2014\",\"Block 2015\",\"Block 2016\",\"Block 2017\",\"Block 3000\",\"Block 3001\",\"Block 3002\",\"Block 3003\",\"Block 3004\",\"Block 3005\",\"Block 3006\",\"Block 3007\",\"Block 3008\",\"Block 3009\",\"Block 3010\",\"Block 3011\",\"Block 3012\",\"Block 3013\",\"Block 3014\",\"Block 3015\",\"Block 3016\",\"Block 3017\",\"Block 3018\",\"Block 3019\",\"Block 3020\",\"Block 3021\",\"Block 3022\",\"Block 3023\",\"Block 3024\",\"Block 3025\",\"Block 3026\",\"Block 3027\",\"Block 3028\",\"Block 3029\",\"Block 3030\",\"Block 3031\"]},{\"attribute\":\"STATEFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"06\"]},{\"attribute\":\"TRACTCE10\",\"count\":6,\"type\":\"string\",\"values\":[\"420100\",\"420200\",\"420300\",\"420400\",\"420500\",\"420600\"]},{\"attribute\":\"UACE10\",\"count\":1,\"type\":\"string\",\"values\":[\"78904\"]},{\"attribute\":\"UATYP10\",\"count\":1,\"type\":\"string\",\"values\":[\"U\"]},{\"attribute\":\"UR10\",\"count\":2,\"type\":\"string\",\"values\":[\"R\",\"U\"]},{\"attribute\":\"population\",\"count\":74,\"type\":\"mixed\",\"values\":[\"\",1,10,11,1118,113,116,12,13,133,145,15,16,17,18,19,2,21,212,22,23,24,27,28,29,30,31,32,33,34,35,36,37,38,39,4,40,41,414,42,43,44,45,46,47,49,50,51,53,54,55,56,57,58,60,62,63,64,65,66,68,69,7,70,73,82,83,84,86,87,9,90,91,98],\"min\":1,\"max\":1118}]}]}}", "maxzoom": "12", -"minzoom": "0", +"minzoom": "3", "name": "tests/join-population/tabblock_06001420.mbtiles", "strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]", "type": "overlay", diff --git a/tests/join-population/joined-tile-stats-sample-values-limit.mbtiles.json b/tests/join-population/joined-tile-stats-sample-values-limit.mbtiles.json index 5bbb21b12..4b217de0f 100644 --- a/tests/join-population/joined-tile-stats-sample-values-limit.mbtiles.json +++ b/tests/join-population/joined-tile-stats-sample-values-limit.mbtiles.json @@ -7,7 +7,7 @@ "generator_options": "./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join --quiet --force '--tile-stats-sample-values-limit=1' -o tests/join-population/joined-tile-stats-sample-values-limit.mbtiles -x GEOID10 -c tests/join-population/population.csv tests/join-population/tabblock_06001420.mbtiles", "json": "{\"vector_layers\":[{\"id\":\"tabblock_06001420\",\"description\":\"population\",\"minzoom\":3,\"maxzoom\":12,\"fields\":{\"ALAND10\":\"Land area\",\"AWATER10\":\"Number\",\"BLOCKCE10\":\"String\",\"COUNTYFP10\":\"String\",\"FUNCSTAT10\":\"String\",\"INTPTLAT10\":\"String\",\"INTPTLON10\":\"String\",\"MTFCC10\":\"String\",\"NAME10\":\"String\",\"STATEFP10\":\"String\",\"TRACTCE10\":\"String\",\"UACE10\":\"String\",\"UATYP10\":\"String\",\"UR10\":\"String\",\"population\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"tabblock_06001420\",\"count\":1484,\"geometry\":\"Polygon\",\"attributeCount\":15,\"attributes\":[{\"attribute\":\"ALAND10\",\"count\":1,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":542505},{\"attribute\":\"AWATER10\",\"count\":1,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":1632801},{\"attribute\":\"BLOCKCE10\",\"count\":1,\"type\":\"string\",\"values\":[\"1000\"]},{\"attribute\":\"COUNTYFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"001\"]},{\"attribute\":\"FUNCSTAT10\",\"count\":1,\"type\":\"string\",\"values\":[\"S\"]},{\"attribute\":\"INTPTLAT10\",\"count\":1,\"type\":\"string\",\"values\":[\"+37.882724\"]},{\"attribute\":\"INTPTLON10\",\"count\":1,\"type\":\"string\",\"values\":[\"-122.282320\"]},{\"attribute\":\"MTFCC10\",\"count\":1,\"type\":\"string\",\"values\":[\"G5040\"]},{\"attribute\":\"NAME10\",\"count\":1,\"type\":\"string\",\"values\":[\"Block 1000\"]},{\"attribute\":\"STATEFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"06\"]},{\"attribute\":\"TRACTCE10\",\"count\":1,\"type\":\"string\",\"values\":[\"420100\"]},{\"attribute\":\"UACE10\",\"count\":1,\"type\":\"string\",\"values\":[\"78904\"]},{\"attribute\":\"UATYP10\",\"count\":1,\"type\":\"string\",\"values\":[\"U\"]},{\"attribute\":\"UR10\",\"count\":1,\"type\":\"string\",\"values\":[\"R\"]},{\"attribute\":\"population\",\"count\":1,\"type\":\"string\",\"values\":[\"\"]}]}]}}", "maxzoom": "12", -"minzoom": "0", +"minzoom": "3", "name": "tests/join-population/tabblock_06001420.mbtiles", "strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]", "type": "overlay", diff --git a/tests/join-population/joined-tile-stats-values-limit.mbtiles.json b/tests/join-population/joined-tile-stats-values-limit.mbtiles.json index 0d1441a65..9fa160253 100644 --- a/tests/join-population/joined-tile-stats-values-limit.mbtiles.json +++ b/tests/join-population/joined-tile-stats-values-limit.mbtiles.json @@ -7,7 +7,7 @@ "generator_options": "./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join --quiet --force '--tile-stats-values-limit=1' -o tests/join-population/joined-tile-stats-values-limit.mbtiles -x GEOID10 -c tests/join-population/population.csv tests/join-population/tabblock_06001420.mbtiles", "json": "{\"vector_layers\":[{\"id\":\"tabblock_06001420\",\"description\":\"population\",\"minzoom\":3,\"maxzoom\":12,\"fields\":{\"ALAND10\":\"Land area\",\"AWATER10\":\"Number\",\"BLOCKCE10\":\"String\",\"COUNTYFP10\":\"String\",\"FUNCSTAT10\":\"String\",\"INTPTLAT10\":\"String\",\"INTPTLON10\":\"String\",\"MTFCC10\":\"String\",\"NAME10\":\"String\",\"STATEFP10\":\"String\",\"TRACTCE10\":\"String\",\"UACE10\":\"String\",\"UATYP10\":\"String\",\"UR10\":\"String\",\"population\":\"Mixed\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"tabblock_06001420\",\"count\":1484,\"geometry\":\"Polygon\",\"attributeCount\":15,\"attributes\":[{\"attribute\":\"ALAND10\",\"count\":257,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":542505}]}]}}", "maxzoom": "12", -"minzoom": "0", +"minzoom": "3", "name": "tests/join-population/tabblock_06001420.mbtiles", "strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]", "type": "overlay", diff --git a/tests/join-population/joined.mbtiles.json b/tests/join-population/joined.mbtiles.json index f3f7046c6..16ad55eea 100644 --- a/tests/join-population/joined.mbtiles.json +++ b/tests/join-population/joined.mbtiles.json @@ -7,7 +7,7 @@ "generator_options": "./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join --quiet --force -o tests/join-population/joined.mbtiles -x GEOID10 -c tests/join-population/population.csv tests/join-population/tabblock_06001420.mbtiles", "json": "{\"vector_layers\":[{\"id\":\"tabblock_06001420\",\"description\":\"population\",\"minzoom\":3,\"maxzoom\":12,\"fields\":{\"ALAND10\":\"Land area\",\"AWATER10\":\"Number\",\"BLOCKCE10\":\"String\",\"COUNTYFP10\":\"String\",\"FUNCSTAT10\":\"String\",\"INTPTLAT10\":\"String\",\"INTPTLON10\":\"String\",\"MTFCC10\":\"String\",\"NAME10\":\"String\",\"STATEFP10\":\"String\",\"TRACTCE10\":\"String\",\"UACE10\":\"String\",\"UATYP10\":\"String\",\"UR10\":\"String\",\"population\":\"Mixed\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"tabblock_06001420\",\"count\":1484,\"geometry\":\"Polygon\",\"attributeCount\":15,\"attributes\":[{\"attribute\":\"ALAND10\",\"count\":257,\"type\":\"number\",\"values\":[0,10019,10125,1018,1027,10320,10339,1037,1060,10769,10776,1094,10961,10975,11206,11282,11297,11306,11372,11825,11921,11928,11997,1201,12044,12062,1214,12213,1246,12579,1269,12945,13013,13106,1324,13452,13985,14000,14042,14044,14053,14087,14101,14158,14169,14185,14193,14219,14237,14270,14291,14449,14452,14453,14523,14539,14541,14557,14565,1457,14593,1461,14639,1466,14791,14799,14980,1509,15100,15240,15260,15494,15574,15665,15730,15921,15930,15974,16117,16120,16165,16183,16238,16246,16253,16332,16353,16431,16453,16535,16537,16605,16635,16691,16994,1704,17210,17230,17265,17308],\"min\":0,\"max\":542505},{\"attribute\":\"AWATER10\",\"count\":4,\"type\":\"number\",\"values\":[0,1111196,1632801,24],\"min\":0,\"max\":1632801},{\"attribute\":\"BLOCKCE10\",\"count\":82,\"type\":\"string\",\"values\":[\"1000\",\"1001\",\"1002\",\"1003\",\"1004\",\"1005\",\"1006\",\"1007\",\"1008\",\"1009\",\"1010\",\"1011\",\"1012\",\"1013\",\"1014\",\"1015\",\"1016\",\"1017\",\"1018\",\"1019\",\"1020\",\"1021\",\"1022\",\"1023\",\"1024\",\"1025\",\"1026\",\"1027\",\"1028\",\"1029\",\"1030\",\"1031\",\"2000\",\"2001\",\"2002\",\"2003\",\"2004\",\"2005\",\"2006\",\"2007\",\"2008\",\"2009\",\"2010\",\"2011\",\"2012\",\"2013\",\"2014\",\"2015\",\"2016\",\"2017\",\"3000\",\"3001\",\"3002\",\"3003\",\"3004\",\"3005\",\"3006\",\"3007\",\"3008\",\"3009\",\"3010\",\"3011\",\"3012\",\"3013\",\"3014\",\"3015\",\"3016\",\"3017\",\"3018\",\"3019\",\"3020\",\"3021\",\"3022\",\"3023\",\"3024\",\"3025\",\"3026\",\"3027\",\"3028\",\"3029\",\"3030\",\"3031\"]},{\"attribute\":\"COUNTYFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"001\"]},{\"attribute\":\"FUNCSTAT10\",\"count\":1,\"type\":\"string\",\"values\":[\"S\"]},{\"attribute\":\"INTPTLAT10\",\"count\":257,\"type\":\"string\",\"values\":[\"+37.882724\",\"+37.882857\",\"+37.882965\",\"+37.883224\",\"+37.883323\",\"+37.883462\",\"+37.883465\",\"+37.883481\",\"+37.883493\",\"+37.883527\",\"+37.883536\",\"+37.883579\",\"+37.883655\",\"+37.883693\",\"+37.883707\",\"+37.883745\",\"+37.883836\",\"+37.883871\",\"+37.883875\",\"+37.883931\",\"+37.883973\",\"+37.883995\",\"+37.884009\",\"+37.884079\",\"+37.884198\",\"+37.884202\",\"+37.884338\",\"+37.884369\",\"+37.884436\",\"+37.884677\",\"+37.884743\",\"+37.884747\",\"+37.884757\",\"+37.884896\",\"+37.884902\",\"+37.884919\",\"+37.884942\",\"+37.885307\",\"+37.885308\",\"+37.885399\",\"+37.885448\",\"+37.885491\",\"+37.885644\",\"+37.885646\",\"+37.885673\",\"+37.885811\",\"+37.885827\",\"+37.885997\",\"+37.886159\",\"+37.886194\",\"+37.886197\",\"+37.886237\",\"+37.886278\",\"+37.886322\",\"+37.886339\",\"+37.886439\",\"+37.886460\",\"+37.886495\",\"+37.886587\",\"+37.886596\",\"+37.886608\",\"+37.886758\",\"+37.886830\",\"+37.886929\",\"+37.887099\",\"+37.887163\",\"+37.887238\",\"+37.887267\",\"+37.887324\",\"+37.887379\",\"+37.887412\",\"+37.887570\",\"+37.887764\",\"+37.887776\",\"+37.887789\",\"+37.887852\",\"+37.887885\",\"+37.887916\",\"+37.887945\",\"+37.888027\",\"+37.888122\",\"+37.888238\",\"+37.888325\",\"+37.888332\",\"+37.888340\",\"+37.888416\",\"+37.888418\",\"+37.888441\",\"+37.888458\",\"+37.888506\",\"+37.888511\",\"+37.888540\",\"+37.888616\",\"+37.888634\",\"+37.888734\",\"+37.888782\",\"+37.888823\",\"+37.888848\",\"+37.888859\",\"+37.888863\"]},{\"attribute\":\"INTPTLON10\",\"count\":259,\"type\":\"string\",\"values\":[\"-122.282320\",\"-122.282371\",\"-122.282679\",\"-122.282689\",\"-122.282947\",\"-122.283067\",\"-122.283212\",\"-122.283424\",\"-122.283651\",\"-122.283723\",\"-122.283797\",\"-122.283828\",\"-122.283924\",\"-122.283973\",\"-122.284471\",\"-122.284571\",\"-122.284590\",\"-122.284831\",\"-122.285020\",\"-122.285076\",\"-122.285093\",\"-122.285175\",\"-122.285609\",\"-122.285651\",\"-122.285682\",\"-122.285901\",\"-122.285971\",\"-122.286179\",\"-122.286324\",\"-122.286349\",\"-122.286366\",\"-122.286615\",\"-122.286636\",\"-122.286818\",\"-122.286865\",\"-122.286913\",\"-122.287055\",\"-122.287082\",\"-122.287097\",\"-122.287125\",\"-122.287205\",\"-122.287275\",\"-122.287323\",\"-122.287379\",\"-122.287583\",\"-122.287591\",\"-122.287634\",\"-122.287747\",\"-122.287757\",\"-122.287836\",\"-122.287926\",\"-122.287969\",\"-122.288150\",\"-122.288221\",\"-122.288237\",\"-122.288313\",\"-122.288382\",\"-122.288473\",\"-122.288602\",\"-122.288628\",\"-122.288677\",\"-122.288696\",\"-122.288764\",\"-122.288787\",\"-122.288910\",\"-122.289020\",\"-122.289219\",\"-122.289471\",\"-122.289472\",\"-122.289530\",\"-122.289570\",\"-122.289573\",\"-122.289663\",\"-122.289764\",\"-122.289959\",\"-122.290117\",\"-122.290340\",\"-122.290441\",\"-122.290522\",\"-122.290573\",\"-122.290615\",\"-122.290964\",\"-122.290980\",\"-122.291137\",\"-122.291217\",\"-122.291315\",\"-122.291350\",\"-122.291391\",\"-122.291474\",\"-122.291484\",\"-122.291592\",\"-122.291817\",\"-122.291926\",\"-122.292014\",\"-122.292116\",\"-122.292153\",\"-122.292289\",\"-122.292309\",\"-122.292394\",\"-122.292415\"]},{\"attribute\":\"MTFCC10\",\"count\":1,\"type\":\"string\",\"values\":[\"G5040\"]},{\"attribute\":\"NAME10\",\"count\":82,\"type\":\"string\",\"values\":[\"Block 1000\",\"Block 1001\",\"Block 1002\",\"Block 1003\",\"Block 1004\",\"Block 1005\",\"Block 1006\",\"Block 1007\",\"Block 1008\",\"Block 1009\",\"Block 1010\",\"Block 1011\",\"Block 1012\",\"Block 1013\",\"Block 1014\",\"Block 1015\",\"Block 1016\",\"Block 1017\",\"Block 1018\",\"Block 1019\",\"Block 1020\",\"Block 1021\",\"Block 1022\",\"Block 1023\",\"Block 1024\",\"Block 1025\",\"Block 1026\",\"Block 1027\",\"Block 1028\",\"Block 1029\",\"Block 1030\",\"Block 1031\",\"Block 2000\",\"Block 2001\",\"Block 2002\",\"Block 2003\",\"Block 2004\",\"Block 2005\",\"Block 2006\",\"Block 2007\",\"Block 2008\",\"Block 2009\",\"Block 2010\",\"Block 2011\",\"Block 2012\",\"Block 2013\",\"Block 2014\",\"Block 2015\",\"Block 2016\",\"Block 2017\",\"Block 3000\",\"Block 3001\",\"Block 3002\",\"Block 3003\",\"Block 3004\",\"Block 3005\",\"Block 3006\",\"Block 3007\",\"Block 3008\",\"Block 3009\",\"Block 3010\",\"Block 3011\",\"Block 3012\",\"Block 3013\",\"Block 3014\",\"Block 3015\",\"Block 3016\",\"Block 3017\",\"Block 3018\",\"Block 3019\",\"Block 3020\",\"Block 3021\",\"Block 3022\",\"Block 3023\",\"Block 3024\",\"Block 3025\",\"Block 3026\",\"Block 3027\",\"Block 3028\",\"Block 3029\",\"Block 3030\",\"Block 3031\"]},{\"attribute\":\"STATEFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"06\"]},{\"attribute\":\"TRACTCE10\",\"count\":6,\"type\":\"string\",\"values\":[\"420100\",\"420200\",\"420300\",\"420400\",\"420500\",\"420600\"]},{\"attribute\":\"UACE10\",\"count\":1,\"type\":\"string\",\"values\":[\"78904\"]},{\"attribute\":\"UATYP10\",\"count\":1,\"type\":\"string\",\"values\":[\"U\"]},{\"attribute\":\"UR10\",\"count\":2,\"type\":\"string\",\"values\":[\"R\",\"U\"]},{\"attribute\":\"population\",\"count\":74,\"type\":\"mixed\",\"values\":[\"\",1,10,11,1118,113,116,12,13,133,145,15,16,17,18,19,2,21,212,22,23,24,27,28,29,30,31,32,33,34,35,36,37,38,39,4,40,41,414,42,43,44,45,46,47,49,50,51,53,54,55,56,57,58,60,62,63,64,65,66,68,69,7,70,73,82,83,84,86,87,9,90,91,98],\"min\":1,\"max\":1118}]}]}}", "maxzoom": "12", -"minzoom": "0", +"minzoom": "3", "name": "tests/join-population/tabblock_06001420.mbtiles", "strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]", "type": "overlay", diff --git a/tests/join-population/just-macarthur.mbtiles.json b/tests/join-population/just-macarthur.mbtiles.json index 0330c10a5..97b1b7e1e 100644 --- a/tests/join-population/just-macarthur.mbtiles.json +++ b/tests/join-population/just-macarthur.mbtiles.json @@ -2,13 +2,13 @@ "antimeridian_adjusted_bounds": "237.656250,37.857507,237.744141,37.926868", "attribution": "macarthur's attribution", "bounds": "-122.343750,37.695438,-122.104097,37.926868", -"center": "-122.299805,37.892187,12", +"center": "-122.299805,37.892187,11", "description": "macarthur description", "format": "pbf", "generator_options": "./tippecanoe -q -f -Z5 -z10 -o tests/join-population/macarthur.mbtiles -l macarthur tests/join-population/macarthur.json; ./tippecanoe -q -f -d10 -D10 -Z9 -z11 -o tests/join-population/macarthur2.mbtiles -l macarthur tests/join-population/macarthur2.json; ./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join -q -f -o tests/join-population/merged.mbtiles tests/join-population/tabblock_06001420.mbtiles tests/join-population/macarthur.mbtiles tests/join-population/macarthur2.mbtiles; ./tile-join -q -f -l macarthur -n 'macarthur name' -N 'macarthur description' -A 'macarthur'\"'\"'s attribution' -o tests/join-population/just-macarthur.mbtiles tests/join-population/merged.mbtiles", "json": "{\"vector_layers\":[{\"id\":\"macarthur\",\"description\":\"\",\"minzoom\":5,\"maxzoom\":11,\"fields\":{\"FULLNAME\":\"String\",\"LINEARID\":\"String\",\"MTFCC\":\"String\",\"RTTYP\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"macarthur\",\"count\":171,\"geometry\":\"LineString\",\"attributeCount\":4,\"attributes\":[{\"attribute\":\"FULLNAME\",\"count\":5,\"type\":\"string\",\"values\":[\"Macarthur\",\"Macarthur Blvd\",\"Macarthur Fwy\",\"W Macarthur\",\"W Macarthur Blvd\"]},{\"attribute\":\"LINEARID\",\"count\":42,\"type\":\"string\",\"values\":[\"1102155930810\",\"1102156217102\",\"1102156241736\",\"1102156248968\",\"1102156510290\",\"1102157651658\",\"1102406970092\",\"1102406970093\",\"1102406970094\",\"1102406970095\",\"1102407366406\",\"1102638069562\",\"1102638078801\",\"1102654601627\",\"1102654601663\",\"1102654602215\",\"1102954189105\",\"1102954918511\",\"1103690383700\",\"1103690474249\",\"1103690474250\",\"1103690483026\",\"1103690483032\",\"1103717593123\",\"1104469713187\",\"1104469713198\",\"1104474748623\",\"1104475134288\",\"1104475134436\",\"1104485605278\",\"1104485645649\",\"1104485773833\",\"1104486090991\",\"1104486392881\",\"1105089436004\",\"1105089465114\",\"1105089465116\",\"1105281275434\",\"1105281275687\",\"1105281275688\",\"1105281275689\",\"1105281275692\"]},{\"attribute\":\"MTFCC\",\"count\":2,\"type\":\"string\",\"values\":[\"S1100\",\"S1400\"]},{\"attribute\":\"RTTYP\",\"count\":1,\"type\":\"string\",\"values\":[\"M\"]}]}]}}", -"maxzoom": "12", -"minzoom": "0", +"maxzoom": "11", +"minzoom": "5", "name": "macarthur name", "strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]", "type": "overlay", diff --git a/tests/join-population/merged-folder.mbtiles.json b/tests/join-population/merged-folder.mbtiles.json index 86b5b0116..86337ba1b 100644 --- a/tests/join-population/merged-folder.mbtiles.json +++ b/tests/join-population/merged-folder.mbtiles.json @@ -7,7 +7,7 @@ "generator_options": "./tippecanoe -q -Z5 -z10 -f -e tests/join-population/macarthur-folder -l macarthur tests/join-population/macarthur.json; ./tippecanoe -q -d10 -D10 -Z9 -z11 -f -e tests/join-population/macarthur2-folder -l macarthur tests/join-population/macarthur2.json; ./tippecanoe -q -z12 -f -e tests/join-population/tabblock_06001420-folder '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join -q -f -o tests/join-population/merged-folder.mbtiles tests/join-population/tabblock_06001420-folder tests/join-population/macarthur-folder tests/join-population/macarthur2-folder", "json": "{\"vector_layers\":[{\"id\":\"macarthur\",\"description\":\"\",\"minzoom\":5,\"maxzoom\":11,\"fields\":{\"FULLNAME\":\"String\",\"LINEARID\":\"String\",\"MTFCC\":\"String\",\"RTTYP\":\"String\"}},{\"id\":\"tabblock_06001420\",\"description\":\"population\",\"minzoom\":3,\"maxzoom\":12,\"fields\":{\"ALAND10\":\"Land area\",\"AWATER10\":\"Number\",\"BLOCKCE10\":\"String\",\"COUNTYFP10\":\"String\",\"FUNCSTAT10\":\"String\",\"GEOID10\":\"String\",\"INTPTLAT10\":\"String\",\"INTPTLON10\":\"String\",\"MTFCC10\":\"String\",\"NAME10\":\"String\",\"STATEFP10\":\"String\",\"TRACTCE10\":\"String\",\"UACE10\":\"String\",\"UATYP10\":\"String\",\"UR10\":\"String\"}}],\"tilestats\":{\"layerCount\":2,\"layers\":[{\"layer\":\"macarthur\",\"count\":171,\"geometry\":\"LineString\",\"attributeCount\":4,\"attributes\":[{\"attribute\":\"FULLNAME\",\"count\":5,\"type\":\"string\",\"values\":[\"Macarthur\",\"Macarthur Blvd\",\"Macarthur Fwy\",\"W Macarthur\",\"W Macarthur Blvd\"]},{\"attribute\":\"LINEARID\",\"count\":42,\"type\":\"string\",\"values\":[\"1102155930810\",\"1102156217102\",\"1102156241736\",\"1102156248968\",\"1102156510290\",\"1102157651658\",\"1102406970092\",\"1102406970093\",\"1102406970094\",\"1102406970095\",\"1102407366406\",\"1102638069562\",\"1102638078801\",\"1102654601627\",\"1102654601663\",\"1102654602215\",\"1102954189105\",\"1102954918511\",\"1103690383700\",\"1103690474249\",\"1103690474250\",\"1103690483026\",\"1103690483032\",\"1103717593123\",\"1104469713187\",\"1104469713198\",\"1104474748623\",\"1104475134288\",\"1104475134436\",\"1104485605278\",\"1104485645649\",\"1104485773833\",\"1104486090991\",\"1104486392881\",\"1105089436004\",\"1105089465114\",\"1105089465116\",\"1105281275434\",\"1105281275687\",\"1105281275688\",\"1105281275689\",\"1105281275692\"]},{\"attribute\":\"MTFCC\",\"count\":2,\"type\":\"string\",\"values\":[\"S1100\",\"S1400\"]},{\"attribute\":\"RTTYP\",\"count\":1,\"type\":\"string\",\"values\":[\"M\"]}]},{\"layer\":\"tabblock_06001420\",\"count\":1484,\"geometry\":\"Polygon\",\"attributeCount\":15,\"attributes\":[{\"attribute\":\"ALAND10\",\"count\":257,\"type\":\"number\",\"values\":[0,10019,10125,1018,1027,10320,10339,1037,1060,10769,10776,1094,10961,10975,11206,11282,11297,11306,11372,11825,11921,11928,11997,1201,12044,12062,1214,12213,1246,12579,1269,12945,13013,13106,1324,13452,13985,14000,14042,14044,14053,14087,14101,14158,14169,14185,14193,14219,14237,14270,14291,14449,14452,14453,14523,14539,14541,14557,14565,1457,14593,1461,14639,1466,14791,14799,14980,1509,15100,15240,15260,15494,15574,15665,15730,15921,15930,15974,16117,16120,16165,16183,16238,16246,16253,16332,16353,16431,16453,16535,16537,16605,16635,16691,16994,1704,17210,17230,17265,17308],\"min\":0,\"max\":542505},{\"attribute\":\"AWATER10\",\"count\":4,\"type\":\"number\",\"values\":[0,1111196,1632801,24],\"min\":0,\"max\":1632801},{\"attribute\":\"BLOCKCE10\",\"count\":82,\"type\":\"string\",\"values\":[\"1000\",\"1001\",\"1002\",\"1003\",\"1004\",\"1005\",\"1006\",\"1007\",\"1008\",\"1009\",\"1010\",\"1011\",\"1012\",\"1013\",\"1014\",\"1015\",\"1016\",\"1017\",\"1018\",\"1019\",\"1020\",\"1021\",\"1022\",\"1023\",\"1024\",\"1025\",\"1026\",\"1027\",\"1028\",\"1029\",\"1030\",\"1031\",\"2000\",\"2001\",\"2002\",\"2003\",\"2004\",\"2005\",\"2006\",\"2007\",\"2008\",\"2009\",\"2010\",\"2011\",\"2012\",\"2013\",\"2014\",\"2015\",\"2016\",\"2017\",\"3000\",\"3001\",\"3002\",\"3003\",\"3004\",\"3005\",\"3006\",\"3007\",\"3008\",\"3009\",\"3010\",\"3011\",\"3012\",\"3013\",\"3014\",\"3015\",\"3016\",\"3017\",\"3018\",\"3019\",\"3020\",\"3021\",\"3022\",\"3023\",\"3024\",\"3025\",\"3026\",\"3027\",\"3028\",\"3029\",\"3030\",\"3031\"]},{\"attribute\":\"COUNTYFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"001\"]},{\"attribute\":\"FUNCSTAT10\",\"count\":1,\"type\":\"string\",\"values\":[\"S\"]},{\"attribute\":\"GEOID10\",\"count\":260,\"type\":\"string\",\"values\":[\"060014201001000\",\"060014201001001\",\"060014201001002\",\"060014201001003\",\"060014201001004\",\"060014201001005\",\"060014201001006\",\"060014201001007\",\"060014201001008\",\"060014201001009\",\"060014201001010\",\"060014201001011\",\"060014201001012\",\"060014201001013\",\"060014201001014\",\"060014201001015\",\"060014201001016\",\"060014201001017\",\"060014201001018\",\"060014201001019\",\"060014201002000\",\"060014201002001\",\"060014201002002\",\"060014201002003\",\"060014201002004\",\"060014201002005\",\"060014201002006\",\"060014201002007\",\"060014201002008\",\"060014201002009\",\"060014201002010\",\"060014201002011\",\"060014201002012\",\"060014201002013\",\"060014201002014\",\"060014201002015\",\"060014201003000\",\"060014201003001\",\"060014201003002\",\"060014201003003\",\"060014201003004\",\"060014201003005\",\"060014201003006\",\"060014201003007\",\"060014201003008\",\"060014202001000\",\"060014202001001\",\"060014202001002\",\"060014202001003\",\"060014202001004\",\"060014202001005\",\"060014202001006\",\"060014202001007\",\"060014202001008\",\"060014202001009\",\"060014202001010\",\"060014202001011\",\"060014202001012\",\"060014202001013\",\"060014202001014\",\"060014202002000\",\"060014202002001\",\"060014202002002\",\"060014202002003\",\"060014202002004\",\"060014202002005\",\"060014202002006\",\"060014202002007\",\"060014202002008\",\"060014202002009\",\"060014202002010\",\"060014202002011\",\"060014202002012\",\"060014202003000\",\"060014202003001\",\"060014202003002\",\"060014202003003\",\"060014202003004\",\"060014202003005\",\"060014202003006\",\"060014202003007\",\"060014202003008\",\"060014202003009\",\"060014202003010\",\"060014202003011\",\"060014202003012\",\"060014203001000\",\"060014203001001\",\"060014203001002\",\"060014203001003\",\"060014203001004\",\"060014203001005\",\"060014203001006\",\"060014203001007\",\"060014203001008\",\"060014203001009\",\"060014203001010\",\"060014203001011\",\"060014203001012\",\"060014203001013\"]},{\"attribute\":\"INTPTLAT10\",\"count\":257,\"type\":\"string\",\"values\":[\"+37.882724\",\"+37.882857\",\"+37.882965\",\"+37.883224\",\"+37.883323\",\"+37.883462\",\"+37.883465\",\"+37.883481\",\"+37.883493\",\"+37.883527\",\"+37.883536\",\"+37.883579\",\"+37.883655\",\"+37.883693\",\"+37.883707\",\"+37.883745\",\"+37.883836\",\"+37.883871\",\"+37.883875\",\"+37.883931\",\"+37.883973\",\"+37.883995\",\"+37.884009\",\"+37.884079\",\"+37.884198\",\"+37.884202\",\"+37.884338\",\"+37.884369\",\"+37.884436\",\"+37.884677\",\"+37.884743\",\"+37.884747\",\"+37.884757\",\"+37.884896\",\"+37.884902\",\"+37.884919\",\"+37.884942\",\"+37.885307\",\"+37.885308\",\"+37.885399\",\"+37.885448\",\"+37.885491\",\"+37.885644\",\"+37.885646\",\"+37.885673\",\"+37.885811\",\"+37.885827\",\"+37.885997\",\"+37.886159\",\"+37.886194\",\"+37.886197\",\"+37.886237\",\"+37.886278\",\"+37.886322\",\"+37.886339\",\"+37.886439\",\"+37.886460\",\"+37.886495\",\"+37.886587\",\"+37.886596\",\"+37.886608\",\"+37.886758\",\"+37.886830\",\"+37.886929\",\"+37.887099\",\"+37.887163\",\"+37.887238\",\"+37.887267\",\"+37.887324\",\"+37.887379\",\"+37.887412\",\"+37.887570\",\"+37.887764\",\"+37.887776\",\"+37.887789\",\"+37.887852\",\"+37.887885\",\"+37.887916\",\"+37.887945\",\"+37.888027\",\"+37.888122\",\"+37.888238\",\"+37.888325\",\"+37.888332\",\"+37.888340\",\"+37.888416\",\"+37.888418\",\"+37.888441\",\"+37.888458\",\"+37.888506\",\"+37.888511\",\"+37.888540\",\"+37.888616\",\"+37.888634\",\"+37.888734\",\"+37.888782\",\"+37.888823\",\"+37.888848\",\"+37.888859\",\"+37.888863\"]},{\"attribute\":\"INTPTLON10\",\"count\":259,\"type\":\"string\",\"values\":[\"-122.282320\",\"-122.282371\",\"-122.282679\",\"-122.282689\",\"-122.282947\",\"-122.283067\",\"-122.283212\",\"-122.283424\",\"-122.283651\",\"-122.283723\",\"-122.283797\",\"-122.283828\",\"-122.283924\",\"-122.283973\",\"-122.284471\",\"-122.284571\",\"-122.284590\",\"-122.284831\",\"-122.285020\",\"-122.285076\",\"-122.285093\",\"-122.285175\",\"-122.285609\",\"-122.285651\",\"-122.285682\",\"-122.285901\",\"-122.285971\",\"-122.286179\",\"-122.286324\",\"-122.286349\",\"-122.286366\",\"-122.286615\",\"-122.286636\",\"-122.286818\",\"-122.286865\",\"-122.286913\",\"-122.287055\",\"-122.287082\",\"-122.287097\",\"-122.287125\",\"-122.287205\",\"-122.287275\",\"-122.287323\",\"-122.287379\",\"-122.287583\",\"-122.287591\",\"-122.287634\",\"-122.287747\",\"-122.287757\",\"-122.287836\",\"-122.287926\",\"-122.287969\",\"-122.288150\",\"-122.288221\",\"-122.288237\",\"-122.288313\",\"-122.288382\",\"-122.288473\",\"-122.288602\",\"-122.288628\",\"-122.288677\",\"-122.288696\",\"-122.288764\",\"-122.288787\",\"-122.288910\",\"-122.289020\",\"-122.289219\",\"-122.289471\",\"-122.289472\",\"-122.289530\",\"-122.289570\",\"-122.289573\",\"-122.289663\",\"-122.289764\",\"-122.289959\",\"-122.290117\",\"-122.290340\",\"-122.290441\",\"-122.290522\",\"-122.290573\",\"-122.290615\",\"-122.290964\",\"-122.290980\",\"-122.291137\",\"-122.291217\",\"-122.291315\",\"-122.291350\",\"-122.291391\",\"-122.291474\",\"-122.291484\",\"-122.291592\",\"-122.291817\",\"-122.291926\",\"-122.292014\",\"-122.292116\",\"-122.292153\",\"-122.292289\",\"-122.292309\",\"-122.292394\",\"-122.292415\"]},{\"attribute\":\"MTFCC10\",\"count\":1,\"type\":\"string\",\"values\":[\"G5040\"]},{\"attribute\":\"NAME10\",\"count\":82,\"type\":\"string\",\"values\":[\"Block 1000\",\"Block 1001\",\"Block 1002\",\"Block 1003\",\"Block 1004\",\"Block 1005\",\"Block 1006\",\"Block 1007\",\"Block 1008\",\"Block 1009\",\"Block 1010\",\"Block 1011\",\"Block 1012\",\"Block 1013\",\"Block 1014\",\"Block 1015\",\"Block 1016\",\"Block 1017\",\"Block 1018\",\"Block 1019\",\"Block 1020\",\"Block 1021\",\"Block 1022\",\"Block 1023\",\"Block 1024\",\"Block 1025\",\"Block 1026\",\"Block 1027\",\"Block 1028\",\"Block 1029\",\"Block 1030\",\"Block 1031\",\"Block 2000\",\"Block 2001\",\"Block 2002\",\"Block 2003\",\"Block 2004\",\"Block 2005\",\"Block 2006\",\"Block 2007\",\"Block 2008\",\"Block 2009\",\"Block 2010\",\"Block 2011\",\"Block 2012\",\"Block 2013\",\"Block 2014\",\"Block 2015\",\"Block 2016\",\"Block 2017\",\"Block 3000\",\"Block 3001\",\"Block 3002\",\"Block 3003\",\"Block 3004\",\"Block 3005\",\"Block 3006\",\"Block 3007\",\"Block 3008\",\"Block 3009\",\"Block 3010\",\"Block 3011\",\"Block 3012\",\"Block 3013\",\"Block 3014\",\"Block 3015\",\"Block 3016\",\"Block 3017\",\"Block 3018\",\"Block 3019\",\"Block 3020\",\"Block 3021\",\"Block 3022\",\"Block 3023\",\"Block 3024\",\"Block 3025\",\"Block 3026\",\"Block 3027\",\"Block 3028\",\"Block 3029\",\"Block 3030\",\"Block 3031\"]},{\"attribute\":\"STATEFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"06\"]},{\"attribute\":\"TRACTCE10\",\"count\":6,\"type\":\"string\",\"values\":[\"420100\",\"420200\",\"420300\",\"420400\",\"420500\",\"420600\"]},{\"attribute\":\"UACE10\",\"count\":1,\"type\":\"string\",\"values\":[\"78904\"]},{\"attribute\":\"UATYP10\",\"count\":1,\"type\":\"string\",\"values\":[\"U\"]},{\"attribute\":\"UR10\",\"count\":2,\"type\":\"string\",\"values\":[\"R\",\"U\"]}]}]}}", "maxzoom": "12", -"minzoom": "0", +"minzoom": "3", "name": "tests/join-population/macarthur-folder + tests/join-population/macarthur2-folder + tests/join-population/tabblock_06001420-folder", "strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]", "type": "overlay", diff --git a/tests/join-population/merged.mbtiles.json b/tests/join-population/merged.mbtiles.json index acc0905d8..e21069965 100644 --- a/tests/join-population/merged.mbtiles.json +++ b/tests/join-population/merged.mbtiles.json @@ -7,7 +7,7 @@ "generator_options": "./tippecanoe -q -f -Z5 -z10 -o tests/join-population/macarthur.mbtiles -l macarthur tests/join-population/macarthur.json; ./tippecanoe -q -f -d10 -D10 -Z9 -z11 -o tests/join-population/macarthur2.mbtiles -l macarthur tests/join-population/macarthur2.json; ./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join -q -f -o tests/join-population/merged.mbtiles tests/join-population/tabblock_06001420.mbtiles tests/join-population/macarthur.mbtiles tests/join-population/macarthur2.mbtiles", "json": "{\"vector_layers\":[{\"id\":\"macarthur\",\"description\":\"\",\"minzoom\":5,\"maxzoom\":11,\"fields\":{\"FULLNAME\":\"String\",\"LINEARID\":\"String\",\"MTFCC\":\"String\",\"RTTYP\":\"String\"}},{\"id\":\"tabblock_06001420\",\"description\":\"population\",\"minzoom\":3,\"maxzoom\":12,\"fields\":{\"ALAND10\":\"Land area\",\"AWATER10\":\"Number\",\"BLOCKCE10\":\"String\",\"COUNTYFP10\":\"String\",\"FUNCSTAT10\":\"String\",\"GEOID10\":\"String\",\"INTPTLAT10\":\"String\",\"INTPTLON10\":\"String\",\"MTFCC10\":\"String\",\"NAME10\":\"String\",\"STATEFP10\":\"String\",\"TRACTCE10\":\"String\",\"UACE10\":\"String\",\"UATYP10\":\"String\",\"UR10\":\"String\"}}],\"tilestats\":{\"layerCount\":2,\"layers\":[{\"layer\":\"macarthur\",\"count\":171,\"geometry\":\"LineString\",\"attributeCount\":4,\"attributes\":[{\"attribute\":\"FULLNAME\",\"count\":5,\"type\":\"string\",\"values\":[\"Macarthur\",\"Macarthur Blvd\",\"Macarthur Fwy\",\"W Macarthur\",\"W Macarthur Blvd\"]},{\"attribute\":\"LINEARID\",\"count\":42,\"type\":\"string\",\"values\":[\"1102155930810\",\"1102156217102\",\"1102156241736\",\"1102156248968\",\"1102156510290\",\"1102157651658\",\"1102406970092\",\"1102406970093\",\"1102406970094\",\"1102406970095\",\"1102407366406\",\"1102638069562\",\"1102638078801\",\"1102654601627\",\"1102654601663\",\"1102654602215\",\"1102954189105\",\"1102954918511\",\"1103690383700\",\"1103690474249\",\"1103690474250\",\"1103690483026\",\"1103690483032\",\"1103717593123\",\"1104469713187\",\"1104469713198\",\"1104474748623\",\"1104475134288\",\"1104475134436\",\"1104485605278\",\"1104485645649\",\"1104485773833\",\"1104486090991\",\"1104486392881\",\"1105089436004\",\"1105089465114\",\"1105089465116\",\"1105281275434\",\"1105281275687\",\"1105281275688\",\"1105281275689\",\"1105281275692\"]},{\"attribute\":\"MTFCC\",\"count\":2,\"type\":\"string\",\"values\":[\"S1100\",\"S1400\"]},{\"attribute\":\"RTTYP\",\"count\":1,\"type\":\"string\",\"values\":[\"M\"]}]},{\"layer\":\"tabblock_06001420\",\"count\":1484,\"geometry\":\"Polygon\",\"attributeCount\":15,\"attributes\":[{\"attribute\":\"ALAND10\",\"count\":257,\"type\":\"number\",\"values\":[0,10019,10125,1018,1027,10320,10339,1037,1060,10769,10776,1094,10961,10975,11206,11282,11297,11306,11372,11825,11921,11928,11997,1201,12044,12062,1214,12213,1246,12579,1269,12945,13013,13106,1324,13452,13985,14000,14042,14044,14053,14087,14101,14158,14169,14185,14193,14219,14237,14270,14291,14449,14452,14453,14523,14539,14541,14557,14565,1457,14593,1461,14639,1466,14791,14799,14980,1509,15100,15240,15260,15494,15574,15665,15730,15921,15930,15974,16117,16120,16165,16183,16238,16246,16253,16332,16353,16431,16453,16535,16537,16605,16635,16691,16994,1704,17210,17230,17265,17308],\"min\":0,\"max\":542505},{\"attribute\":\"AWATER10\",\"count\":4,\"type\":\"number\",\"values\":[0,1111196,1632801,24],\"min\":0,\"max\":1632801},{\"attribute\":\"BLOCKCE10\",\"count\":82,\"type\":\"string\",\"values\":[\"1000\",\"1001\",\"1002\",\"1003\",\"1004\",\"1005\",\"1006\",\"1007\",\"1008\",\"1009\",\"1010\",\"1011\",\"1012\",\"1013\",\"1014\",\"1015\",\"1016\",\"1017\",\"1018\",\"1019\",\"1020\",\"1021\",\"1022\",\"1023\",\"1024\",\"1025\",\"1026\",\"1027\",\"1028\",\"1029\",\"1030\",\"1031\",\"2000\",\"2001\",\"2002\",\"2003\",\"2004\",\"2005\",\"2006\",\"2007\",\"2008\",\"2009\",\"2010\",\"2011\",\"2012\",\"2013\",\"2014\",\"2015\",\"2016\",\"2017\",\"3000\",\"3001\",\"3002\",\"3003\",\"3004\",\"3005\",\"3006\",\"3007\",\"3008\",\"3009\",\"3010\",\"3011\",\"3012\",\"3013\",\"3014\",\"3015\",\"3016\",\"3017\",\"3018\",\"3019\",\"3020\",\"3021\",\"3022\",\"3023\",\"3024\",\"3025\",\"3026\",\"3027\",\"3028\",\"3029\",\"3030\",\"3031\"]},{\"attribute\":\"COUNTYFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"001\"]},{\"attribute\":\"FUNCSTAT10\",\"count\":1,\"type\":\"string\",\"values\":[\"S\"]},{\"attribute\":\"GEOID10\",\"count\":260,\"type\":\"string\",\"values\":[\"060014201001000\",\"060014201001001\",\"060014201001002\",\"060014201001003\",\"060014201001004\",\"060014201001005\",\"060014201001006\",\"060014201001007\",\"060014201001008\",\"060014201001009\",\"060014201001010\",\"060014201001011\",\"060014201001012\",\"060014201001013\",\"060014201001014\",\"060014201001015\",\"060014201001016\",\"060014201001017\",\"060014201001018\",\"060014201001019\",\"060014201002000\",\"060014201002001\",\"060014201002002\",\"060014201002003\",\"060014201002004\",\"060014201002005\",\"060014201002006\",\"060014201002007\",\"060014201002008\",\"060014201002009\",\"060014201002010\",\"060014201002011\",\"060014201002012\",\"060014201002013\",\"060014201002014\",\"060014201002015\",\"060014201003000\",\"060014201003001\",\"060014201003002\",\"060014201003003\",\"060014201003004\",\"060014201003005\",\"060014201003006\",\"060014201003007\",\"060014201003008\",\"060014202001000\",\"060014202001001\",\"060014202001002\",\"060014202001003\",\"060014202001004\",\"060014202001005\",\"060014202001006\",\"060014202001007\",\"060014202001008\",\"060014202001009\",\"060014202001010\",\"060014202001011\",\"060014202001012\",\"060014202001013\",\"060014202001014\",\"060014202002000\",\"060014202002001\",\"060014202002002\",\"060014202002003\",\"060014202002004\",\"060014202002005\",\"060014202002006\",\"060014202002007\",\"060014202002008\",\"060014202002009\",\"060014202002010\",\"060014202002011\",\"060014202002012\",\"060014202003000\",\"060014202003001\",\"060014202003002\",\"060014202003003\",\"060014202003004\",\"060014202003005\",\"060014202003006\",\"060014202003007\",\"060014202003008\",\"060014202003009\",\"060014202003010\",\"060014202003011\",\"060014202003012\",\"060014203001000\",\"060014203001001\",\"060014203001002\",\"060014203001003\",\"060014203001004\",\"060014203001005\",\"060014203001006\",\"060014203001007\",\"060014203001008\",\"060014203001009\",\"060014203001010\",\"060014203001011\",\"060014203001012\",\"060014203001013\"]},{\"attribute\":\"INTPTLAT10\",\"count\":257,\"type\":\"string\",\"values\":[\"+37.882724\",\"+37.882857\",\"+37.882965\",\"+37.883224\",\"+37.883323\",\"+37.883462\",\"+37.883465\",\"+37.883481\",\"+37.883493\",\"+37.883527\",\"+37.883536\",\"+37.883579\",\"+37.883655\",\"+37.883693\",\"+37.883707\",\"+37.883745\",\"+37.883836\",\"+37.883871\",\"+37.883875\",\"+37.883931\",\"+37.883973\",\"+37.883995\",\"+37.884009\",\"+37.884079\",\"+37.884198\",\"+37.884202\",\"+37.884338\",\"+37.884369\",\"+37.884436\",\"+37.884677\",\"+37.884743\",\"+37.884747\",\"+37.884757\",\"+37.884896\",\"+37.884902\",\"+37.884919\",\"+37.884942\",\"+37.885307\",\"+37.885308\",\"+37.885399\",\"+37.885448\",\"+37.885491\",\"+37.885644\",\"+37.885646\",\"+37.885673\",\"+37.885811\",\"+37.885827\",\"+37.885997\",\"+37.886159\",\"+37.886194\",\"+37.886197\",\"+37.886237\",\"+37.886278\",\"+37.886322\",\"+37.886339\",\"+37.886439\",\"+37.886460\",\"+37.886495\",\"+37.886587\",\"+37.886596\",\"+37.886608\",\"+37.886758\",\"+37.886830\",\"+37.886929\",\"+37.887099\",\"+37.887163\",\"+37.887238\",\"+37.887267\",\"+37.887324\",\"+37.887379\",\"+37.887412\",\"+37.887570\",\"+37.887764\",\"+37.887776\",\"+37.887789\",\"+37.887852\",\"+37.887885\",\"+37.887916\",\"+37.887945\",\"+37.888027\",\"+37.888122\",\"+37.888238\",\"+37.888325\",\"+37.888332\",\"+37.888340\",\"+37.888416\",\"+37.888418\",\"+37.888441\",\"+37.888458\",\"+37.888506\",\"+37.888511\",\"+37.888540\",\"+37.888616\",\"+37.888634\",\"+37.888734\",\"+37.888782\",\"+37.888823\",\"+37.888848\",\"+37.888859\",\"+37.888863\"]},{\"attribute\":\"INTPTLON10\",\"count\":259,\"type\":\"string\",\"values\":[\"-122.282320\",\"-122.282371\",\"-122.282679\",\"-122.282689\",\"-122.282947\",\"-122.283067\",\"-122.283212\",\"-122.283424\",\"-122.283651\",\"-122.283723\",\"-122.283797\",\"-122.283828\",\"-122.283924\",\"-122.283973\",\"-122.284471\",\"-122.284571\",\"-122.284590\",\"-122.284831\",\"-122.285020\",\"-122.285076\",\"-122.285093\",\"-122.285175\",\"-122.285609\",\"-122.285651\",\"-122.285682\",\"-122.285901\",\"-122.285971\",\"-122.286179\",\"-122.286324\",\"-122.286349\",\"-122.286366\",\"-122.286615\",\"-122.286636\",\"-122.286818\",\"-122.286865\",\"-122.286913\",\"-122.287055\",\"-122.287082\",\"-122.287097\",\"-122.287125\",\"-122.287205\",\"-122.287275\",\"-122.287323\",\"-122.287379\",\"-122.287583\",\"-122.287591\",\"-122.287634\",\"-122.287747\",\"-122.287757\",\"-122.287836\",\"-122.287926\",\"-122.287969\",\"-122.288150\",\"-122.288221\",\"-122.288237\",\"-122.288313\",\"-122.288382\",\"-122.288473\",\"-122.288602\",\"-122.288628\",\"-122.288677\",\"-122.288696\",\"-122.288764\",\"-122.288787\",\"-122.288910\",\"-122.289020\",\"-122.289219\",\"-122.289471\",\"-122.289472\",\"-122.289530\",\"-122.289570\",\"-122.289573\",\"-122.289663\",\"-122.289764\",\"-122.289959\",\"-122.290117\",\"-122.290340\",\"-122.290441\",\"-122.290522\",\"-122.290573\",\"-122.290615\",\"-122.290964\",\"-122.290980\",\"-122.291137\",\"-122.291217\",\"-122.291315\",\"-122.291350\",\"-122.291391\",\"-122.291474\",\"-122.291484\",\"-122.291592\",\"-122.291817\",\"-122.291926\",\"-122.292014\",\"-122.292116\",\"-122.292153\",\"-122.292289\",\"-122.292309\",\"-122.292394\",\"-122.292415\"]},{\"attribute\":\"MTFCC10\",\"count\":1,\"type\":\"string\",\"values\":[\"G5040\"]},{\"attribute\":\"NAME10\",\"count\":82,\"type\":\"string\",\"values\":[\"Block 1000\",\"Block 1001\",\"Block 1002\",\"Block 1003\",\"Block 1004\",\"Block 1005\",\"Block 1006\",\"Block 1007\",\"Block 1008\",\"Block 1009\",\"Block 1010\",\"Block 1011\",\"Block 1012\",\"Block 1013\",\"Block 1014\",\"Block 1015\",\"Block 1016\",\"Block 1017\",\"Block 1018\",\"Block 1019\",\"Block 1020\",\"Block 1021\",\"Block 1022\",\"Block 1023\",\"Block 1024\",\"Block 1025\",\"Block 1026\",\"Block 1027\",\"Block 1028\",\"Block 1029\",\"Block 1030\",\"Block 1031\",\"Block 2000\",\"Block 2001\",\"Block 2002\",\"Block 2003\",\"Block 2004\",\"Block 2005\",\"Block 2006\",\"Block 2007\",\"Block 2008\",\"Block 2009\",\"Block 2010\",\"Block 2011\",\"Block 2012\",\"Block 2013\",\"Block 2014\",\"Block 2015\",\"Block 2016\",\"Block 2017\",\"Block 3000\",\"Block 3001\",\"Block 3002\",\"Block 3003\",\"Block 3004\",\"Block 3005\",\"Block 3006\",\"Block 3007\",\"Block 3008\",\"Block 3009\",\"Block 3010\",\"Block 3011\",\"Block 3012\",\"Block 3013\",\"Block 3014\",\"Block 3015\",\"Block 3016\",\"Block 3017\",\"Block 3018\",\"Block 3019\",\"Block 3020\",\"Block 3021\",\"Block 3022\",\"Block 3023\",\"Block 3024\",\"Block 3025\",\"Block 3026\",\"Block 3027\",\"Block 3028\",\"Block 3029\",\"Block 3030\",\"Block 3031\"]},{\"attribute\":\"STATEFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"06\"]},{\"attribute\":\"TRACTCE10\",\"count\":6,\"type\":\"string\",\"values\":[\"420100\",\"420200\",\"420300\",\"420400\",\"420500\",\"420600\"]},{\"attribute\":\"UACE10\",\"count\":1,\"type\":\"string\",\"values\":[\"78904\"]},{\"attribute\":\"UATYP10\",\"count\":1,\"type\":\"string\",\"values\":[\"U\"]},{\"attribute\":\"UR10\",\"count\":2,\"type\":\"string\",\"values\":[\"R\",\"U\"]}]}]}}", "maxzoom": "12", -"minzoom": "0", +"minzoom": "3", "name": "tests/join-population/macarthur.mbtiles + tests/join-population/macarthur2.mbtiles + tests/join-population/tabblock_06001420.mbtiles", "strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]", "type": "overlay", diff --git a/tests/join-population/no-macarthur.mbtiles.json b/tests/join-population/no-macarthur.mbtiles.json index 19dc79ee1..80a22b9e1 100644 --- a/tests/join-population/no-macarthur.mbtiles.json +++ b/tests/join-population/no-macarthur.mbtiles.json @@ -7,7 +7,7 @@ "generator_options": "./tippecanoe -q -f -Z5 -z10 -o tests/join-population/macarthur.mbtiles -l macarthur tests/join-population/macarthur.json; ./tippecanoe -q -f -d10 -D10 -Z9 -z11 -o tests/join-population/macarthur2.mbtiles -l macarthur tests/join-population/macarthur2.json; ./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join -q -f -o tests/join-population/merged.mbtiles tests/join-population/tabblock_06001420.mbtiles tests/join-population/macarthur.mbtiles tests/join-population/macarthur2.mbtiles; ./tile-join -q -f -L macarthur -o tests/join-population/no-macarthur.mbtiles tests/join-population/merged.mbtiles", "json": "{\"vector_layers\":[{\"id\":\"tabblock_06001420\",\"description\":\"population\",\"minzoom\":3,\"maxzoom\":12,\"fields\":{\"ALAND10\":\"Land area\",\"AWATER10\":\"Number\",\"BLOCKCE10\":\"String\",\"COUNTYFP10\":\"String\",\"FUNCSTAT10\":\"String\",\"GEOID10\":\"String\",\"INTPTLAT10\":\"String\",\"INTPTLON10\":\"String\",\"MTFCC10\":\"String\",\"NAME10\":\"String\",\"STATEFP10\":\"String\",\"TRACTCE10\":\"String\",\"UACE10\":\"String\",\"UATYP10\":\"String\",\"UR10\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"tabblock_06001420\",\"count\":1484,\"geometry\":\"Polygon\",\"attributeCount\":15,\"attributes\":[{\"attribute\":\"ALAND10\",\"count\":257,\"type\":\"number\",\"values\":[0,10019,10125,1018,1027,10320,10339,1037,1060,10769,10776,1094,10961,10975,11206,11282,11297,11306,11372,11825,11921,11928,11997,1201,12044,12062,1214,12213,1246,12579,1269,12945,13013,13106,1324,13452,13985,14000,14042,14044,14053,14087,14101,14158,14169,14185,14193,14219,14237,14270,14291,14449,14452,14453,14523,14539,14541,14557,14565,1457,14593,1461,14639,1466,14791,14799,14980,1509,15100,15240,15260,15494,15574,15665,15730,15921,15930,15974,16117,16120,16165,16183,16238,16246,16253,16332,16353,16431,16453,16535,16537,16605,16635,16691,16994,1704,17210,17230,17265,17308],\"min\":0,\"max\":542505},{\"attribute\":\"AWATER10\",\"count\":4,\"type\":\"number\",\"values\":[0,1111196,1632801,24],\"min\":0,\"max\":1632801},{\"attribute\":\"BLOCKCE10\",\"count\":82,\"type\":\"string\",\"values\":[\"1000\",\"1001\",\"1002\",\"1003\",\"1004\",\"1005\",\"1006\",\"1007\",\"1008\",\"1009\",\"1010\",\"1011\",\"1012\",\"1013\",\"1014\",\"1015\",\"1016\",\"1017\",\"1018\",\"1019\",\"1020\",\"1021\",\"1022\",\"1023\",\"1024\",\"1025\",\"1026\",\"1027\",\"1028\",\"1029\",\"1030\",\"1031\",\"2000\",\"2001\",\"2002\",\"2003\",\"2004\",\"2005\",\"2006\",\"2007\",\"2008\",\"2009\",\"2010\",\"2011\",\"2012\",\"2013\",\"2014\",\"2015\",\"2016\",\"2017\",\"3000\",\"3001\",\"3002\",\"3003\",\"3004\",\"3005\",\"3006\",\"3007\",\"3008\",\"3009\",\"3010\",\"3011\",\"3012\",\"3013\",\"3014\",\"3015\",\"3016\",\"3017\",\"3018\",\"3019\",\"3020\",\"3021\",\"3022\",\"3023\",\"3024\",\"3025\",\"3026\",\"3027\",\"3028\",\"3029\",\"3030\",\"3031\"]},{\"attribute\":\"COUNTYFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"001\"]},{\"attribute\":\"FUNCSTAT10\",\"count\":1,\"type\":\"string\",\"values\":[\"S\"]},{\"attribute\":\"GEOID10\",\"count\":260,\"type\":\"string\",\"values\":[\"060014201001000\",\"060014201001001\",\"060014201001002\",\"060014201001003\",\"060014201001004\",\"060014201001005\",\"060014201001006\",\"060014201001007\",\"060014201001008\",\"060014201001009\",\"060014201001010\",\"060014201001011\",\"060014201001012\",\"060014201001013\",\"060014201001014\",\"060014201001015\",\"060014201001016\",\"060014201001017\",\"060014201001018\",\"060014201001019\",\"060014201002000\",\"060014201002001\",\"060014201002002\",\"060014201002003\",\"060014201002004\",\"060014201002005\",\"060014201002006\",\"060014201002007\",\"060014201002008\",\"060014201002009\",\"060014201002010\",\"060014201002011\",\"060014201002012\",\"060014201002013\",\"060014201002014\",\"060014201002015\",\"060014201003000\",\"060014201003001\",\"060014201003002\",\"060014201003003\",\"060014201003004\",\"060014201003005\",\"060014201003006\",\"060014201003007\",\"060014201003008\",\"060014202001000\",\"060014202001001\",\"060014202001002\",\"060014202001003\",\"060014202001004\",\"060014202001005\",\"060014202001006\",\"060014202001007\",\"060014202001008\",\"060014202001009\",\"060014202001010\",\"060014202001011\",\"060014202001012\",\"060014202001013\",\"060014202001014\",\"060014202002000\",\"060014202002001\",\"060014202002002\",\"060014202002003\",\"060014202002004\",\"060014202002005\",\"060014202002006\",\"060014202002007\",\"060014202002008\",\"060014202002009\",\"060014202002010\",\"060014202002011\",\"060014202002012\",\"060014202003000\",\"060014202003001\",\"060014202003002\",\"060014202003003\",\"060014202003004\",\"060014202003005\",\"060014202003006\",\"060014202003007\",\"060014202003008\",\"060014202003009\",\"060014202003010\",\"060014202003011\",\"060014202003012\",\"060014203001000\",\"060014203001001\",\"060014203001002\",\"060014203001003\",\"060014203001004\",\"060014203001005\",\"060014203001006\",\"060014203001007\",\"060014203001008\",\"060014203001009\",\"060014203001010\",\"060014203001011\",\"060014203001012\",\"060014203001013\"]},{\"attribute\":\"INTPTLAT10\",\"count\":257,\"type\":\"string\",\"values\":[\"+37.882724\",\"+37.882857\",\"+37.882965\",\"+37.883224\",\"+37.883323\",\"+37.883462\",\"+37.883465\",\"+37.883481\",\"+37.883493\",\"+37.883527\",\"+37.883536\",\"+37.883579\",\"+37.883655\",\"+37.883693\",\"+37.883707\",\"+37.883745\",\"+37.883836\",\"+37.883871\",\"+37.883875\",\"+37.883931\",\"+37.883973\",\"+37.883995\",\"+37.884009\",\"+37.884079\",\"+37.884198\",\"+37.884202\",\"+37.884338\",\"+37.884369\",\"+37.884436\",\"+37.884677\",\"+37.884743\",\"+37.884747\",\"+37.884757\",\"+37.884896\",\"+37.884902\",\"+37.884919\",\"+37.884942\",\"+37.885307\",\"+37.885308\",\"+37.885399\",\"+37.885448\",\"+37.885491\",\"+37.885644\",\"+37.885646\",\"+37.885673\",\"+37.885811\",\"+37.885827\",\"+37.885997\",\"+37.886159\",\"+37.886194\",\"+37.886197\",\"+37.886237\",\"+37.886278\",\"+37.886322\",\"+37.886339\",\"+37.886439\",\"+37.886460\",\"+37.886495\",\"+37.886587\",\"+37.886596\",\"+37.886608\",\"+37.886758\",\"+37.886830\",\"+37.886929\",\"+37.887099\",\"+37.887163\",\"+37.887238\",\"+37.887267\",\"+37.887324\",\"+37.887379\",\"+37.887412\",\"+37.887570\",\"+37.887764\",\"+37.887776\",\"+37.887789\",\"+37.887852\",\"+37.887885\",\"+37.887916\",\"+37.887945\",\"+37.888027\",\"+37.888122\",\"+37.888238\",\"+37.888325\",\"+37.888332\",\"+37.888340\",\"+37.888416\",\"+37.888418\",\"+37.888441\",\"+37.888458\",\"+37.888506\",\"+37.888511\",\"+37.888540\",\"+37.888616\",\"+37.888634\",\"+37.888734\",\"+37.888782\",\"+37.888823\",\"+37.888848\",\"+37.888859\",\"+37.888863\"]},{\"attribute\":\"INTPTLON10\",\"count\":259,\"type\":\"string\",\"values\":[\"-122.282320\",\"-122.282371\",\"-122.282679\",\"-122.282689\",\"-122.282947\",\"-122.283067\",\"-122.283212\",\"-122.283424\",\"-122.283651\",\"-122.283723\",\"-122.283797\",\"-122.283828\",\"-122.283924\",\"-122.283973\",\"-122.284471\",\"-122.284571\",\"-122.284590\",\"-122.284831\",\"-122.285020\",\"-122.285076\",\"-122.285093\",\"-122.285175\",\"-122.285609\",\"-122.285651\",\"-122.285682\",\"-122.285901\",\"-122.285971\",\"-122.286179\",\"-122.286324\",\"-122.286349\",\"-122.286366\",\"-122.286615\",\"-122.286636\",\"-122.286818\",\"-122.286865\",\"-122.286913\",\"-122.287055\",\"-122.287082\",\"-122.287097\",\"-122.287125\",\"-122.287205\",\"-122.287275\",\"-122.287323\",\"-122.287379\",\"-122.287583\",\"-122.287591\",\"-122.287634\",\"-122.287747\",\"-122.287757\",\"-122.287836\",\"-122.287926\",\"-122.287969\",\"-122.288150\",\"-122.288221\",\"-122.288237\",\"-122.288313\",\"-122.288382\",\"-122.288473\",\"-122.288602\",\"-122.288628\",\"-122.288677\",\"-122.288696\",\"-122.288764\",\"-122.288787\",\"-122.288910\",\"-122.289020\",\"-122.289219\",\"-122.289471\",\"-122.289472\",\"-122.289530\",\"-122.289570\",\"-122.289573\",\"-122.289663\",\"-122.289764\",\"-122.289959\",\"-122.290117\",\"-122.290340\",\"-122.290441\",\"-122.290522\",\"-122.290573\",\"-122.290615\",\"-122.290964\",\"-122.290980\",\"-122.291137\",\"-122.291217\",\"-122.291315\",\"-122.291350\",\"-122.291391\",\"-122.291474\",\"-122.291484\",\"-122.291592\",\"-122.291817\",\"-122.291926\",\"-122.292014\",\"-122.292116\",\"-122.292153\",\"-122.292289\",\"-122.292309\",\"-122.292394\",\"-122.292415\"]},{\"attribute\":\"MTFCC10\",\"count\":1,\"type\":\"string\",\"values\":[\"G5040\"]},{\"attribute\":\"NAME10\",\"count\":82,\"type\":\"string\",\"values\":[\"Block 1000\",\"Block 1001\",\"Block 1002\",\"Block 1003\",\"Block 1004\",\"Block 1005\",\"Block 1006\",\"Block 1007\",\"Block 1008\",\"Block 1009\",\"Block 1010\",\"Block 1011\",\"Block 1012\",\"Block 1013\",\"Block 1014\",\"Block 1015\",\"Block 1016\",\"Block 1017\",\"Block 1018\",\"Block 1019\",\"Block 1020\",\"Block 1021\",\"Block 1022\",\"Block 1023\",\"Block 1024\",\"Block 1025\",\"Block 1026\",\"Block 1027\",\"Block 1028\",\"Block 1029\",\"Block 1030\",\"Block 1031\",\"Block 2000\",\"Block 2001\",\"Block 2002\",\"Block 2003\",\"Block 2004\",\"Block 2005\",\"Block 2006\",\"Block 2007\",\"Block 2008\",\"Block 2009\",\"Block 2010\",\"Block 2011\",\"Block 2012\",\"Block 2013\",\"Block 2014\",\"Block 2015\",\"Block 2016\",\"Block 2017\",\"Block 3000\",\"Block 3001\",\"Block 3002\",\"Block 3003\",\"Block 3004\",\"Block 3005\",\"Block 3006\",\"Block 3007\",\"Block 3008\",\"Block 3009\",\"Block 3010\",\"Block 3011\",\"Block 3012\",\"Block 3013\",\"Block 3014\",\"Block 3015\",\"Block 3016\",\"Block 3017\",\"Block 3018\",\"Block 3019\",\"Block 3020\",\"Block 3021\",\"Block 3022\",\"Block 3023\",\"Block 3024\",\"Block 3025\",\"Block 3026\",\"Block 3027\",\"Block 3028\",\"Block 3029\",\"Block 3030\",\"Block 3031\"]},{\"attribute\":\"STATEFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"06\"]},{\"attribute\":\"TRACTCE10\",\"count\":6,\"type\":\"string\",\"values\":[\"420100\",\"420200\",\"420300\",\"420400\",\"420500\",\"420600\"]},{\"attribute\":\"UACE10\",\"count\":1,\"type\":\"string\",\"values\":[\"78904\"]},{\"attribute\":\"UATYP10\",\"count\":1,\"type\":\"string\",\"values\":[\"U\"]},{\"attribute\":\"UR10\",\"count\":2,\"type\":\"string\",\"values\":[\"R\",\"U\"]}]}]}}", "maxzoom": "12", -"minzoom": "0", +"minzoom": "3", "name": "tests/join-population/macarthur.mbtiles + tests/join-population/macarthur2.mbtiles + tests/join-population/tabblock_06001420.mbtiles", "strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]", "type": "overlay", diff --git a/tests/join-population/raw-merged-folder.json b/tests/join-population/raw-merged-folder.json index b97970ee3..2c7607ced 100644 --- a/tests/join-population/raw-merged-folder.json +++ b/tests/join-population/raw-merged-folder.json @@ -7,7 +7,7 @@ "generator_options": "./tippecanoe -q -f -Z5 -z10 -o tests/join-population/macarthur.mbtiles -l macarthur tests/join-population/macarthur.json; ./tippecanoe -q -f -d10 -D10 -Z9 -z11 -o tests/join-population/macarthur2.mbtiles -l macarthur tests/join-population/macarthur2.json; ./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join -q --no-tile-compression -f -e tests/join-population/raw-merged-folder tests/join-population/tabblock_06001420.mbtiles tests/join-population/macarthur.mbtiles tests/join-population/macarthur2.mbtiles", "json": "{\"vector_layers\":[{\"id\":\"macarthur\",\"description\":\"\",\"minzoom\":5,\"maxzoom\":11,\"fields\":{\"FULLNAME\":\"String\",\"LINEARID\":\"String\",\"MTFCC\":\"String\",\"RTTYP\":\"String\"}},{\"id\":\"tabblock_06001420\",\"description\":\"population\",\"minzoom\":3,\"maxzoom\":12,\"fields\":{\"ALAND10\":\"Land area\",\"AWATER10\":\"Number\",\"BLOCKCE10\":\"String\",\"COUNTYFP10\":\"String\",\"FUNCSTAT10\":\"String\",\"GEOID10\":\"String\",\"INTPTLAT10\":\"String\",\"INTPTLON10\":\"String\",\"MTFCC10\":\"String\",\"NAME10\":\"String\",\"STATEFP10\":\"String\",\"TRACTCE10\":\"String\",\"UACE10\":\"String\",\"UATYP10\":\"String\",\"UR10\":\"String\"}}],\"tilestats\":{\"layerCount\":2,\"layers\":[{\"layer\":\"macarthur\",\"count\":171,\"geometry\":\"LineString\",\"attributeCount\":4,\"attributes\":[{\"attribute\":\"FULLNAME\",\"count\":5,\"type\":\"string\",\"values\":[\"Macarthur\",\"Macarthur Blvd\",\"Macarthur Fwy\",\"W Macarthur\",\"W Macarthur Blvd\"]},{\"attribute\":\"LINEARID\",\"count\":42,\"type\":\"string\",\"values\":[\"1102155930810\",\"1102156217102\",\"1102156241736\",\"1102156248968\",\"1102156510290\",\"1102157651658\",\"1102406970092\",\"1102406970093\",\"1102406970094\",\"1102406970095\",\"1102407366406\",\"1102638069562\",\"1102638078801\",\"1102654601627\",\"1102654601663\",\"1102654602215\",\"1102954189105\",\"1102954918511\",\"1103690383700\",\"1103690474249\",\"1103690474250\",\"1103690483026\",\"1103690483032\",\"1103717593123\",\"1104469713187\",\"1104469713198\",\"1104474748623\",\"1104475134288\",\"1104475134436\",\"1104485605278\",\"1104485645649\",\"1104485773833\",\"1104486090991\",\"1104486392881\",\"1105089436004\",\"1105089465114\",\"1105089465116\",\"1105281275434\",\"1105281275687\",\"1105281275688\",\"1105281275689\",\"1105281275692\"]},{\"attribute\":\"MTFCC\",\"count\":2,\"type\":\"string\",\"values\":[\"S1100\",\"S1400\"]},{\"attribute\":\"RTTYP\",\"count\":1,\"type\":\"string\",\"values\":[\"M\"]}]},{\"layer\":\"tabblock_06001420\",\"count\":1484,\"geometry\":\"Polygon\",\"attributeCount\":15,\"attributes\":[{\"attribute\":\"ALAND10\",\"count\":257,\"type\":\"number\",\"values\":[0,10019,10125,1018,1027,10320,10339,1037,1060,10769,10776,1094,10961,10975,11206,11282,11297,11306,11372,11825,11921,11928,11997,1201,12044,12062,1214,12213,1246,12579,1269,12945,13013,13106,1324,13452,13985,14000,14042,14044,14053,14087,14101,14158,14169,14185,14193,14219,14237,14270,14291,14449,14452,14453,14523,14539,14541,14557,14565,1457,14593,1461,14639,1466,14791,14799,14980,1509,15100,15240,15260,15494,15574,15665,15730,15921,15930,15974,16117,16120,16165,16183,16238,16246,16253,16332,16353,16431,16453,16535,16537,16605,16635,16691,16994,1704,17210,17230,17265,17308],\"min\":0,\"max\":542505},{\"attribute\":\"AWATER10\",\"count\":4,\"type\":\"number\",\"values\":[0,1111196,1632801,24],\"min\":0,\"max\":1632801},{\"attribute\":\"BLOCKCE10\",\"count\":82,\"type\":\"string\",\"values\":[\"1000\",\"1001\",\"1002\",\"1003\",\"1004\",\"1005\",\"1006\",\"1007\",\"1008\",\"1009\",\"1010\",\"1011\",\"1012\",\"1013\",\"1014\",\"1015\",\"1016\",\"1017\",\"1018\",\"1019\",\"1020\",\"1021\",\"1022\",\"1023\",\"1024\",\"1025\",\"1026\",\"1027\",\"1028\",\"1029\",\"1030\",\"1031\",\"2000\",\"2001\",\"2002\",\"2003\",\"2004\",\"2005\",\"2006\",\"2007\",\"2008\",\"2009\",\"2010\",\"2011\",\"2012\",\"2013\",\"2014\",\"2015\",\"2016\",\"2017\",\"3000\",\"3001\",\"3002\",\"3003\",\"3004\",\"3005\",\"3006\",\"3007\",\"3008\",\"3009\",\"3010\",\"3011\",\"3012\",\"3013\",\"3014\",\"3015\",\"3016\",\"3017\",\"3018\",\"3019\",\"3020\",\"3021\",\"3022\",\"3023\",\"3024\",\"3025\",\"3026\",\"3027\",\"3028\",\"3029\",\"3030\",\"3031\"]},{\"attribute\":\"COUNTYFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"001\"]},{\"attribute\":\"FUNCSTAT10\",\"count\":1,\"type\":\"string\",\"values\":[\"S\"]},{\"attribute\":\"GEOID10\",\"count\":260,\"type\":\"string\",\"values\":[\"060014201001000\",\"060014201001001\",\"060014201001002\",\"060014201001003\",\"060014201001004\",\"060014201001005\",\"060014201001006\",\"060014201001007\",\"060014201001008\",\"060014201001009\",\"060014201001010\",\"060014201001011\",\"060014201001012\",\"060014201001013\",\"060014201001014\",\"060014201001015\",\"060014201001016\",\"060014201001017\",\"060014201001018\",\"060014201001019\",\"060014201002000\",\"060014201002001\",\"060014201002002\",\"060014201002003\",\"060014201002004\",\"060014201002005\",\"060014201002006\",\"060014201002007\",\"060014201002008\",\"060014201002009\",\"060014201002010\",\"060014201002011\",\"060014201002012\",\"060014201002013\",\"060014201002014\",\"060014201002015\",\"060014201003000\",\"060014201003001\",\"060014201003002\",\"060014201003003\",\"060014201003004\",\"060014201003005\",\"060014201003006\",\"060014201003007\",\"060014201003008\",\"060014202001000\",\"060014202001001\",\"060014202001002\",\"060014202001003\",\"060014202001004\",\"060014202001005\",\"060014202001006\",\"060014202001007\",\"060014202001008\",\"060014202001009\",\"060014202001010\",\"060014202001011\",\"060014202001012\",\"060014202001013\",\"060014202001014\",\"060014202002000\",\"060014202002001\",\"060014202002002\",\"060014202002003\",\"060014202002004\",\"060014202002005\",\"060014202002006\",\"060014202002007\",\"060014202002008\",\"060014202002009\",\"060014202002010\",\"060014202002011\",\"060014202002012\",\"060014202003000\",\"060014202003001\",\"060014202003002\",\"060014202003003\",\"060014202003004\",\"060014202003005\",\"060014202003006\",\"060014202003007\",\"060014202003008\",\"060014202003009\",\"060014202003010\",\"060014202003011\",\"060014202003012\",\"060014203001000\",\"060014203001001\",\"060014203001002\",\"060014203001003\",\"060014203001004\",\"060014203001005\",\"060014203001006\",\"060014203001007\",\"060014203001008\",\"060014203001009\",\"060014203001010\",\"060014203001011\",\"060014203001012\",\"060014203001013\"]},{\"attribute\":\"INTPTLAT10\",\"count\":257,\"type\":\"string\",\"values\":[\"+37.882724\",\"+37.882857\",\"+37.882965\",\"+37.883224\",\"+37.883323\",\"+37.883462\",\"+37.883465\",\"+37.883481\",\"+37.883493\",\"+37.883527\",\"+37.883536\",\"+37.883579\",\"+37.883655\",\"+37.883693\",\"+37.883707\",\"+37.883745\",\"+37.883836\",\"+37.883871\",\"+37.883875\",\"+37.883931\",\"+37.883973\",\"+37.883995\",\"+37.884009\",\"+37.884079\",\"+37.884198\",\"+37.884202\",\"+37.884338\",\"+37.884369\",\"+37.884436\",\"+37.884677\",\"+37.884743\",\"+37.884747\",\"+37.884757\",\"+37.884896\",\"+37.884902\",\"+37.884919\",\"+37.884942\",\"+37.885307\",\"+37.885308\",\"+37.885399\",\"+37.885448\",\"+37.885491\",\"+37.885644\",\"+37.885646\",\"+37.885673\",\"+37.885811\",\"+37.885827\",\"+37.885997\",\"+37.886159\",\"+37.886194\",\"+37.886197\",\"+37.886237\",\"+37.886278\",\"+37.886322\",\"+37.886339\",\"+37.886439\",\"+37.886460\",\"+37.886495\",\"+37.886587\",\"+37.886596\",\"+37.886608\",\"+37.886758\",\"+37.886830\",\"+37.886929\",\"+37.887099\",\"+37.887163\",\"+37.887238\",\"+37.887267\",\"+37.887324\",\"+37.887379\",\"+37.887412\",\"+37.887570\",\"+37.887764\",\"+37.887776\",\"+37.887789\",\"+37.887852\",\"+37.887885\",\"+37.887916\",\"+37.887945\",\"+37.888027\",\"+37.888122\",\"+37.888238\",\"+37.888325\",\"+37.888332\",\"+37.888340\",\"+37.888416\",\"+37.888418\",\"+37.888441\",\"+37.888458\",\"+37.888506\",\"+37.888511\",\"+37.888540\",\"+37.888616\",\"+37.888634\",\"+37.888734\",\"+37.888782\",\"+37.888823\",\"+37.888848\",\"+37.888859\",\"+37.888863\"]},{\"attribute\":\"INTPTLON10\",\"count\":259,\"type\":\"string\",\"values\":[\"-122.282320\",\"-122.282371\",\"-122.282679\",\"-122.282689\",\"-122.282947\",\"-122.283067\",\"-122.283212\",\"-122.283424\",\"-122.283651\",\"-122.283723\",\"-122.283797\",\"-122.283828\",\"-122.283924\",\"-122.283973\",\"-122.284471\",\"-122.284571\",\"-122.284590\",\"-122.284831\",\"-122.285020\",\"-122.285076\",\"-122.285093\",\"-122.285175\",\"-122.285609\",\"-122.285651\",\"-122.285682\",\"-122.285901\",\"-122.285971\",\"-122.286179\",\"-122.286324\",\"-122.286349\",\"-122.286366\",\"-122.286615\",\"-122.286636\",\"-122.286818\",\"-122.286865\",\"-122.286913\",\"-122.287055\",\"-122.287082\",\"-122.287097\",\"-122.287125\",\"-122.287205\",\"-122.287275\",\"-122.287323\",\"-122.287379\",\"-122.287583\",\"-122.287591\",\"-122.287634\",\"-122.287747\",\"-122.287757\",\"-122.287836\",\"-122.287926\",\"-122.287969\",\"-122.288150\",\"-122.288221\",\"-122.288237\",\"-122.288313\",\"-122.288382\",\"-122.288473\",\"-122.288602\",\"-122.288628\",\"-122.288677\",\"-122.288696\",\"-122.288764\",\"-122.288787\",\"-122.288910\",\"-122.289020\",\"-122.289219\",\"-122.289471\",\"-122.289472\",\"-122.289530\",\"-122.289570\",\"-122.289573\",\"-122.289663\",\"-122.289764\",\"-122.289959\",\"-122.290117\",\"-122.290340\",\"-122.290441\",\"-122.290522\",\"-122.290573\",\"-122.290615\",\"-122.290964\",\"-122.290980\",\"-122.291137\",\"-122.291217\",\"-122.291315\",\"-122.291350\",\"-122.291391\",\"-122.291474\",\"-122.291484\",\"-122.291592\",\"-122.291817\",\"-122.291926\",\"-122.292014\",\"-122.292116\",\"-122.292153\",\"-122.292289\",\"-122.292309\",\"-122.292394\",\"-122.292415\"]},{\"attribute\":\"MTFCC10\",\"count\":1,\"type\":\"string\",\"values\":[\"G5040\"]},{\"attribute\":\"NAME10\",\"count\":82,\"type\":\"string\",\"values\":[\"Block 1000\",\"Block 1001\",\"Block 1002\",\"Block 1003\",\"Block 1004\",\"Block 1005\",\"Block 1006\",\"Block 1007\",\"Block 1008\",\"Block 1009\",\"Block 1010\",\"Block 1011\",\"Block 1012\",\"Block 1013\",\"Block 1014\",\"Block 1015\",\"Block 1016\",\"Block 1017\",\"Block 1018\",\"Block 1019\",\"Block 1020\",\"Block 1021\",\"Block 1022\",\"Block 1023\",\"Block 1024\",\"Block 1025\",\"Block 1026\",\"Block 1027\",\"Block 1028\",\"Block 1029\",\"Block 1030\",\"Block 1031\",\"Block 2000\",\"Block 2001\",\"Block 2002\",\"Block 2003\",\"Block 2004\",\"Block 2005\",\"Block 2006\",\"Block 2007\",\"Block 2008\",\"Block 2009\",\"Block 2010\",\"Block 2011\",\"Block 2012\",\"Block 2013\",\"Block 2014\",\"Block 2015\",\"Block 2016\",\"Block 2017\",\"Block 3000\",\"Block 3001\",\"Block 3002\",\"Block 3003\",\"Block 3004\",\"Block 3005\",\"Block 3006\",\"Block 3007\",\"Block 3008\",\"Block 3009\",\"Block 3010\",\"Block 3011\",\"Block 3012\",\"Block 3013\",\"Block 3014\",\"Block 3015\",\"Block 3016\",\"Block 3017\",\"Block 3018\",\"Block 3019\",\"Block 3020\",\"Block 3021\",\"Block 3022\",\"Block 3023\",\"Block 3024\",\"Block 3025\",\"Block 3026\",\"Block 3027\",\"Block 3028\",\"Block 3029\",\"Block 3030\",\"Block 3031\"]},{\"attribute\":\"STATEFP10\",\"count\":1,\"type\":\"string\",\"values\":[\"06\"]},{\"attribute\":\"TRACTCE10\",\"count\":6,\"type\":\"string\",\"values\":[\"420100\",\"420200\",\"420300\",\"420400\",\"420500\",\"420600\"]},{\"attribute\":\"UACE10\",\"count\":1,\"type\":\"string\",\"values\":[\"78904\"]},{\"attribute\":\"UATYP10\",\"count\":1,\"type\":\"string\",\"values\":[\"U\"]},{\"attribute\":\"UR10\",\"count\":2,\"type\":\"string\",\"values\":[\"R\",\"U\"]}]}]}}", "maxzoom": "12", -"minzoom": "0", +"minzoom": "3", "name": "tests/join-population/macarthur.mbtiles + tests/join-population/macarthur2.mbtiles + tests/join-population/tabblock_06001420.mbtiles", "strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]", "type": "overlay", diff --git a/tile-join.cpp b/tile-join.cpp index 93264d060..0a5102269 100644 --- a/tile-join.cpp +++ b/tile-join.cpp @@ -1574,6 +1574,11 @@ int main(int argc, char **argv) { } generator_options.append(commandline); + // don't trust the source metadata maxzooms; + // claim the zooms that were actually written + st.maxzoom = INT_MIN; + st.minzoom = INT_MAX; + for (auto &l : layermap) { if (l.second.minzoom < st.minzoom) { st.minzoom = l.second.minzoom; diff --git a/version.hpp b/version.hpp index 12ae56cd1..922d5ce74 100644 --- a/version.hpp +++ b/version.hpp @@ -1,6 +1,6 @@ #ifndef VERSION_HPP #define VERSION_HPP -#define VERSION "v2.35.0" +#define VERSION "v2.36.0" #endif