Merge branch 'master' into plugins

This commit is contained in:
Eric Fischer
2017-03-28 16:42:22 -07:00
17 changed files with 411 additions and 87 deletions
+1
View File
@@ -62,6 +62,7 @@ Options
* -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)
### File control