From f4677d5de160ba6c7d02be55926dfe96554e3542 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 12 Apr 2017 10:16:43 -0700 Subject: [PATCH] Reorganize input and layer options --- README.md | 22 +++++++++++++--------- man/tippecanoe.1 | 33 +++++++++++++++++++-------------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 8d34a58..6d43444 100644 --- a/README.md +++ b/README.md @@ -71,15 +71,6 @@ If your features have a lot of attributes, use `-y` to keep only the ones you re If your input is formatted as newline-delimited GeoJSON, use `-P` to make input parsing a lot faster. -### Names of layers and tileset description and attribution - - * `-l` _name_ or `--layer=`_name_: Layer name (default "file" if source is file.json or output is file.mbtiles). If there are multiple input files - specified, the files are all merged into the single named layer, even if they try to specify individual names with `-L`. - * `-L` _name_`:`_file.json_ or `--named-layer=`_name_`:`_file.json_: Specify layer names for individual files. If your shell supports it, you can use a subshell redirect like `-L` _name_`:<(cat dir/*.json)` to specify a layer name for the output of streamed input. - * `-n` _name_ or `--name=`_name_: Human-readable name for the tileset (default file.json) - * `-A` _text_ or `--attribution=`_text_: Attribution (HTML) to be shown with maps that use data from this tileset. - * `-N` _description_ or `--description=`_description_: Description for the tileset (default file.mbtiles) - ### Output tileset * `-o` _file_`.mbtiles` or `--output=`_file_`.mbtiles`: Name the output file. @@ -88,6 +79,19 @@ If your input is formatted as newline-delimited GeoJSON, use `-P` to make input * `-F` or `--allow-existing`: Proceed (without deleting existing data) if the metadata or tiles table already exists or if metadata fields can't be set. You probably don't want to use this. +### Tileset description and attribution + + * `-n` _name_ or `--name=`_name_: Human-readable name for the tileset (default file.json) + * `-A` _text_ or `--attribution=`_text_: Attribution (HTML) to be shown with maps that use data from this tileset. + * `-N` _description_ or `--description=`_description_: Description for the tileset (default file.mbtiles) + +### Input files and layer names + + * _name_`.json` or _name_`.geojson`: Read the named GeoJSON input file into a layer called _name_. + * `-l` _name_ or `--layer=`_name_: Use the specified layer name instead of deriving a name from the input filename or output tileset. If there are multiple input files + specified, the files are all merged into the single named layer, even if they try to specify individual names with `-L`. + * `-L` _name_`:`_file.json_ or `--named-layer=`_name_`:`_file.json_: Specify layer names for individual files. If your shell supports it, you can use a subshell redirect like `-L` _name_`:<(cat dir/*.json)` to specify a layer name for the output of streamed input. + ### Parallel processing of input * `-P` or `--read-parallel`: Use multiple threads to read different parts of each input file at once. diff --git a/man/tippecanoe.1 b/man/tippecanoe.1 index 5f24eb7..6feb9fb 100644 --- a/man/tippecanoe.1 +++ b/man/tippecanoe.1 @@ -65,20 +65,6 @@ to drop some of them if necessary to make the low zoom levels work. If your features have a lot of attributes, use \fB\fC\-y\fR to keep only the ones you really need. .PP If your input is formatted as newline\-delimited GeoJSON, use \fB\fC\-P\fR to make input parsing a lot faster. -.SS Names of layers and tileset description and attribution -.RS -.IP \(bu 2 -\fB\fC\-l\fR \fIname\fP or \fB\fC\-\-layer=\fR\fIname\fP: Layer name (default "file" if source is file.json or output is file.mbtiles). If there are multiple input files -specified, the files are all merged into the single named layer, even if they try to specify individual names with \fB\fC\-L\fR\&. -.IP \(bu 2 -\fB\fC\-L\fR \fIname\fP\fB\fC:\fR\fIfile.json\fP or \fB\fC\-\-named\-layer=\fR\fIname\fP\fB\fC:\fR\fIfile.json\fP: Specify layer names for individual files. If your shell supports it, you can use a subshell redirect like \fB\fC\-L\fR \fIname\fP\fB\fC:<(cat dir/*.json)\fR to specify a layer name for the output of streamed input. -.IP \(bu 2 -\fB\fC\-n\fR \fIname\fP or \fB\fC\-\-name=\fR\fIname\fP: Human\-readable name for the tileset (default file.json) -.IP \(bu 2 -\fB\fC\-A\fR \fItext\fP or \fB\fC\-\-attribution=\fR\fItext\fP: Attribution (HTML) to be shown with maps that use data from this tileset. -.IP \(bu 2 -\fB\fC\-N\fR \fIdescription\fP or \fB\fC\-\-description=\fR\fIdescription\fP: Description for the tileset (default file.mbtiles) -.RE .SS Output tileset .RS .IP \(bu 2 @@ -91,6 +77,25 @@ specified, the files are all merged into the single named layer, even if they tr \fB\fC\-F\fR or \fB\fC\-\-allow\-existing\fR: Proceed (without deleting existing data) if the metadata or tiles table already exists or if metadata fields can't be set. You probably don't want to use this. .RE +.SS Tileset description and attribution +.RS +.IP \(bu 2 +\fB\fC\-n\fR \fIname\fP or \fB\fC\-\-name=\fR\fIname\fP: Human\-readable name for the tileset (default file.json) +.IP \(bu 2 +\fB\fC\-A\fR \fItext\fP or \fB\fC\-\-attribution=\fR\fItext\fP: Attribution (HTML) to be shown with maps that use data from this tileset. +.IP \(bu 2 +\fB\fC\-N\fR \fIdescription\fP or \fB\fC\-\-description=\fR\fIdescription\fP: Description for the tileset (default file.mbtiles) +.RE +.SS Input files and layer names +.RS +.IP \(bu 2 +\fIname\fP\fB\fC\&.json\fR or \fIname\fP\fB\fC\&.geojson\fR: Read the named GeoJSON input file into a layer called \fIname\fP\&. +.IP \(bu 2 +\fB\fC\-l\fR \fIname\fP or \fB\fC\-\-layer=\fR\fIname\fP: Use the specified layer name instead of deriving a name from the input filename or output tileset. If there are multiple input files +specified, the files are all merged into the single named layer, even if they try to specify individual names with \fB\fC\-L\fR\&. +.IP \(bu 2 +\fB\fC\-L\fR \fIname\fP\fB\fC:\fR\fIfile.json\fP or \fB\fC\-\-named\-layer=\fR\fIname\fP\fB\fC:\fR\fIfile.json\fP: Specify layer names for individual files. If your shell supports it, you can use a subshell redirect like \fB\fC\-L\fR \fIname\fP\fB\fC:<(cat dir/*.json)\fR to specify a layer name for the output of streamed input. +.RE .SS Parallel processing of input .RS .IP \(bu 2