Rename -k to -M before I regret that the unit for it is not kilobytes

This commit is contained in:
Eric Fischer 2016-11-04 11:15:53 -07:00
parent 700ca489c7
commit ee48be26e0
7 changed files with 14 additions and 13 deletions

View File

@ -91,7 +91,7 @@ Options
* -m _detail_ or --minimum-detail=_detail_: Minimum detail that it will try if tiles are too big at regular detail (default 7)
* -b _pixels_ or --buffer=_pixels_: Buffer size where features are duplicated from adjacent tiles. Units are "screen pixels"--1/256th of the tile width or height. (default 5)
* -s _projection_ or --projection=_projection_: Specify the projection of the input data. Currently supported are EPSG:4326 (WGS84, the default) and EPSG:3857 (Web Mercator).
* -k _bytes_ or --maximum-tile-bytes=_bytes_: Use the specified number of _bytes_ as the maximum compressed tile size instead of 500K.
* -M _bytes_ or --maximum-tile-bytes=_bytes_: Use the specified number of _bytes_ as the maximum compressed tile size instead of 500K.
All internal math is done in terms of a 32-bit tile coordinate system, so 1/(2^32) of the size of Earth,
or about 1cm, is the smallest distinguishable distance. If _maxzoom_ + _detail_ > 32, no additional

View File

@ -1895,7 +1895,7 @@ int main(int argc, char **argv) {
{"additional", required_argument, 0, 'a'},
{"projection", required_argument, 0, 's'},
{"simplification", required_argument, 0, 'S'},
{"maximum-tile-bytes", required_argument, 0, 'k'},
{"maximum-tile-bytes", required_argument, 0, 'M'},
{"exclude-all", no_argument, 0, 'X'},
{"force", no_argument, 0, 'f'},
@ -1948,7 +1948,7 @@ int main(int argc, char **argv) {
}
}
while ((i = getopt_long(argc, argv, "n:l:z:Z:B:d:D:m:o:x:y:r:b:t:g:p:a:XfFqvPL:A:s:S:k:", long_options, NULL)) != -1) {
while ((i = getopt_long(argc, argv, "n:l:z:Z:B:d:D:m:o:x:y:r:b:t:g:p:a:XfFqvPL:A:s:S:M:", long_options, NULL)) != -1) {
switch (i) {
case 0:
break;
@ -2127,12 +2127,13 @@ int main(int argc, char **argv) {
}
break;
case 'k':
case 'M':
max_tile_size = atoll(optarg);
break;
default: {
int width = 7 + strlen(argv[0]);
fprintf(stderr, "Unknown option -%c\n", i);
fprintf(stderr, "Usage: %s", argv[0]);
for (size_t lo = 0; long_options[lo].name != NULL; lo++) {
if (width + strlen(long_options[lo].name) + 9 >= 80) {

View File

@ -103,7 +103,7 @@ compensate for the larger marker, or \-Bf\fInumber\fP to allow at most \fInumber
.IP \(bu 2
\-s \fIprojection\fP or \-\-projection=\fIprojection\fP: Specify the projection of the input data. Currently supported are EPSG:4326 (WGS84, the default) and EPSG:3857 (Web Mercator).
.IP \(bu 2
\-k \fIbytes\fP or \-\-maximum\-tile\-bytes=\fIbytes\fP: Use the specified number of \fIbytes\fP as the maximum compressed tile size instead of 500K.
\-M \fIbytes\fP or \-\-maximum\-tile\-bytes=\fIbytes\fP: Use the specified number of \fIbytes\fP as the maximum compressed tile size instead of 500K.
.RE
.PP
All internal math is done in terms of a 32\-bit tile coordinate system, so 1/(2 of the size of Earth,

View File

@ -1,12 +1,12 @@
{ "type": "FeatureCollection", "properties": {
"bounds": "-122.538670,37.705764,-12.240000,37.836443",
"center": "-122.409668,37.770713,13",
"description": "tests/muni/out/-Z11_-z13_-k10000.json.check.mbtiles",
"description": "tests/muni/out/-Z11_-z13_-M10000.json.check.mbtiles",
"format": "pbf",
"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }",
"maxzoom": "13",
"minzoom": "11",
"name": "tests/muni/out/-Z11_-z13_-k10000.json.check.mbtiles",
"name": "tests/muni/out/-Z11_-z13_-M10000.json.check.mbtiles",
"type": "overlay",
"version": "2"
}, "features": [

View File

@ -1,12 +1,12 @@
{ "type": "FeatureCollection", "properties": {
"bounds": "-122.538670,37.705764,-12.240000,37.836443",
"center": "-122.409668,37.770713,13",
"description": "tests/muni/out/-Z11_-z13_-k10000_-aG.json.check.mbtiles",
"description": "tests/muni/out/-Z11_-z13_-M10000_-aG.json.check.mbtiles",
"format": "pbf",
"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }",
"maxzoom": "13",
"minzoom": "11",
"name": "tests/muni/out/-Z11_-z13_-k10000_-aG.json.check.mbtiles",
"name": "tests/muni/out/-Z11_-z13_-M10000_-aG.json.check.mbtiles",
"type": "overlay",
"version": "2"
}, "features": [

View File

@ -1,12 +1,12 @@
{ "type": "FeatureCollection", "properties": {
"bounds": "-122.538670,37.705764,-12.240000,37.836443",
"center": "-122.409668,37.770713,13",
"description": "tests/muni/out/-Z11_-z13_-k10000_-pd.json.check.mbtiles",
"description": "tests/muni/out/-Z11_-z13_-M10000_-pd.json.check.mbtiles",
"format": "pbf",
"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }",
"maxzoom": "13",
"minzoom": "11",
"name": "tests/muni/out/-Z11_-z13_-k10000_-pd.json.check.mbtiles",
"name": "tests/muni/out/-Z11_-z13_-M10000_-pd.json.check.mbtiles",
"type": "overlay",
"version": "2"
}, "features": [

View File

@ -1,12 +1,12 @@
{ "type": "FeatureCollection", "properties": {
"bounds": "-122.538670,37.705764,-12.240000,37.836443",
"center": "-122.497559,37.770713,13",
"description": "tests/muni/out/-Z11_-z13_-k5000_-as.json.check.mbtiles",
"description": "tests/muni/out/-Z11_-z13_-M5000_-as.json.check.mbtiles",
"format": "pbf",
"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }",
"maxzoom": "13",
"minzoom": "11",
"name": "tests/muni/out/-Z11_-z13_-k5000_-as.json.check.mbtiles",
"name": "tests/muni/out/-Z11_-z13_-M5000_-as.json.check.mbtiles",
"type": "overlay",
"version": "2"
}, "features": [