Skip to content

Commit

Permalink
Merge pull request #744 from mapbox/track-flags
Browse files Browse the repository at this point in the history
Record the command line options in the tileset metadata
  • Loading branch information
e-n-f committed Apr 5, 2019
2 parents 945d804 + 382563a commit 18b6473
Show file tree
Hide file tree
Showing 152 changed files with 254 additions and 36 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,7 @@
## 1.34.0

* Record the command line options in the tileset metadata

## 1.33.0

* MultiLineStrings were previously ignored in Geobuf input
Expand Down
50 changes: 25 additions & 25 deletions Makefile

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions main.cpp
Expand Up @@ -1135,7 +1135,7 @@ void choose_first_zoom(long long *file_bbox, std::vector<struct reader> &readers
}
}

int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzoom, int basezoom, double basezoom_marker_width, sqlite3 *outdb, const char *outdir, std::set<std::string> *exclude, std::set<std::string> *include, int exclude_all, json_object *filter, double droprate, int buffer, const char *tmpdir, double gamma, int read_parallel, int forcetable, const char *attribution, bool uses_gamma, long long *file_bbox, const char *prefilter, const char *postfilter, const char *description, bool guess_maxzoom, std::map<std::string, int> const *attribute_types, const char *pgm, std::map<std::string, attribute_op> const *attribute_accum, std::map<std::string, std::string> const &attribute_descriptions) {
int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzoom, int basezoom, double basezoom_marker_width, sqlite3 *outdb, const char *outdir, std::set<std::string> *exclude, std::set<std::string> *include, int exclude_all, json_object *filter, double droprate, int buffer, const char *tmpdir, double gamma, int read_parallel, int forcetable, const char *attribution, bool uses_gamma, long long *file_bbox, const char *prefilter, const char *postfilter, const char *description, bool guess_maxzoom, std::map<std::string, int> const *attribute_types, const char *pgm, std::map<std::string, attribute_op> const *attribute_accum, std::map<std::string, std::string> const &attribute_descriptions, std::string const &commandline) {
int ret = EXIT_SUCCESS;

std::vector<struct reader> readers;
Expand Down Expand Up @@ -2329,7 +2329,7 @@ int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzo
ai->second.maxzoom = maxzoom;
}

mbtiles_write_metadata(outdb, outdir, fname, minzoom, maxzoom, minlat, minlon, maxlat, maxlon, midlat, midlon, forcetable, attribution, merged_lm, true, description, !prevent[P_TILE_STATS], attribute_descriptions, "tippecanoe");
mbtiles_write_metadata(outdb, outdir, fname, minzoom, maxzoom, minlat, minlon, maxlat, maxlon, midlat, midlon, forcetable, attribution, merged_lm, true, description, !prevent[P_TILE_STATS], attribute_descriptions, "tippecanoe", commandline);

return ret;
}
Expand Down Expand Up @@ -2670,6 +2670,8 @@ int main(int argc, char **argv) {
}
}

std::string commandline = format_commandline(argc, argv);

int option_index = 0;
while ((i = getopt_long(argc, argv, getopt_str, long_options, &option_index)) != -1) {
switch (i) {
Expand Down Expand Up @@ -3173,7 +3175,7 @@ int main(int argc, char **argv) {

long long file_bbox[4] = {UINT_MAX, UINT_MAX, 0, 0};

ret = read_input(sources, name ? name : out_mbtiles ? out_mbtiles : out_dir, maxzoom, minzoom, basezoom, basezoom_marker_width, outdb, out_dir, &exclude, &include, exclude_all, filter, droprate, buffer, tmpdir, gamma, read_parallel, forcetable, attribution, gamma != 0, file_bbox, prefilter, postfilter, description, guess_maxzoom, &attribute_types, argv[0], &attribute_accum, attribute_descriptions);
ret = read_input(sources, name ? name : out_mbtiles ? out_mbtiles : out_dir, maxzoom, minzoom, basezoom, basezoom_marker_width, outdb, out_dir, &exclude, &include, exclude_all, filter, droprate, buffer, tmpdir, gamma, read_parallel, forcetable, attribution, gamma != 0, file_bbox, prefilter, postfilter, description, guess_maxzoom, &attribute_types, argv[0], &attribute_accum, attribute_descriptions, commandline);

if (outdb != NULL) {
mbtiles_close(outdb, argv[0]);
Expand Down
13 changes: 11 additions & 2 deletions mbtiles.cpp
Expand Up @@ -270,7 +270,7 @@ void tilestats(std::map<std::string, layermap_entry> const &layermap1, size_t el
state.json_end_hash();
}

void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double midlat, double midlon, int forcetable, const char *attribution, std::map<std::string, layermap_entry> const &layermap, bool vector, const char *description, bool do_tilestats, std::map<std::string, std::string> const &attribute_descriptions, std::string const &program) {
void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double midlat, double midlon, int forcetable, const char *attribution, std::map<std::string, layermap_entry> const &layermap, bool vector, const char *description, bool do_tilestats, std::map<std::string, std::string> const &attribute_descriptions, std::string const &program, std::string const &commandline) {
char *sql, *err;

sqlite3 *db = outdb;
Expand Down Expand Up @@ -380,7 +380,16 @@ void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fnam
std::string version = program + " " + VERSION;
sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES ('generator', %Q);", version.c_str());
if (sqlite3_exec(db, sql, NULL, NULL, &err) != SQLITE_OK) {
fprintf(stderr, "set type: %s\n", err);
fprintf(stderr, "set version: %s\n", err);
if (!forcetable) {
exit(EXIT_FAILURE);
}
}
sqlite3_free(sql);

sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES ('generator_options', %Q);", commandline.c_str());
if (sqlite3_exec(db, sql, NULL, NULL, &err) != SQLITE_OK) {
fprintf(stderr, "set commandline: %s\n", err);
if (!forcetable) {
exit(EXIT_FAILURE);
}
Expand Down
2 changes: 1 addition & 1 deletion mbtiles.hpp
Expand Up @@ -45,7 +45,7 @@ sqlite3 *mbtiles_open(char *dbname, char **argv, int forcetable);

void mbtiles_write_tile(sqlite3 *outdb, int z, int tx, int ty, const char *data, int size);

void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double midlat, double midlon, int forcetable, const char *attribution, std::map<std::string, layermap_entry> const &layermap, bool vector, const char *description, bool do_tilestats, std::map<std::string, std::string> const &attribute_descriptions, std::string const &program);
void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double midlat, double midlon, int forcetable, const char *attribution, std::map<std::string, layermap_entry> const &layermap, bool vector, const char *description, bool do_tilestats, std::map<std::string, std::string> const &attribute_descriptions, std::string const &program, std::string const &commandline);

void mbtiles_close(sqlite3 *outdb, const char *pgm);

Expand Down
Expand Up @@ -3,6 +3,7 @@
"center": "112.500000,20.489949,3",
"description": "tests/accumulate/out/-z3_-Ethesum@sum_-Etheproduct@product_-Ethemax@max_-Ethemin@min_-Ethemean@mean_-Etheconcat@concat_-Ethecomma@comma_-r1_-K100.json.check.mbtiles",
"format": "pbf",
"generator_options": "./tippecanoe -q -a@ -f -o tests/accumulate/out/-z3_-Ethesum@sum_-Etheproduct@product_-Ethemax@max_-Ethemin@min_-Ethemean@mean_-Etheconcat@concat_-Ethecomma@comma_-r1_-K100.json.check.mbtiles -z3 -Ethesum:sum -Etheproduct:product -Ethemax:max -Ethemin:min -Ethemean:mean -Etheconcat:concat -Ethecomma:comma -r1 -K100 tests/accumulate/in.json",
"json": "{\"vector_layers\": [ { \"id\": \"in\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 3, \"fields\": {\"clustered\": \"Boolean\", \"point_count\": \"Number\", \"sqrt_point_count\": \"Number\", \"thecomma\": \"Mixed\", \"theconcat\": \"Mixed\", \"themax\": \"Number\", \"themean\": \"Number\", \"themin\": \"Number\", \"theproduct\": \"Number\", \"thesum\": \"Number\"} } ],\"tilestats\": {\"layerCount\": 1,\"layers\": [{\"layer\": \"in\",\"count\": 100,\"geometry\": \"Point\",\"attributeCount\": 10,\"attributes\": [{\"attribute\": \"clustered\",\"count\": 1,\"type\": \"boolean\",\"values\": [true]},{\"attribute\": \"point_count\",\"count\": 13,\"type\": \"number\",\"values\": [10,14,16,17,18,2,3,4,5,6,7,8,9],\"min\": 2,\"max\": 18},{\"attribute\": \"sqrt_point_count\",\"count\": 13,\"type\": \"number\",\"values\": [1.410000,1.730000,2.000000,2.240000,2.450000,2.650000,2.830000,3.000000,3.160000,3.740000,4.000000,4.120000,4.240000],\"min\": 1.41,\"max\": 4.24},{\"attribute\": \"thecomma\",\"count\": 159,\"type\": \"mixed\",\"values\": [1,\"1,31,70\",\"1,31,70,64,8,44,6\",10,\"10,35,79\",100,11,\"11,2,16,82,26,89,25,55,91\",12,13,14,15,16,17,\"17,62,69\",18,19,2,\"2,16\",\"2,16,82,26\",\"2,16,82,26,89,25\",20,21,\"21,13\",22,23,\"23,72,29,59\",24,25,26,27,28,\"28,67,74,65,5,12\",29,3,\"3,14\",\"3,14,78\",\"3,14,78,28,67,74,65,5,12,94,84,51,57,37\",30,31,\"31,70\",32,\"32,75\",33,\"33,17,62,69,81,7\",\"33,17,62,69,81,7,93,46,76,48,18,39,15,80,85,24\",34,35,\"35,79\",36,37,38,\"38,49\",\"38,49,43\",\"38,49,43,54,71,9,32,75\",39,4,40,41,42,\"42,100,66,22\",43,44,\"44,6\",45,46,\"46,76\",\"46,76,48,18,39\",\"46,76,48,18,39,15\",47,48,\"48,18,39\",49,5,50,51,52,\"52,61,36,87,96\",53,\"53,92\",54,\"54,71,9\",55,\"55,91\",56,57,\"57,37\",58,59,\"59,42,100,66,22,63,95,73,86,19\",6,60,61,\"61,36\",\"61,36,87,96\",62,63,\"63,95,73\",\"63,95,73,86,19\",64],\"min\": 1,\"max\": 100},{\"attribute\": \"theconcat\",\"count\": 159,\"type\": \"mixed\",\"values\": [1,10,100,\"103579\",11,\"11216822689255591\",12,13,\"13170\",\"13170648446\",14,15,16,17,\"176269\",18,19,2,20,21,\"2113\",\"216\",\"2168226\",\"21682268925\",22,23,\"23722959\",24,25,26,27,28,\"28677465512\",29,3,30,31,\"314\",\"31478\",\"31478286774655129484515737\",\"3170\",32,\"3275\",33,\"33176269817\",\"3317626981793467648183915808524\",34,35,\"3579\",36,37,38,\"3849\",\"384943\",\"384943547193275\",39,4,40,41,42,\"421006622\",43,44,\"446\",45,46,\"4676\",\"4676481839\",\"467648183915\",47,48,\"481839\",49,5,50,51,52,\"5261368796\",53,\"5392\",54,\"54719\",55,\"5591\",56,57,\"5737\",58,59,\"594210066226395738619\",6,60,61,\"6136\",\"61368796\",62,63,\"639573\",\"6395738619\",64],\"min\": 1,\"max\": 100},{\"attribute\": \"themax\",\"count\": 100,\"type\": \"number\",\"values\": [1,10,100,11,12,13,14,15,16,17,18,19,2,20,21,22,23,24,25,26,27,28,29,3,30,31,32,33,34,35,36,37,38,39,4,40,41,42,43,44,45,46,47,48,49,5,50,51,52,53,54,55,56,57,58,59,6,60,61,62,63,64,65,66,67,68,69,7,70,71,72,73,74,75,76,77,78,79,8,80,81,82,83,84,85,86,87,88,89,9,90,91,92,93,94,95,96,97,98,99],\"min\": 1,\"max\": 100},{\"attribute\": \"themean\",\"count\": 145,\"type\": \"number\",\"values\": [1,10,100,11,12,13,14,15,16,17,18,19,2,20,21,22,23,23.2,24,25,26,27,27.5,28,29,3,30,31,31.5,31.666666666666669,32,33,34,35,36,37,38,38.75,39,39.75,4,40,40.333333333333339,41,41.05882352941177,42,43,43.18181818181818,43.333333333333339,43.5,43.875,44,45,45.4,45.583333333333339,46,46.375,46.57142857142857,47,47.25,47.285714285714288,47.44444444444444,47.5,47.785714285714288,48,48.27272727272727,48.5,48.666666666666667,49,49.333333333333339,49.41935483870968,49.42857142857143,5,50,50.40506329113924,50.5,51,51.357142857142857,51.492063492063497,51.75,52,52.45,52.75,53,53.333333333333339,53.8,54,54.5,55,55.111111111111117,55.75,56,57,57.666666666666667,58,59,6,60,61,62],\"min\": 1,\"max\": 100},{\"attribute\": \"themin\",\"count\": 100,\"type\": \"number\",\"values\": [1,10,100,11,12,13,14,15,16,17,18,19,2,20,21,22,23,24,25,26,27,28,29,3,30,31,32,33,34,35,36,37,38,39,4,40,41,42,43,44,45,46,47,48,49,5,50,51,52,53,54,55,56,57,58,59,6,60,61,62,63,64,65,66,67,68,69,7,70,71,72,73,74,75,76,77,78,79,8,80,81,82,83,84,85,86,87,88,89,9,90,91,92,93,94,95,96,97,98,99],\"min\": 1,\"max\": 100},{\"attribute\": \"theproduct\",\"count\": 156,\"type\": \"number\",\"values\": [1,1.50635366827988e+21,10,100,11,117801216,12,123192,13,1360776186,14,1452,15,151798400,16,1611350,163200,1634,17,1767018240,18,18340992,1862,19,2,20,2040,21,2109,2170,2196,22,2294950,23,24,2400,2432430,25,256866214501512000,26,264,27,273,2765,27650,28,2833416,29,293314560,3,3.649478722049509e+25,3.663431746147758e+29,3.7235827383082715e+25,30,31,32,325,3276,33,33696,34,34506,3496,35,36,37,38,39,4,40,402696,41,42,43,436905,44,45,46,47,472972,48,4876,49,4958,5,50,5005,51,512,52,53,54,541413600,55,5589,56,567,57,58,59],\"min\": 1,\"max\": 3.663431746147758e+29},{\"attribute\": \"thesum\",\"count\": 143,\"type\": \"number\",\"values\": [1,10,100,101,102,105,107,109,11,114,12,122,124,126,13,130,134,14,141,145,146,148,15,150,16,160,17,18,183,189,19,2,20,207,21,211,22,223,224,227,229,23,230,231,24,240,242,25,251,26,261,269,27,28,280,29,3,30,31,32,323,33,332,336,34,35,36,37,371,38,39,397,4,40,41,42,43,44,45,46,47,48,49,5,50,51,52,53,54,55,56,57,58,59,6,60,61,62,625,63],\"min\": 1,\"max\": 960}]}]}}",
"maxzoom": "3",
"minzoom": "0",
Expand Down
Expand Up @@ -3,6 +3,7 @@
"center": "-174.375000,-52.349536,5",
"description": "tests/accumulate/out/-z5_-Ethesum@sum_-Etheproduct@product_-Ethemax@max_-Ethemin@min_-Ethemean@mean_-Etheconcat@concat_-Ethecomma@comma.json.check.mbtiles",
"format": "pbf",
"generator_options": "./tippecanoe -q -a@ -f -o tests/accumulate/out/-z5_-Ethesum@sum_-Etheproduct@product_-Ethemax@max_-Ethemin@min_-Ethemean@mean_-Etheconcat@concat_-Ethecomma@comma.json.check.mbtiles -z5 -Ethesum:sum -Etheproduct:product -Ethemax:max -Ethemin:min -Ethemean:mean -Etheconcat:concat -Ethecomma:comma tests/accumulate/in.json",
"json": "{\"vector_layers\": [ { \"id\": \"in\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 5, \"fields\": {\"thecomma\": \"Mixed\", \"theconcat\": \"Mixed\", \"themax\": \"Number\", \"themean\": \"Number\", \"themin\": \"Number\", \"theproduct\": \"Number\", \"thesum\": \"Number\"} } ],\"tilestats\": {\"layerCount\": 1,\"layers\": [{\"layer\": \"in\",\"count\": 100,\"geometry\": \"Point\",\"attributeCount\": 7,\"attributes\": [{\"attribute\": \"thecomma\",\"count\": 152,\"type\": \"mixed\",\"values\": [1,\"1,8,44,6\",10,100,11,12,13,14,15,16,\"16,82\",17,\"17,62\",18,\"18,39\",\"18,39,15\",19,2,\"2,16,82\",20,21,22,23,24,\"24,83\",25,26,\"26,89,25\",\"26,89,25,55,91,33,17,62,69,81,7,93,31\",27,28,29,3,\"3,14\",\"3,14,78,28\",\"3,14,78,28,67,74,65,5,12,94,84,51,57,37,97,53,92,99,90,21,13,38,49,43,54,71,9,32,75,23,72,29,59,42,100,66,22,63,95,73,86,19,11,2,16,82,26,89,25,55,91,33,17,62,69,81,7,93,46,76,48,18,39,15,80,85,24,83,10,35,79,1,31,70,64,8,44,6,52,61,36,87,96,58\",\"3,14,78,28,67,74,65,5,12,94,84,51,57,37,97,53,92,99,90,21,13,38,73,33\",30,31,32,33,34,35,\"35,79\",\"35,79,1,31,70,64,8,44,6,52,61,36,87,96,58\",36,37,38,\"38,49\",\"38,49,43,54,71,9,32\",39,4,40,41,42,43,\"43,54\",44,45,46,47,48,49,\"49,1,31,70,64,8,44,6\",\"49,72,86,46,76,48,18,39,15,80,85,24,83,10\",5,\"5,12\",50,51,52,53,54,55,\"55,91\",\"55,91,33\",56,57,\"57,37\",\"57,37,97\",58,59,6,60,61,\"61,36\",62,63,64,65,\"65,38,49,43,54,71,9,32,75,23,72,29,59,42,100,66,22,63,95,73,86,19,96\",66,\"66,22\",\"66,22,63,95,73,86,19\",67,\"67,38,11,2,16,82\",\"67,65\",\"67,74,65,5,12,94,84,51,38\",68,69,\"69,81\"],\"min\": 1,\"max\": 100},{\"attribute\": \"theconcat\",\"count\": 152,\"type\": \"mixed\",\"values\": [1,10,100,11,12,13,14,15,16,\"1682\",17,\"1762\",18,\"1839\",\"183915\",\"18446\",19,2,20,21,\"21682\",22,23,24,\"2483\",25,26,\"268925\",\"2689255591331762698179331\",27,28,29,3,30,31,\"314\",\"3147828\",\"31478286774655129484515737975392999021133849435471932752372295942100662263957386191121682268925559133176269817934676481839158085248310357913170648446526136879658\",\"3147828677465512948451573797539299902113387333\",32,33,34,35,\"3579\",\"357913170648446526136879658\",36,37,38,\"3849\",\"3849435471932\",39,4,40,41,42,43,\"4354\",44,45,46,47,48,49,\"4913170648446\",\"4972864676481839158085248310\",5,50,51,\"512\",52,53,54,55,\"5591\",\"559133\",56,57,\"5737\",\"573797\",58,59,6,60,61,\"6136\",62,63,64,65,\"6538494354719327523722959421006622639573861996\",66,\"6622\",\"66226395738619\",67,\"67381121682\",\"6765\",\"67746551294845138\",68,69,\"6981\"],\"min\": 1,\"max\": 100},{\"attribute\": \"themax\",\"count\": 100,\"type\": \"number\",\"values\": [1,10,100,11,12,13,14,15,16,17,18,19,2,20,21,22,23,24,25,26,27,28,29,3,30,31,32,33,34,35,36,37,38,39,4,40,41,42,43,44,45,46,47,48,49,5,50,51,52,53,54,55,56,57,58,59,6,60,61,62,63,64,65,66,67,68,69,7,70,71,72,73,74,75,76,77,78,79,8,80,81,82,83,84,85,86,87,88,89,9,90,91,92,93,94,95,96,97,98,99],\"min\": 1,\"max\": 100},{\"attribute\": \"themean\",\"count\": 135,\"type\": \"number\",\"values\": [1,10,100,11,12,13,14,14.75,15,16,17,18,19,2,20,21,22,23,24,25,26,27,28,28.5,29,3,30,30.75,31,32,33,33.333333333333339,34,34.125,35,36,37,37.333333333333339,38,39,39.5,39.875,4,40,41,41.75,42,42.285714285714288,42.8,43,43.5,44,45,46,47,47.333333333333339,48,48.27777777777778,48.5,49,5,50,50.5,50.773809523809529,50.857142857142857,51,52,52.214285714285718,53,53.25,53.5,54,54.44444444444444,55,55.69565217391305,55.75,56,56.2,57,58,59,59.333333333333339,59.666666666666667,6,60,60.4,60.57142857142857,61,62,63,63.666666666666667,64,64.66666666666667,65,66,67,68,69,69.33333333333333,7],\"min\": 1,\"max\": 100},{\"attribute\": \"themin\",\"count\": 100,\"type\": \"number\",\"values\": [1,10,100,11,12,13,14,15,16,17,18,19,2,20,21,22,23,24,25,26,27,28,29,3,30,31,32,33,34,35,36,37,38,39,4,40,41,42,43,44,45,46,47,48,49,5,50,51,52,53,54,55,56,57,58,59,6,60,61,62,63,64,65,66,67,68,69,7,70,71,72,73,74,75,76,77,78,79,8,80,81,82,83,84,85,86,87,88,89,9,90,91,92,93,94,95,96,97,98,99],\"min\": 1,\"max\": 100},{\"attribute\": \"theproduct\",\"count\": 150,\"type\": \"number\",\"values\": [1,1.1358965693283625e+21,1.5864380887725077e+38,1.6098219495357537e+132,10,100,1036586822040,10530,1054,11,119282,12,12157085491200,13,1312,1320551424,14,14372413440,1452,15,16,16336199880,165165,1693200,17,1725,18,1862,19,1992,2,20,20448,204573,2088,21,2109,2112,2196,22,23,2322,24,2432430,25,26,2624,27,2765,28,288600,29,295891195017600,3,30,300656,31,32,33,34,35,35840,36,3638439,37,38,39,39123,3982783094784,4,4.486244263022014e+22,40,402696,41,42,43,4355,44,45,46,47,48,49,5,5.103920456870841e+38,50,5005,51,517406400,52,53,54,55,5589,56,57,57850,58,59,6],\"min\": 1,\"max\": 1.6098219495357537e+132},{\"attribute\": \"thesum\",\"count\": 136,\"type\": \"number\",\"values\": [1,10,100,101,107,11,112,114,12,123,1278,1281,13,132,14,140,142,146,15,150,156,157,16,17,178,179,18,19,191,2,20,202,208,21,216,22,223,229,23,24,25,250,26,27,273,28,29,296,3,30,302,31,32,33,34,35,352,36,37,38,388,39,4,40,408,41,42,424,4265,43,44,45,46,462,47,48,49,490,5,50,51,52,53,54,55,56,57,58,59,6,60,61,62,63,64,65,66,67,679,68],\"min\": 1,\"max\": 4265}]}]}}",
"maxzoom": "5",
"minzoom": "0",
Expand Down
Expand Up @@ -3,6 +3,7 @@
"center": "0.000000,0.000000,0",
"description": "tests/attribute-type/out/-z0_-Tinttype@int_-Tfloattype@float_-Tbooltype@bool_-Tstringtype@string.json.check.mbtiles",
"format": "pbf",
"generator_options": "./tippecanoe -q -a@ -f -o tests/attribute-type/out/-z0_-Tinttype@int_-Tfloattype@float_-Tbooltype@bool_-Tstringtype@string.json.check.mbtiles -z0 -Tinttype:int -Tfloattype:float -Tbooltype:bool -Tstringtype:string tests/attribute-type/in.json",
"json": "{\"vector_layers\": [ { \"id\": \"in\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 0, \"fields\": {\"booltype\": \"Boolean\", \"expect\": \"Mixed\", \"floattype\": \"Number\", \"inttype\": \"Number\", \"stringtype\": \"String\"} } ],\"tilestats\": {\"layerCount\": 1,\"layers\": [{\"layer\": \"in\",\"count\": 39,\"geometry\": \"Point\",\"attributeCount\": 5,\"attributes\": [{\"attribute\": \"booltype\",\"count\": 2,\"type\": \"boolean\",\"values\": [false,true]},{\"attribute\": \"expect\",\"count\": 14,\"type\": \"mixed\",\"values\": [0,\"2\",\"2.5\",3,5,5.6,6,\"[2,3]\",\"false\",false,\"null\",\"something\",\"true\",true],\"min\": 0,\"max\": 6},{\"attribute\": \"floattype\",\"count\": 4,\"type\": \"number\",\"values\": [0,3,5,5.6],\"min\": 0,\"max\": 5.6},{\"attribute\": \"inttype\",\"count\": 5,\"type\": \"number\",\"values\": [0,0.000000,3.000000,5,6.000000],\"min\": 0,\"max\": 6},{\"attribute\": \"stringtype\",\"count\": 7,\"type\": \"string\",\"values\": [\"2\",\"2.5\",\"[2,3]\",\"false\",\"null\",\"something\",\"true\"]}]}]}}",
"maxzoom": "0",
"minzoom": "0",
Expand Down

0 comments on commit 18b6473

Please sign in to comment.