From 2c5618753018ca79c61c2d45995d28362e9f78a9 Mon Sep 17 00:00:00 2001 From: Erica Fischer Date: Tue, 7 Nov 2023 12:41:05 -1000 Subject: [PATCH] Make tile-join distrust source tilesets' metadata maxzoom and minzoom (#161) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Special-case a longitude wraparound of exactly 360° * Update version and changelog * Make tile-join distrust source tilesets' metadata maxzoom and minzoom --- CHANGELOG.md | 5 +++++ serial.cpp | 7 +++++-- tests/join-population/joined-i.mbtiles.json | 2 +- .../joined-no-tile-stats.mbtiles.json | 2 +- .../join-population/joined-null.mbtiles.json | 2 +- ...d-tile-stats-attributes-limit.mbtiles.json | 2 +- ...ile-stats-sample-values-limit.mbtiles.json | 2 +- ...oined-tile-stats-values-limit.mbtiles.json | 2 +- tests/join-population/joined.mbtiles.json | 2 +- .../just-macarthur.mbtiles.json | 6 +++--- .../merged-folder.mbtiles.json | 2 +- tests/join-population/merged.mbtiles.json | 2 +- .../join-population/no-macarthur.mbtiles.json | 2 +- tests/join-population/raw-merged-folder.json | 2 +- tests/wraparound2/in.json | 1 + .../-z0_--detect-longitude-wraparound.json | 20 +++++++++++++++++++ tile-join.cpp | 5 +++++ version.hpp | 2 +- 18 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 tests/wraparound2/in.json create mode 100644 tests/wraparound2/out/-z0_--detect-longitude-wraparound.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c60f171a..d7c08508e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.36.0 + +* Make tile-join distrust the source tilesets' metadata maxzoom and minzoom +* Add a special case in --detect-longitude-wraparound not to wrap around jumps of exactly 360° + # 2.35.0 * Fix a bug in --detect-longitude-wraparound when there are multiple rings diff --git a/serial.cpp b/serial.cpp index a40cc462d..b2a6bdcae 100644 --- a/serial.cpp +++ b/serial.cpp @@ -328,10 +328,13 @@ static long long scale_geometry(struct serialization_state *sst, long long *bbox if (geom[i].op == VT_LINETO) { x += offset; if (has_prev) { - if (x - prev > (1LL << 31)) { + // jumps at least 180° but not exactly 360°, + // which in some data sets is an intentional + // line across the world + if (x - prev > (1LL << 31) && x - prev != (1LL << 32)) { offset -= 1LL << 32; x -= 1LL << 32; - } else if (prev - x > (1LL << 31)) { + } else if (prev - x > (1LL << 31) && prev - x != (1LL << 32)) { offset += 1LL << 32; x += 1LL << 32; } 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/tests/wraparound2/in.json b/tests/wraparound2/in.json new file mode 100644 index 000000000..7e7da0f04 --- /dev/null +++ b/tests/wraparound2/in.json @@ -0,0 +1 @@ +{ "type": "Feature", "properties": { "LAYER": "plate", "Code": "NA", "PlateName": "North America" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -46.7658, 15.4506 ], [ -46.6476, 16.0187 ], [ -46.5287, 16.5868 ], [ -46.5887, 16.6067 ], [ -46.4982, 17.0865 ], [ -46.4072, 17.5663 ], [ -46.5202, 17.5883 ], [ -46.3907, 18.422 ], [ -46.3182, 18.4215 ], [ -46.2243, 18.9351 ], [ -46.1844, 18.9319 ], [ -46.0932, 19.3773 ], [ -46.0015, 19.8227 ], [ -45.9398, 19.8022 ], [ -45.7737, 20.618 ], [ -45.557, 20.5958 ], [ -45.4187, 21.2217 ], [ -45.5152, 21.2465 ], [ -45.3853, 21.8223 ], [ -45.2483, 21.8064 ], [ -45.1574, 22.3898 ], [ -45.0658, 22.9731 ], [ -45.0239, 22.9632 ], [ -44.9245, 23.6459 ], [ -45.6993, 23.7836 ], [ -46.4758, 23.9174 ], [ -46.1961, 24.5974 ], [ -46.1188, 24.5904 ], [ -45.7915, 25.2542 ], [ -45.4988, 25.1918 ], [ -45.296, 25.6367 ], [ -45.0917, 26.0814 ], [ -44.8989, 26.0554 ], [ -44.8163, 26.27 ], [ -44.8666, 26.2796 ], [ -44.687, 26.7668 ], [ -44.5059, 27.2538 ], [ -44.3831, 27.2355 ], [ -44.2031, 27.6713 ], [ -44.0217, 28.1069 ], [ -43.9423, 28.1049 ], [ -43.5632, 28.8108 ], [ -43.4828, 28.8021 ], [ -43.0882, 29.4691 ], [ -43.0373, 29.4714 ], [ -42.7286, 30.0697 ], [ -42.1364, 29.9733 ], [ -41.7857, 30.6056 ], [ -41.4304, 31.237 ], [ -41.1836, 31.1941 ], [ -40.71, 31.8173 ], [ -40.5526, 31.8025 ], [ -40.1293, 32.444 ], [ -39.6999, 33.0841 ], [ -39.586, 33.0673 ], [ -39.3993, 33.7676 ], [ -38.5972, 33.637 ], [ -37.7975, 33.5012 ], [ -37.6776, 33.7362 ], [ -37.5328, 33.7052 ], [ -37.3364, 34.1362 ], [ -37.2446, 34.1238 ], [ -37.0461, 34.5669 ], [ -36.8618, 34.5542 ], [ -36.7846, 34.7122 ], [ -36.6231, 34.6929 ], [ -36.3731, 35.2798 ], [ -35.5584, 35.1477 ], [ -34.7464, 35.0102 ], [ -34.4595, 35.6246 ], [ -34.3354, 35.616 ], [ -34.1424, 36.0794 ], [ -34.0568, 36.0713 ], [ -33.9816, 36.2212 ], [ -33.7717, 36.185 ], [ -33.5947, 36.7422 ], [ -33.3135, 36.691 ], [ -33.2246, 36.9408 ], [ -33.0049, 36.9159 ], [ -32.9431, 37.0654 ], [ -32.7077, 37.0333 ], [ -32.6456, 37.1763 ], [ -32.3946, 37.1369 ], [ -32.2826, 37.3915 ], [ -31.5164, 37.2823 ], [ -31.3713, 37.7049 ], [ -31.0706, 37.6802 ], [ -30.6055, 38.4025 ], [ -30.4301, 38.3883 ], [ -30.1714, 38.888 ], [ -29.9091, 39.3871 ], [ -29.7698, 39.3996 ], [ -29.6089, 39.9928 ], [ -29.6127, 40.0328 ], [ -29.5802, 40.0788 ], [ -29.5881, 40.1065 ], [ -29.6565, 40.1068 ], [ -29.6398, 40.2082 ], [ -29.6313, 40.2851 ], [ -29.5984, 40.3835 ], [ -29.5695, 40.4695 ], [ -29.577, 40.5495 ], [ -29.5605, 40.5987 ], [ -29.346, 40.5699 ], [ -29.2999, 40.705 ], [ -29.2777, 40.871 ], [ -29.256, 40.9847 ], [ -29.242, 41.1261 ], [ -29.2286, 41.2153 ], [ -29.3223, 41.2467 ], [ -29.292, 41.3849 ], [ -29.2452, 41.52 ], [ -29.206, 41.6828 ], [ -29.2003, 41.7997 ], [ -29.1616, 41.9101 ], [ -29.2606, 41.9294 ], [ -29.242, 42.0831 ], [ -29.2449, 42.1754 ], [ -29.2233, 42.2368 ], [ -29.2226, 42.2891 ], [ -29.4347, 42.2905 ], [ -29.3918, 42.4133 ], [ -29.3696, 42.5271 ], [ -29.3394, 42.613 ], [ -29.3177, 42.6744 ], [ -29.3214, 42.7145 ], [ -29.3715, 42.724 ], [ -29.3492, 42.8378 ], [ -29.3268, 42.9515 ], [ -29.3175, 43.0284 ], [ -29.3168, 43.0807 ], [ -29.1736, 43.0796 ], [ -29.0914, 43.2082 ], [ -29.0079, 43.389 ], [ -28.9339, 43.4929 ], [ -28.8845, 43.6278 ], [ -28.8405, 43.6981 ], [ -28.7964, 43.7684 ], [ -28.5237, 43.768 ], [ -28.5131, 43.8448 ], [ -28.4809, 43.9305 ], [ -28.4827, 44.0229 ], [ -28.4549, 44.0963 ], [ -28.4364, 44.1453 ], [ -28.4349, 44.1976 ], [ -28.3666, 44.1843 ], [ -28.32, 44.3067 ], [ -28.2825, 44.4046 ], [ -28.2574, 44.518 ], [ -28.215, 44.6281 ], [ -28.1676, 44.7505 ], [ -28.1438, 44.8116 ], [ -28.1421, 44.8639 ], [ -28.1057, 44.9094 ], [ -28.1575, 44.9196 ], [ -28.1385, 44.9685 ], [ -28.1146, 45.0296 ], [ -28.1002, 45.0663 ], [ -28.0763, 45.1274 ], [ -27.9945, 45.0983 ], [ -27.9877, 45.1628 ], [ -27.9857, 45.2151 ], [ -27.979, 45.2796 ], [ -27.9721, 45.3441 ], [ -27.9374, 45.3373 ], [ -27.9354, 45.3896 ], [ -27.9382, 45.4296 ], [ -27.9236, 45.4663 ], [ -27.8714, 45.4561 ], [ -27.8616, 45.4805 ], [ -27.8644, 45.5206 ], [ -27.877, 45.5362 ], [ -27.8246, 45.5259 ], [ -27.7952, 45.5992 ], [ -27.7734, 45.7003 ], [ -27.7592, 45.8293 ], [ -27.7394, 45.8782 ], [ -27.6994, 45.8835 ], [ -27.6971, 45.9358 ], [ -27.6773, 45.9846 ], [ -27.602, 45.983 ], [ -27.5847, 46.0719 ], [ -27.5723, 46.1486 ], [ -27.5649, 46.2131 ], [ -27.512, 46.2027 ], [ -27.4893, 46.3037 ], [ -27.4868, 46.356 ], [ -27.4717, 46.485 ], [ -27.4463, 46.6383 ], [ -27.4437, 46.6906 ], [ -27.436, 46.7551 ], [ -27.3775, 46.7568 ], [ -27.3774, 46.8491 ], [ -27.3466, 46.9223 ], [ -27.3336, 46.999 ], [ -27.3819, 47.114 ], [ -27.4407, 47.2047 ], [ -27.4741, 47.264 ], [ -27.4612, 47.3406 ], [ -27.4585, 47.3929 ], [ -27.4636, 47.4731 ], [ -27.4429, 47.5219 ], [ -27.448, 47.602 ], [ -27.4635, 47.6578 ], [ -27.5644, 47.6508 ], [ -27.5905, 47.7746 ], [ -27.6218, 47.8861 ], [ -27.6351, 47.9942 ], [ -27.6536, 48.09 ], [ -27.7036, 48.205 ], [ -27.7118, 48.3252 ], [ -27.7306, 48.421 ], [ -27.7494, 48.5169 ], [ -27.7602, 48.5848 ], [ -27.8895, 48.6089 ], [ -28.0108, 48.605 ], [ -28.0353, 48.6885 ], [ -28.0868, 48.8034 ], [ -28.1622, 48.9093 ], [ -28.2058, 48.9962 ], [ -28.2631, 49.0987 ], [ -28.3174, 49.1611 ], [ -28.353, 49.2201 ], [ -28.4262, 49.2858 ], [ -28.4518, 49.3693 ], [ -28.4861, 49.4806 ], [ -28.5446, 49.583 ], [ -28.5619, 49.6386 ], [ -28.7183, 49.6528 ], [ -28.8181, 49.657 ], [ -28.8686, 49.7314 ], [ -28.8952, 49.8148 ], [ -28.96, 49.9047 ], [ -28.9868, 49.988 ], [ -28.9947, 50.0681 ], [ -29.0217, 50.1515 ], [ -29.1265, 50.1954 ], [ -29.1982, 50.2206 ], [ -29.3218, 50.3199 ], [ -29.4266, 50.4159 ], [ -29.5081, 50.4686 ], [ -29.5368, 50.4995 ], [ -29.6619, 50.5984 ], [ -29.768, 50.6941 ], [ -29.8309, 50.7435 ], [ -29.8746, 50.7897 ], [ -29.9085, 50.8605 ], [ -29.9425, 50.9313 ], [ -29.9815, 50.9898 ], [ -29.9765, 51.1067 ], [ -30.001, 51.2544 ], [ -29.9961, 51.4236 ], [ -30.001, 51.6205 ], [ -30.006, 51.7652 ], [ -30.011, 51.8575 ], [ -30.0361, 51.9528 ], [ -30.0262, 52.0297 ], [ -30.3764, 52.0568 ], [ -30.8074, 52.0945 ], [ -31.0579, 52.1048 ], [ -31.2684, 52.1089 ], [ -31.2527, 52.2628 ], [ -31.2651, 52.3427 ], [ -31.2573, 52.4197 ], [ -31.5817, 52.4649 ], [ -31.866, 52.5038 ], [ -32.0535, 52.516 ], [ -32.3589, 52.5564 ], [ -32.6486, 52.581 ], [ -32.857, 52.5946 ], [ -33.0204, 52.6151 ], [ -33.3354, 52.6281 ], [ -33.7119, 52.6477 ], [ -34.1745, 52.663 ], [ -34.5719, 52.6822 ], [ -34.9248, 52.708 ], [ -34.8837, 52.7036 ], [ -35.0107, 52.7044 ], [ -35.1376, 52.7051 ], [ -35.1561, 52.8611 ], [ -35.1613, 52.9901 ], [ -35.1837, 53.1336 ], [ -35.1828, 53.2105 ], [ -35.3248, 53.238 ], [ -35.2818, 53.3875 ], [ -35.2565, 53.4747 ], [ -35.2457, 53.5121 ], [ -35.4517, 53.5459 ], [ -35.395, 53.6684 ], [ -35.3272, 53.8282 ], [ -35.2698, 53.9507 ], [ -35.2012, 54.1105 ], [ -35.1469, 54.2204 ], [ -35.121, 54.3076 ], [ -35.3132, 54.3269 ], [ -35.4878, 54.3313 ], [ -35.4123, 54.5161 ], [ -35.3651, 54.6781 ], [ -35.289, 54.786 ], [ -35.2739, 54.9127 ], [ -35.212, 54.9707 ], [ -35.3386, 54.9959 ], [ -35.2508, 55.1412 ], [ -35.1732, 55.3259 ], [ -35.0804, 55.4835 ], [ -34.9717, 55.6909 ], [ -34.9006, 55.7738 ], [ -34.8774, 55.8485 ], [ -34.6376, 55.8119 ], [ -34.6203, 55.9386 ], [ -34.5583, 56.0608 ], [ -34.5104, 56.2101 ], [ -34.4927, 56.3368 ], [ -34.4604, 56.4363 ], [ -34.4402, 56.4985 ], [ -34.346, 56.502 ], [ -34.3214, 56.5766 ], [ -34.2474, 56.6592 ], [ -34.2185, 56.7462 ], [ -34.0724, 56.7388 ], [ -34.043, 56.7799 ], [ -34.0035, 56.8274 ], [ -33.9781, 56.9019 ], [ -33.7961, 56.8833 ], [ -33.6824, 56.8715 ], [ -33.5871, 56.8745 ], [ -33.5662, 57.001 ], [ -33.5354, 57.088 ], [ -33.509, 57.1625 ], [ -33.4966, 57.2643 ], [ -33.3773, 57.2647 ], [ -33.2031, 57.2849 ], [ -33.0703, 57.4512 ], [ -33.0104, 57.548 ], [ -32.9641, 57.6076 ], [ -32.9177, 57.6671 ], [ -32.8065, 57.6422 ], [ -32.7082, 57.7735 ], [ -32.6188, 57.88 ], [ -32.4918, 57.9566 ], [ -32.4724, 58.0062 ], [ -32.2805, 57.9979 ], [ -32.1225, 58.1484 ], [ -31.9835, 58.2492 ], [ -31.8723, 58.3402 ], [ -31.7996, 58.3967 ], [ -31.7451, 58.4683 ], [ -31.556, 58.4466 ], [ -31.4274, 58.5743 ], [ -31.3031, 58.6896 ], [ -31.178, 58.8048 ], [ -31.0392, 58.8923 ], [ -30.977, 58.9759 ], [ -30.7911, 58.9408 ], [ -30.6466, 59.0925 ], [ -30.4527, 59.2383 ], [ -30.3055, 59.3897 ], [ -30.163, 59.5286 ], [ -30.0429, 59.6182 ], [ -29.8495, 59.7508 ], [ -29.6362, 59.8678 ], [ -29.5075, 59.9692 ], [ -29.3717, 60.0827 ], [ -29.2245, 60.1678 ], [ -29.118, 60.2731 ], [ -29.0285, 60.3399 ], [ -28.9266, 60.3334 ], [ -28.8286, 60.4186 ], [ -28.6416, 60.5661 ], [ -28.4077, 60.7045 ], [ -28.1924, 60.8483 ], [ -28.0237, 60.9563 ], [ -27.8545, 61.0664 ], [ -27.5817, 61.2519 ], [ -27.3888, 61.3976 ], [ -27.2257, 61.532 ], [ -27.0316, 61.6654 ], [ -26.768, 61.8252 ], [ -26.5265, 61.9392 ], [ -26.3089, 62.105 ], [ -26.1072, 62.2373 ], [ -25.8748, 62.3751 ], [ -25.6435, 62.5031 ], [ -25.4487, 62.62 ], [ -25.3112, 62.6137 ], [ -25.1564, 62.71 ], [ -25.0351, 62.8003 ], [ -24.8881, 62.9238 ], [ -24.7207, 62.9922 ], [ -24.5193, 63.1102 ], [ -24.2547, 63.2297 ], [ -24.0095, 63.3551 ], [ -23.7405, 63.4737 ], [ -23.4873, 63.5682 ], [ -23.3303, 63.6508 ], [ -23.0586, 63.6498 ], [ -22.872, 63.7673 ], [ -22.5374, 63.8361 ], [ -22.0656, 63.9224 ], [ -21.2976, 64.0672 ], [ -20.7313, 64.0171 ], [ -20.0967, 63.9494 ], [ -19.2377, 63.8625 ], [ -19.0407, 63.9849 ], [ -18.6261, 64.1823 ], [ -17.8218, 64.4892 ], [ -17.3675, 64.7367 ], [ -17.141, 64.9952 ], [ -17.025, 65.3793 ], [ -16.8594, 65.6773 ], [ -16.6561, 65.9435 ], [ -16.5068, 66.203 ], [ -17.7178, 66.3645 ], [ -17.4735, 66.6852 ], [ -18.2473, 66.7807 ], [ -18.118, 66.9337 ], [ -19.0988, 67.0581 ], [ -18.7562, 67.4434 ], [ -18.4899, 67.7376 ], [ -18.2203, 68.0662 ], [ -17.8291, 68.3998 ], [ -17.3917, 68.6995 ], [ -17.1537, 68.8649 ], [ -16.4874, 68.8084 ], [ -16.2627, 69.0379 ], [ -16.0335, 69.2647 ], [ -15.7156, 69.5499 ], [ -15.4245, 69.8397 ], [ -15.0245, 70.1685 ], [ -14.7339, 70.3891 ], [ -14.4479, 70.3539 ], [ -14.2367, 70.5174 ], [ -14.0364, 70.7261 ], [ -13.8924, 70.8158 ], [ -13.3957, 70.7716 ], [ -12.9046, 70.6977 ], [ -12.2549, 70.563 ], [ -12.0094, 70.7065 ], [ -11.6689, 70.8763 ], [ -11.3563, 71.0519 ], [ -11.8649, 71.1472 ], [ -12.3591, 71.2522 ], [ -12.1057, 71.3958 ], [ -11.7138, 71.5878 ], [ -11.3695, 71.7744 ], [ -10.356, 71.6145 ], [ -9.39339, 71.4561 ], [ -7.94124, 71.2166 ], [ -7.37469, 71.1248 ], [ -6.89992, 71.2816 ], [ -6.33268, 71.3872 ], [ -5.91711, 71.4646 ], [ -5.69853, 71.5398 ], [ -5.15729, 71.431 ], [ -4.74125, 71.3332 ], [ -4.36039, 71.4324 ], [ -4.07245, 71.4905 ], [ -3.69231, 71.398 ], [ -2.93661, 71.5002 ], [ -2.39894, 71.5917 ], [ -1.74252, 71.6851 ], [ -0.975025, 71.8151 ], [ -0.392476, 71.9105 ], [ 0.0, 71.9712762 ], [ 0.281065, 72.0148 ], [ 0.900715, 72.1337 ], [ 1.99058, 72.3278 ], [ 2.78103, 72.4331 ], [ 3.60937, 72.5801 ], [ 4.2999, 72.697 ], [ 4.96961, 72.8205 ], [ 5.58598, 72.9243 ], [ 6.05514, 73.0188 ], [ 6.78173, 73.1448 ], [ 7.07072, 73.2035 ], [ 7.391, 73.2524 ], [ 7.79122, 73.3712 ], [ 8.15023, 73.4272 ], [ 8.38583, 73.4853 ], [ 8.65212, 73.5335 ], [ 8.83803, 73.6282 ], [ 8.95698, 73.7064 ], [ 9.03691, 73.7585 ], [ 9.13963, 73.882 ], [ 9.20295, 73.9795 ], [ 9.20769, 74.0964 ], [ 9.15258, 74.2327 ], [ 9.13259, 74.3772 ], [ 8.98399, 74.5426 ], [ 8.78099, 74.7631 ], [ 8.63037, 74.9462 ], [ 8.46028, 75.0755 ], [ 8.2122, 75.1882 ], [ 7.94643, 75.3817 ], [ 7.84163, 75.5273 ], [ 7.60333, 75.7289 ], [ 7.59292, 75.9807 ], [ 7.51523, 76.1167 ], [ 7.48044, 76.279 ], [ 7.55713, 76.4307 ], [ 7.56302, 76.6015 ], [ 7.61545, 76.7985 ], [ 7.62226, 76.9692 ], [ 7.67201, 77.1484 ], [ 7.809, 77.4791 ], [ 7.88003, 77.7119 ], [ 7.77119, 77.9112 ], [ 7.82691, 78.0903 ], [ 7.78484, 78.2347 ], [ 6.77554, 78.4438 ], [ 5.59209, 78.641 ], [ 4.69068, 78.8058 ], [ 3.85706, 78.95 ], [ 3.43173, 79.0302 ], [ 3.90068, 79.228 ], [ 4.39026, 79.5327 ], [ 3.29588, 79.6575 ], [ 2.37761, 79.7797 ], [ 1.4866, 79.9085 ], [ 0.627928, 80.0264 ], [ 0.0, 80.109085 ], [ -0.250723, 80.1421 ], [ -0.968769, 80.2132 ], [ -1.76559, 80.3085 ], [ -2.34079, 80.3704 ], [ -1.68388, 80.6248 ], [ -2.94156, 80.7555 ], [ -3.36375, 80.7922 ], [ -2.77949, 80.9929 ], [ -2.41413, 81.1256 ], [ -3.45411, 81.2505 ], [ -4.64116, 81.3697 ], [ -4.15208, 81.5521 ], [ -3.90911, 81.6203 ], [ -5.03297, 81.9128 ], [ -4.53664, 82.0501 ], [ -3.79607, 82.2903 ], [ -3.69993, 82.3281 ], [ -5.00975, 82.5194 ], [ -5.86541, 82.6912 ], [ -7.2124, 82.8685 ], [ -6.2343, 83.0004 ], [ -5.15419, 83.2491 ], [ -4.14804, 83.4296 ], [ -3.20433, 83.5703 ], [ -2.36257, 83.6896 ], [ -1.20617, 83.8642 ], [ -0.469122, 83.9965 ], [ 0.0, 84.0529591 ], [ 0.404991, 84.1017 ], [ 1.30114, 84.2233 ], [ 2.23513, 84.3435 ], [ 3.02402, 84.4618 ], [ 3.84819, 84.5611 ], [ 4.03467, 84.5969 ], [ 4.50755, 84.5702 ], [ 5.1775, 84.6321 ], [ 6.6654, 84.7622 ], [ 8.13393, 84.8982 ], [ 8.93766, 85.0094 ], [ 9.8085, 84.9579 ], [ 10.6588, 85.067 ], [ 11.7036, 85.1373 ], [ 13.242, 85.2814 ], [ 14.6662, 85.3797 ], [ 16.0626, 85.4855 ], [ 17.89, 85.5912 ], [ 19.2845, 85.6842 ], [ 21.3426, 85.7987 ], [ 23.347, 85.8174 ], [ 25.3828, 85.8591 ], [ 27.4273, 85.8674 ], [ 28.1433, 85.8745 ], [ 29.2294, 85.8101 ], [ 30.9721, 85.9083 ], [ 33.34, 86.0534 ], [ 35.6067, 86.1607 ], [ 38.3013, 86.2915 ], [ 41.7555, 86.4316 ], [ 43.4795, 86.4958 ], [ 46.3137, 86.5612 ], [ 46.0625, 86.5982 ], [ 47.5235, 86.6406 ], [ 50.7696, 86.706 ], [ 54.5614, 86.7459 ], [ 58.0178, 86.7875 ], [ 61.5056, 86.8049 ], [ 62.4625, 86.7548 ], [ 66.5438, 86.6549 ], [ 66.301, 86.6065 ], [ 69.7522, 86.4724 ], [ 68.2081, 86.3058 ], [ 70.9259, 86.2026 ], [ 72.9842, 86.1063 ], [ 75.0293, 85.9885 ], [ 76.326, 85.9167 ], [ 78.4034, 85.7682 ], [ 81.1027, 85.6388 ], [ 83.1425, 85.556 ], [ 84.8021, 85.4998 ], [ 86.8021, 85.4175 ], [ 88.4863, 85.3456 ], [ 89.9804, 85.2957 ], [ 92.3129, 85.2292 ], [ 94.1554, 85.1545 ], [ 95.8392, 85.1018 ], [ 97.2727, 85.0279 ], [ 98.5682, 84.9604 ], [ 99.4436, 84.9108 ], [ 102.918, 84.6639 ], [ 103.943, 84.5785 ], [ 105.302, 84.4855 ], [ 106.759, 84.3686 ], [ 107.709, 84.2946 ], [ 108.939, 84.1936 ], [ 109.727, 84.1097 ], [ 110.959, 83.9655 ], [ 111.974, 83.8238 ], [ 112.843, 83.6744 ], [ 113.723, 83.5124 ], [ 114.558, 83.3209 ], [ 115.258, 83.1508 ], [ 115.793, 83.0141 ], [ 116.582, 82.7402 ], [ 117.171, 82.5394 ], [ 117.755, 82.2981 ], [ 119.1, 82.0874 ], [ 119.984, 81.5953 ], [ 121.004, 81.1146 ], [ 121.898, 80.6434 ], [ 122.639, 80.2061 ], [ 123.408, 79.7593 ], [ 125.188, 78.9901 ], [ 125.679, 78.1326 ], [ 126.457, 77.6844 ], [ 127.181, 77.2341 ], [ 127.634, 76.6425 ], [ 128.05, 76.0501 ], [ 128.519, 75.4945 ], [ 128.955, 74.938 ], [ 129.595, 74.4788 ], [ 130.2, 74.0179 ], [ 131.263, 73.3715 ], [ 132.483, 72.6946 ], [ 133.267, 72.2815 ], [ 134.017, 71.8654 ], [ 134.854, 71.2683 ], [ 135.595, 70.6916 ], [ 135.962, 70.5295 ], [ 136.758, 69.9536 ], [ 137.368, 69.6349 ], [ 138.523, 69.0423 ], [ 138.963, 68.4765 ], [ 139.381, 67.9097 ], [ 140.33, 67.4472 ], [ 141.242, 66.9794 ], [ 142.503, 66.6537 ], [ 143.731, 66.3181 ], [ 144.344, 65.8035 ], [ 144.932, 65.2865 ], [ 146.595, 64.7332 ], [ 148.191, 64.1621 ], [ 149.721, 63.5742 ], [ 151.189, 62.9707 ], [ 152.596, 62.3526 ], [ 153.946, 61.7209 ], [ 155.337, 61.6067 ], [ 156.717, 61.4785 ], [ 158.045, 61.4068 ], [ 159.367, 61.3222 ], [ 160.363, 61.3128 ], [ 161.359, 61.2961 ], [ 162.353, 61.2721 ], [ 163.345, 61.2409 ], [ 165.013, 61.3376 ], [ 166.691, 61.4138 ], [ 167.696, 61.5055 ], [ 168.706, 61.5898 ], [ 169.722, 61.6666 ], [ 170.743, 61.7358 ], [ 169.865, 61.0172 ], [ 169.027, 60.2932 ], [ 167.623, 59.842 ], [ 166.258, 59.3762 ], [ 164.93, 58.8966 ], [ 164.518, 58.4869 ], [ 164.115, 58.076 ], [ 163.721, 57.6638 ], [ 163.336, 57.2505 ], [ 162.96, 56.836 ], [ 162.592, 56.4203 ], [ 163.34, 55.817 ], [ 164.066, 55.2092 ], [ 164.847, 54.957 ], [ 165.771, 54.5884 ], [ 166.407, 54.2367 ], [ 167.413, 53.906 ], [ 168.188, 53.5694 ], [ 168.836, 53.2079 ], [ 169.752, 52.8555 ], [ 170.7, 52.4979 ], [ 171.847, 52.0259 ], [ 172.964, 51.6839 ], [ 174.219, 51.403 ], [ 175.571, 51.1082 ], [ 176.72, 50.8959 ], [ 177.68, 50.6976 ], [ 178.498, 50.6189 ], [ 179.688, 50.5055 ], [ 180.0, 50.5029703 ], [ 180.0, 54.5901639 ], [ 180.0, 90.0 ], [ -180.0, 90.0 ], [ -180.0, 50.5029703 ], [ -178.48, 50.4903 ], [ -177.758, 50.4842 ], [ -177.088, 50.496 ], [ -176.223, 50.5883 ], [ -175.629, 50.7447 ], [ -174.907, 50.8258 ], [ -174.119, 50.8963 ], [ -173.328, 50.9636 ], [ -172.484, 51.0693 ], [ -171.634, 51.1706 ], [ -170.897, 51.3061 ], [ -170.159, 51.4395 ], [ -169.378, 51.6322 ], [ -168.972, 51.74 ], [ -167.99, 52.0007 ], [ -166.819, 52.2568 ], [ -166.108, 52.4527 ], [ -165.39, 52.6443 ], [ -164.665, 52.8183 ], [ -163.934, 52.9879 ], [ -163.177, 53.18 ], [ -162.413, 53.3672 ], [ -161.664, 53.4964 ], [ -160.91, 53.6209 ], [ -160.129, 53.7408 ], [ -159.344, 53.8555 ], [ -157.986, 54.1008 ], [ -157.067, 54.3175 ], [ -156.138, 54.5272 ], [ -155.239, 54.7845 ], [ -154.16, 55.239 ], [ -153.164, 55.6104 ], [ -152.227, 56.0583 ], [ -151.218, 56.3092 ], [ -150.547, 56.4994 ], [ -150.081, 56.6229 ], [ -149.22, 56.9251 ], [ -148.257, 57.3469 ], [ -147.449, 57.8319 ], [ -146.759, 58.3521 ], [ -146.264, 58.8138 ], [ -145.756, 59.2735 ], [ -144.977, 59.5759 ], [ -144.316, 59.9182 ], [ -143.332, 60.2057 ], [ -142.405, 60.465 ], [ -141.598, 60.4009 ], [ -141.074, 60.3099 ], [ -140.128, 60.3809 ], [ -139.396, 60.0897 ], [ -138.86, 59.7619 ], [ -138.353, 59.3357 ], [ -137.819, 58.9251 ], [ -137.107, 58.4379 ], [ -136.895, 58.0895 ], [ -136.522, 57.6342 ], [ -136.209, 57.1178 ], [ -135.903, 56.621 ], [ -135.429, 56.1024 ], [ -135.18, 55.8186 ], [ -134.669, 55.3165 ], [ -134.151, 54.8122 ], [ -133.84, 54.3774 ], [ -133.426, 53.9241 ], [ -133.093, 53.5217 ], [ -132.714, 53.127 ], [ -132.169, 52.6971 ], [ -131.592, 52.2591 ], [ -131.177, 51.8858 ], [ -130.85, 51.6121 ], [ -130.548, 51.3981 ], [ -130.212, 51.2777 ], [ -129.982, 51.1013 ], [ -129.738, 50.8359 ], [ -129.46, 50.6472 ], [ -129.01, 50.4787 ], [ -128.719, 50.3103 ], [ -128.414, 50.0856 ], [ -128.283, 49.8847 ], [ -128.029, 49.7814 ], [ -127.852, 49.4906 ], [ -127.818, 49.0802 ], [ -127.608, 48.8768 ], [ -127.378, 48.7502 ], [ -127.018, 48.5646 ], [ -126.733, 48.291 ], [ -126.486, 47.9956 ], [ -126.37, 47.748 ], [ -126.085, 47.3503 ], [ -125.998, 46.9697 ], [ -125.876, 46.6433 ], [ -125.773, 46.295 ], [ -125.655, 45.9461 ], [ -125.517, 45.4738 ], [ -125.435, 45.1036 ], [ -125.437, 44.8813 ], [ -125.434, 44.7254 ], [ -125.376, 44.6675 ], [ -125.372, 44.5227 ], [ -125.372, 44.3226 ], [ -125.362, 44.0663 ], [ -125.429, 44.0023 ], [ -125.45, 43.9254 ], [ -125.48, 43.7375 ], [ -125.474, 43.426 ], [ -125.394, 43.2671 ], [ -125.343, 43.1426 ], [ -125.289, 43.0514 ], [ -125.289, 42.8624 ], [ -125.268, 42.5614 ], [ -125.198, 42.4917 ], [ -125.209, 42.3588 ], [ -125.29, 42.2845 ], [ -125.331, 42.1419 ], [ -125.313, 41.9856 ], [ -125.281, 41.8176 ], [ -125.309, 41.6522 ], [ -125.182, 41.3801 ], [ -125.089, 41.1354 ], [ -124.933, 40.8839 ], [ -124.953, 40.6333 ], [ -124.742, 40.3134 ], [ -124.416, 40.3107 ], [ -124.163, 39.9142 ], [ -123.89, 39.4388 ], [ -123.597, 38.9971 ], [ -123.305, 38.5406 ], [ -122.696, 37.874 ], [ -122.38, 37.527 ], [ -122.005, 37.2048 ], [ -121.305, 36.6983 ], [ -120.897, 36.3377 ], [ -120.438, 35.9102 ], [ -119.936, 35.4502 ], [ -119.329, 34.9812 ], [ -118.912, 34.8373 ], [ -118.4, 34.658 ], [ -118.072, 34.5641 ], [ -117.746, 34.4412 ], [ -117.507, 34.3498 ], [ -117.159, 34.1811 ], [ -116.66, 34.0424 ], [ -116.209, 33.7711 ], [ -115.773, 33.4211 ], [ -115.596, 33.2366 ], [ -115.717, 33.1297 ], [ -115.594, 33.0402 ], [ -115.508, 32.9581 ], [ -115.581, 32.876 ], [ -115.412, 32.71 ], [ -115.212, 32.5118 ], [ -115.33, 32.4183 ], [ -115.085, 32.2359 ], [ -114.765, 31.9952 ], [ -114.522, 31.786 ], [ -114.332, 31.6016 ], [ -114.207, 31.4585 ], [ -114.118, 31.3557 ], [ -114.33, 31.1936 ], [ -114.439, 31.0972 ], [ -114.303, 30.9123 ], [ -114.129, 30.6797 ], [ -113.986, 30.5134 ], [ -113.807, 30.3135 ], [ -114.041, 30.1205 ], [ -113.909, 29.982 ], [ -113.758, 29.8344 ], [ -113.87, 29.7298 ], [ -113.969, 29.6458 ], [ -113.775, 29.4397 ], [ -113.521, 29.2054 ], [ -113.281, 29.0084 ], [ -113.339, 28.9498 ], [ -113.087, 28.7147 ], [ -112.812, 28.4987 ], [ -112.589, 28.3223 ], [ -112.321, 28.1249 ], [ -112.015, 27.906 ], [ -111.711, 27.6935 ], [ -111.506, 27.57 ], [ -111.382, 27.4969 ], [ -111.569, 27.2152 ], [ -111.373, 27.1053 ], [ -111.506, 26.9267 ], [ -111.228, 26.7234 ], [ -110.957, 26.535 ], [ -110.758, 26.4159 ], [ -110.68, 26.3605 ], [ -110.778, 26.2249 ], [ -110.572, 26.0661 ], [ -110.291, 25.8895 ], [ -110.024, 25.7063 ], [ -109.872, 25.6073 ], [ -109.806, 25.5567 ], [ -110.007, 25.3392 ], [ -109.788, 25.1797 ], [ -109.591, 25.0163 ], [ -109.35, 24.8568 ], [ -109.178, 24.7348 ], [ -109.062, 24.6582 ], [ -109.276, 24.396 ], [ -109.002, 24.1515 ], [ -108.806, 23.9844 ], [ -108.61, 23.8141 ], [ -108.439, 23.6743 ], [ -108.357, 23.6135 ], [ -108.651, 23.2413 ], [ -108.388, 23.0822 ], [ -108.01, 22.9857 ], [ -108.232, 22.7117 ], [ -108.273, 22.6134 ], [ -108.407, 22.4401 ], [ -108.527, 22.2769 ], [ -108.516, 22.2011 ], [ -108.589, 22.1024 ], [ -108.676, 21.9596 ], [ -108.582, 21.9047 ], [ -108.397, 21.8348 ], [ -108.114, 21.72 ], [ -107.928, 21.6861 ], [ -107.774, 21.7397 ], [ -107.586, 21.7417 ], [ -107.393, 21.7478 ], [ -107.171, 21.7522 ], [ -107.046, 21.7536 ], [ -106.89, 21.7992 ], [ -106.862, 21.7156 ], [ -106.808, 21.6403 ], [ -106.757, 21.483 ], [ -106.624, 21.3106 ], [ -106.551, 21.2355 ], [ -106.525, 21.1838 ], [ -106.442, 21.1208 ], [ -106.381, 20.8397 ], [ -106.387, 20.6379 ], [ -106.385, 20.4281 ], [ -106.352, 20.2027 ], [ -106.271, 19.9158 ], [ -106.121, 19.6437 ], [ -105.949, 19.4019 ], [ -105.739, 19.1644 ], [ -105.546, 18.9807 ], [ -105.247, 18.7619 ], [ -105.043, 18.6216 ], [ -104.725, 18.3684 ], [ -104.406, 18.209 ], [ -104.191, 18.1383 ], [ -103.792, 17.92 ], [ -103.2, 17.6155 ], [ -102.432, 17.2799 ], [ -101.703, 17.0256 ], [ -100.867, 16.6363 ], [ -100.336, 16.4424 ], [ -99.806, 16.298 ], [ -99.4347, 16.134 ], [ -99.0281, 15.9191 ], [ -98.5878, 15.7715 ], [ -98.1657, 15.6399 ], [ -97.6914, 15.508 ], [ -97.2174, 15.3584 ], [ -96.727, 15.3601 ], [ -96.219, 15.3609 ], [ -95.7986, 15.2765 ], [ -95.4663, 15.0902 ], [ -95.117, 14.8866 ], [ -94.8729, 14.6998 ], [ -94.5422, 14.4786 ], [ -94.0552, 14.2221 ], [ -93.6558, 14.0161 ], [ -93.3094, 13.7932 ], [ -92.9619, 13.7221 ], [ -92.5992, 13.498 ], [ -92.2724, 13.2233 ], [ -92.0632, 13.2712 ], [ -91.7186, 13.0801 ], [ -91.3079, 12.8322 ], [ -90.898, 12.5837 ], [ -90.8103, 13.3941 ], [ -90.426, 13.9172 ], [ -90.0373, 14.3923 ], [ -89.718, 14.8151 ], [ -89.3716, 15.215 ], [ -88.8764, 15.6222 ], [ -88.351, 15.9583 ], [ -87.7228, 16.2506 ], [ -86.9661, 16.4759 ], [ -86.3195, 16.6945 ], [ -85.6714, 16.911 ], [ -84.9097, 17.1066 ], [ -84.2479, 17.344 ], [ -83.7058, 17.4809 ], [ -82.8646, 17.6257 ], [ -82.2442, 17.6907 ], [ -81.6248, 17.8016 ], [ -81.6893, 18.3332 ], [ -81.7541, 18.8647 ], [ -81.2563, 18.9598 ], [ -80.7579, 19.0536 ], [ -80.2095, 19.1597 ], [ -79.6604, 19.2642 ], [ -79.011, 19.3815 ], [ -78.3607, 19.4965 ], [ -77.6726, 19.6228 ], [ -76.9834, 19.7465 ], [ -76.3564, 19.8453 ], [ -75.7287, 19.9419 ], [ -75.2388, 19.9902 ], [ -74.7486, 20.0372 ], [ -73.9942, 20.1659 ], [ -73.2385, 20.2913 ], [ -72.3322, 20.331 ], [ -71.8044, 20.2665 ], [ -71.2771, 20.2005 ], [ -70.6265, 20.0022 ], [ -69.9775, 19.8015 ], [ -69.4148, 19.6961 ], [ -68.8528, 19.589 ], [ -68.0218, 19.687 ], [ -67.5313, 19.7213 ], [ -67.0405, 19.7543 ], [ -66.2594, 19.8246 ], [ -65.694, 19.8288 ], [ -65.1285, 19.8329 ], [ -64.3436, 19.7794 ], [ -63.7601, 19.7242 ], [ -63.3598, 19.6915 ], [ -62.8467, 19.5743 ], [ -62.1765, 19.2752 ], [ -61.5534, 18.9589 ], [ -60.7526, 19.2082 ], [ -59.9491, 19.4547 ], [ -59.1305, 19.3251 ], [ -58.309, 19.1922 ], [ -57.4928, 19.052 ], [ -56.8045, 18.6941 ], [ -56.1185, 18.2576 ], [ -55.4838, 17.7843 ], [ -54.8525, 17.309 ], [ -54.1555, 17.1359 ], [ -53.4599, 16.9565 ], [ -52.8812, 16.7607 ], [ -52.3037, 16.567 ], [ -51.661, 16.321 ], [ -51.0241, 16.0729 ], [ -50.4668, 15.8704 ], [ -49.8027, 15.983 ], [ -49.2071, 16.0346 ], [ -48.5146, 16.0126 ], [ -47.693, 15.9566 ], [ -47.3984, 15.8043 ], [ -46.7658, 15.4506 ] ] ] } } diff --git a/tests/wraparound2/out/-z0_--detect-longitude-wraparound.json b/tests/wraparound2/out/-z0_--detect-longitude-wraparound.json new file mode 100644 index 000000000..23954df24 --- /dev/null +++ b/tests/wraparound2/out/-z0_--detect-longitude-wraparound.json @@ -0,0 +1,20 @@ +{ "type": "FeatureCollection", "properties": { +"antimeridian_adjusted_bounds": "-180.000000,12.583700,179.688000,85.027900", +"bounds": "-180.000000,12.583700,180.000000,85.051129", +"center": "0.000000,12.583700,0", +"description": "tests/wraparound2/out/-z0_--detect-longitude-wraparound.json.check.mbtiles", +"format": "pbf", +"generator_options": "./tippecanoe -q -a@ -f -o tests/wraparound2/out/-z0_--detect-longitude-wraparound.json.check.mbtiles -z0 --detect-longitude-wraparound tests/wraparound2/in.json", +"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{\"Code\":\"String\",\"LAYER\":\"String\",\"PlateName\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":1,\"geometry\":\"Polygon\",\"attributeCount\":3,\"attributes\":[{\"attribute\":\"Code\",\"count\":1,\"type\":\"string\",\"values\":[\"NA\"]},{\"attribute\":\"LAYER\",\"count\":1,\"type\":\"string\",\"values\":[\"plate\"]},{\"attribute\":\"PlateName\",\"count\":1,\"type\":\"string\",\"values\":[\"North America\"]}]}]}}", +"maxzoom": "0", +"minzoom": "0", +"name": "tests/wraparound2/out/-z0_--detect-longitude-wraparound.json.check.mbtiles", +"type": "overlay", +"version": "2" +}, "features": [ +{ "type": "FeatureCollection", "properties": { "zoom": 0, "x": 0, "y": 0 }, "features": [ +{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [ +{ "type": "Feature", "properties": { "LAYER": "plate", "Code": "NA", "PlateName": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -180.000000, 50.513427 ], [ -182.285156, 50.680797 ], [ -187.031250, 51.672555 ], [ -187.031250, 85.622069 ], [ -180.000000, 85.622069 ], [ 18.369141, 85.622069 ], [ 16.083984, 85.485813 ], [ 13.271484, 85.280690 ], [ 11.689453, 85.133834 ], [ 10.546875, 85.051129 ], [ 9.843750, 84.959305 ], [ 8.964844, 85.013073 ], [ 8.173828, 84.897147 ], [ 4.482422, 84.566386 ], [ 4.042969, 84.599575 ], [ 3.867188, 84.558057 ], [ 2.988281, 84.465595 ], [ 0.439453, 84.097922 ], [ -0.439453, 83.997669 ], [ -2.373047, 83.686615 ], [ -4.130859, 83.430278 ], [ -5.185547, 83.246770 ], [ -6.240234, 83.004844 ], [ -7.207031, 82.864308 ], [ -5.888672, 82.687480 ], [ -5.009766, 82.517749 ], [ -3.691406, 82.332382 ], [ -5.009766, 81.910828 ], [ -3.867188, 81.621352 ], [ -4.658203, 81.374479 ], [ -2.373047, 81.120388 ], [ -3.339844, 80.788795 ], [ -1.669922, 80.618424 ], [ -2.373047, 80.371707 ], [ -0.263672, 80.148684 ], [ 3.251953, 79.655668 ], [ 4.394531, 79.528647 ], [ 3.427734, 79.038437 ], [ 7.822266, 78.242436 ], [ 7.734375, 77.915669 ], [ 7.910156, 77.711590 ], [ 7.646484, 77.157163 ], [ 7.470703, 76.268695 ], [ 7.646484, 75.737303 ], [ 7.910156, 75.386696 ], [ 8.613281, 74.936567 ], [ 9.140625, 74.378513 ], [ 9.228516, 73.971078 ], [ 9.052734, 73.751205 ], [ 8.613281, 73.528399 ], [ 5.625000, 72.919635 ], [ 2.812500, 72.422268 ], [ -3.691406, 71.385142 ], [ -4.042969, 71.497037 ], [ -4.746094, 71.328950 ], [ -5.712891, 71.552741 ], [ -5.888672, 71.469124 ], [ -6.943359, 71.272595 ], [ -7.382812, 71.130988 ], [ -11.337891, 71.773941 ], [ -12.392578, 71.244356 ], [ -11.337891, 71.045529 ], [ -12.216797, 70.554179 ], [ -12.919922, 70.699951 ], [ -13.886719, 70.815812 ], [ -14.414062, 70.348318 ], [ -14.765625, 70.377854 ], [ -16.523438, 68.815927 ], [ -17.138672, 68.879358 ], [ -17.841797, 68.399180 ], [ -19.072266, 67.067433 ], [ -18.105469, 66.930060 ], [ -18.281250, 66.791909 ], [ -17.490234, 66.687784 ], [ -17.753906, 66.372755 ], [ -16.523438, 66.196009 ], [ -17.050781, 65.366837 ], [ -17.138672, 64.997939 ], [ -17.402344, 64.736641 ], [ -17.841797, 64.472794 ], [ -19.248047, 63.860036 ], [ -21.269531, 64.052978 ], [ -22.851562, 63.782486 ], [ -23.027344, 63.665760 ], [ -23.291016, 63.665760 ], [ -24.521484, 63.114638 ], [ -25.136719, 62.714462 ], [ -25.488281, 62.633770 ], [ -28.652344, 60.586967 ], [ -28.916016, 60.326948 ], [ -29.882812, 59.756395 ], [ -30.761719, 58.950008 ], [ -30.937500, 58.995311 ], [ -31.552734, 58.447733 ], [ -31.904297, 58.355630 ], [ -32.255859, 57.984808 ], [ -32.431641, 57.984808 ], [ -32.783203, 57.657158 ], [ -32.958984, 57.657158 ], [ -33.222656, 57.279043 ], [ -33.486328, 57.279043 ], [ -33.574219, 56.897004 ], [ -34.013672, 56.897004 ], [ -34.013672, 56.800878 ], [ -34.453125, 56.511018 ], [ -34.628906, 55.825973 ], [ -34.892578, 55.825973 ], [ -35.332031, 54.977614 ], [ -35.244141, 54.927142 ], [ -35.507812, 54.316523 ], [ -35.156250, 54.316523 ], [ -35.419922, 53.644638 ], [ -35.419922, 53.540307 ], [ -35.244141, 53.488046 ], [ -35.332031, 53.225768 ], [ -35.156250, 53.225768 ], [ -35.156250, 52.696361 ], [ -33.310547, 52.643063 ], [ -31.552734, 52.482780 ], [ -31.289062, 52.429222 ], [ -31.289062, 52.106505 ], [ -30.058594, 52.052490 ], [ -29.882812, 50.792047 ], [ -29.531250, 50.457504 ], [ -29.003906, 50.176898 ], [ -29.003906, 49.894634 ], [ -28.828125, 49.667628 ], [ -28.564453, 49.610710 ], [ -28.037109, 48.632909 ], [ -27.773438, 48.574790 ], [ -27.597656, 47.635784 ], [ -27.421875, 47.635784 ], [ -27.509766, 47.279229 ], [ -27.333984, 46.980252 ], [ -27.509766, 46.195042 ], [ -27.773438, 45.890008 ], [ -27.949219, 45.151053 ], [ -28.125000, 45.089036 ], [ -28.300781, 44.276671 ], [ -28.476562, 44.213710 ], [ -28.476562, 43.834527 ], [ -28.828125, 43.771094 ], [ -29.179688, 43.068888 ], [ -29.355469, 43.068888 ], [ -29.443359, 42.293564 ], [ -29.179688, 42.293564 ], [ -29.179688, 41.705729 ], [ -29.355469, 41.244772 ], [ -29.267578, 40.713956 ], [ -29.355469, 40.580585 ], [ -29.619141, 40.580585 ], [ -29.531250, 40.446947 ], [ -29.794922, 39.368279 ], [ -30.410156, 38.410558 ], [ -30.585938, 38.410558 ], [ -31.113281, 37.649034 ], [ -31.376953, 37.718590 ], [ -31.552734, 37.300275 ], [ -32.255859, 37.370157 ], [ -32.695312, 37.020098 ], [ -32.958984, 37.090240 ], [ -33.046875, 36.949892 ], [ -33.222656, 36.949892 ], [ -33.310547, 36.668419 ], [ -33.574219, 36.738884 ], [ -33.750000, 36.173357 ], [ -34.013672, 36.244273 ], [ -34.716797, 35.029996 ], [ -36.386719, 35.245619 ], [ -36.650391, 34.669359 ], [ -36.826172, 34.741612 ], [ -36.826172, 34.524661 ], [ -37.089844, 34.597042 ], [ -37.265625, 34.089061 ], [ -37.353516, 34.161818 ], [ -37.529297, 33.724340 ], [ -37.705078, 33.724340 ], [ -37.792969, 33.504759 ], [ -39.375000, 33.797409 ], [ -39.550781, 33.063924 ], [ -39.726562, 33.063924 ], [ -40.517578, 31.802893 ], [ -40.693359, 31.802893 ], [ -41.220703, 31.203405 ], [ -41.396484, 31.203405 ], [ -42.099609, 29.993002 ], [ -42.714844, 30.069094 ], [ -44.033203, 28.071980 ], [ -44.912109, 26.037042 ], [ -45.087891, 26.115986 ], [ -45.527344, 25.165173 ], [ -45.791016, 25.244696 ], [ -46.230469, 24.607069 ], [ -46.494141, 23.885838 ], [ -44.912109, 23.644524 ], [ -45.263672, 21.779905 ], [ -45.351562, 21.861499 ], [ -45.527344, 21.207459 ], [ -45.527344, 20.632784 ], [ -45.791016, 20.632784 ], [ -46.142578, 18.895893 ], [ -46.406250, 18.396230 ], [ -46.582031, 16.636192 ], [ -46.494141, 16.551962 ], [ -46.757812, 15.453680 ], [ -47.724609, 15.961329 ], [ -49.218750, 16.045813 ], [ -50.449219, 15.876809 ], [ -51.064453, 16.045813 ], [ -53.437500, 16.972741 ], [ -54.843750, 17.308688 ], [ -56.777344, 18.729502 ], [ -57.480469, 19.062118 ], [ -58.271484, 19.228177 ], [ -59.941406, 19.476950 ], [ -61.523438, 18.979026 ], [ -63.369141, 19.725342 ], [ -66.269531, 19.808054 ], [ -68.027344, 19.725342 ], [ -68.818359, 19.559790 ], [ -71.279297, 20.220966 ], [ -73.212891, 20.303418 ], [ -75.761719, 19.973349 ], [ -81.738281, 18.895893 ], [ -81.650391, 17.811456 ], [ -83.671875, 17.476432 ], [ -86.308594, 16.720385 ], [ -88.330078, 15.961329 ], [ -88.857422, 15.623037 ], [ -89.384766, 15.199386 ], [ -90.791016, 13.410994 ], [ -90.878906, 12.554564 ], [ -92.021484, 13.239945 ], [ -92.285156, 13.239945 ], [ -92.988281, 13.752725 ], [ -93.339844, 13.752725 ], [ -95.800781, 15.284185 ], [ -97.207031, 15.368950 ], [ -98.173828, 15.623037 ], [ -100.898438, 16.636192 ], [ -104.765625, 18.396230 ], [ -105.732422, 19.145168 ], [ -106.259766, 19.890723 ], [ -106.347656, 20.879343 ], [ -106.787109, 21.453069 ], [ -106.875000, 21.779905 ], [ -108.105469, 21.698265 ], [ -108.632812, 21.943046 ], [ -108.544922, 22.268764 ], [ -108.017578, 22.998852 ], [ -108.632812, 23.241346 ], [ -108.369141, 23.644524 ], [ -109.248047, 24.367114 ], [ -109.072266, 24.686952 ], [ -110.039062, 25.324167 ], [ -109.775391, 25.562265 ], [ -110.742188, 26.194877 ], [ -110.742188, 26.431228 ], [ -111.533203, 26.902477 ], [ -111.357422, 27.137368 ], [ -111.533203, 27.215556 ], [ -111.357422, 27.527758 ], [ -113.115234, 28.690588 ], [ -113.378906, 28.921631 ], [ -113.291016, 28.998532 ], [ -113.994141, 29.611670 ], [ -113.730469, 29.840644 ], [ -114.082031, 30.145127 ], [ -113.818359, 30.297018 ], [ -114.433594, 31.128199 ], [ -114.082031, 31.353637 ], [ -115.312500, 32.398516 ], [ -115.224609, 32.546813 ], [ -115.576172, 32.842674 ], [ -115.488281, 32.990236 ], [ -115.751953, 33.137551 ], [ -115.576172, 33.211116 ], [ -115.751953, 33.431441 ], [ -116.630859, 34.016242 ], [ -118.037109, 34.597042 ], [ -119.355469, 34.957995 ], [ -122.695312, 37.857507 ], [ -123.310547, 38.548165 ], [ -124.453125, 40.313043 ], [ -124.716797, 40.313043 ], [ -124.980469, 40.647304 ], [ -124.892578, 40.913513 ], [ -125.332031, 41.640078 ], [ -125.332031, 42.293564 ], [ -125.156250, 42.488302 ], [ -125.507812, 43.452919 ], [ -125.332031, 44.087585 ], [ -125.419922, 45.089036 ], [ -126.123047, 47.338823 ], [ -126.474609, 47.989922 ], [ -127.001953, 48.574790 ], [ -127.617188, 48.864715 ], [ -128.056641, 49.781264 ], [ -129.023438, 50.457504 ], [ -129.462891, 50.625073 ], [ -129.990234, 51.124213 ], [ -130.869141, 51.618017 ], [ -132.714844, 53.120405 ], [ -133.857422, 54.367759 ], [ -134.121094, 54.826008 ], [ -135.878906, 56.607885 ], [ -137.109375, 58.447733 ], [ -139.394531, 60.108670 ], [ -140.097656, 60.370429 ], [ -141.064453, 60.326948 ], [ -142.382812, 60.457218 ], [ -144.316406, 59.933000 ], [ -145.722656, 59.265881 ], [ -146.777344, 58.355630 ], [ -148.271484, 57.326521 ], [ -150.117188, 56.607885 ], [ -152.226562, 56.072035 ], [ -155.214844, 54.775346 ], [ -156.181641, 54.521081 ], [ -159.345703, 53.852527 ], [ -162.421875, 53.383328 ], [ -163.916016, 52.961875 ], [ -170.859375, 51.289406 ], [ -173.320312, 50.958427 ], [ -174.902344, 50.847573 ], [ -176.220703, 50.569283 ], [ -177.714844, 50.457504 ], [ -180.000000, 50.513427 ] ] ], [ [ [ 187.031250, 85.622069 ], [ 187.031250, 51.013755 ], [ 185.097656, 50.847573 ], [ 183.779297, 50.569283 ], [ 182.285156, 50.457504 ], [ 180.000000, 50.513427 ], [ 179.648438, 50.513427 ], [ 177.714844, 50.680797 ], [ 172.968750, 51.672555 ], [ 171.826172, 52.052490 ], [ 168.837891, 53.225768 ], [ 168.222656, 53.592505 ], [ 167.431641, 53.904338 ], [ 166.376953, 54.213861 ], [ 164.882812, 54.977614 ], [ 164.091797, 55.229023 ], [ 162.597656, 56.413901 ], [ 164.970703, 58.904646 ], [ 169.013672, 60.283408 ], [ 170.771484, 61.731526 ], [ 168.662109, 61.606396 ], [ 166.728516, 61.396719 ], [ 164.970703, 61.354614 ], [ 163.388672, 61.227957 ], [ 159.345703, 61.312452 ], [ 153.984375, 61.731526 ], [ 149.677734, 63.587675 ], [ 144.931641, 65.293468 ], [ 143.701172, 66.302205 ], [ 141.240234, 66.964476 ], [ 139.394531, 67.908619 ], [ 138.515625, 69.037142 ], [ 136.757812, 69.960439 ], [ 135.615234, 70.699951 ], [ 134.033203, 71.856229 ], [ 132.451172, 72.685765 ], [ 130.166016, 74.019543 ], [ 128.935547, 74.936567 ], [ 127.177734, 77.235074 ], [ 125.683594, 78.134493 ], [ 125.156250, 78.988187 ], [ 123.398438, 79.765560 ], [ 121.025391, 81.120388 ], [ 119.970703, 81.595699 ], [ 119.091797, 82.082145 ], [ 117.773438, 82.297121 ], [ 115.751953, 83.015539 ], [ 113.730469, 83.510236 ], [ 111.972656, 83.820492 ], [ 110.917969, 83.970034 ], [ 108.896484, 84.196507 ], [ 99.404297, 84.912758 ], [ 96.855469, 85.051129 ], [ 95.800781, 85.103920 ], [ 92.285156, 85.229801 ], [ 88.505859, 85.345325 ], [ 81.474609, 85.622069 ], [ 180.000000, 85.622069 ], [ 187.031250, 85.622069 ] ] ] ] } } +] } +] } +] } 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