diff options
author | Sebastian Leske <sebastian.leske@sleske.name> | 2017-05-19 17:31:27 +0200 |
---|---|---|
committer | Sebastian Leske <sebastian.leske@sleske.name> | 2017-05-24 18:35:27 +0200 |
commit | 2d207a46cca5142fecf74554293cd4bca2b07e8b (patch) | |
tree | 588386a27d243c2b2dfa6bd322067560f4644574 | |
parent | 05f76e72ebf5c404cc806830fb2ec1125887dc02 (diff) | |
download | navit-2d207a46cca5142fecf74554293cd4bca2b07e8b.tar.gz |
Fix:maptool:Update maptool help and manpage
-rw-r--r-- | man/maptool.1 | 28 | ||||
-rw-r--r-- | navit/maptool/maptool.c | 10 |
2 files changed, 27 insertions, 11 deletions
diff --git a/man/maptool.1 b/man/maptool.1 index 881910958..4112d0b15 100644 --- a/man/maptool.1 +++ b/man/maptool.1 @@ -20,7 +20,7 @@ maptool parses osm textfile and converts it to Navit binfile format \-h (\-\-help) display a short help message .TP -\-4 (\-\-md5) +\-5 (\-\-md5) set file where to write md5 sum .TP \-6 (\-\-64bit) @@ -35,25 +35,33 @@ dump coordinates after phase 1 \-d (\-\-db) <connect string> get osm data out of a postgresql database with osm simple scheme and given connect string .TP +\-D (\-\-dump) +dump map data to standard output in Navit textfile format +If this option is specified, the output file parameter must be omitted. +.TP \-e (\-\-end) <phase> end at specified phase .TP +\-E (\-\-experimental) +enable experimental features (if available) +.TP \-i (\-\-input-file) <file> specify the input file name (OSM), overrules default stdin .TP \-k (\-\-keep-tmpfiles) do not delete tmp files after processing. useful to reuse them .TP +\-M (\-\-o5m) +input data is in o5m format +.TP +\-n (\-\-ignore-unknown) +do not output ways and nodes with unknown type +.TP \-N (\-\-nodes-only) process only nodes .TP -\-o (\-\-coverage) -converts every street to street_coverage, resulting in a big fat black line. -You can overlay this map with another vector map or image map, and every street -you will still see is missing in the \-o map -.TP \-P (\-\-protobuf) -input file is protobuf +input data is in pbf (Protocol Buffer) format .TP \-r (\-\-rule-file) <file> read mapping rules from specified file @@ -65,6 +73,9 @@ start at specified phase limit memory to use for some large internal buffers, in bytes. Default is 1 GB. Smaller slices reduce peak memory usage, at the cost of increased processing time. .TP +\-t (\-\-timestamp) <y-m-dTh:m:s> +set zip timestamp +.TP \-w (\-\-dedupe-ways) ensure no duplicate ways or nodes. useful when using several input files .TP @@ -74,6 +85,9 @@ process only ways \-U (\-\-unknown-country) add objects with unknown country to index .TP +\-x (\-\-index-size) +set maximum country index size in bytes +.TP \-z (\-\-compression-level) <level> set the compression level .SH BUGS diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c index 7af55ce83..b90038bb0 100644 --- a/navit/maptool/maptool.c +++ b/navit/maptool/maptool.c @@ -285,19 +285,20 @@ usage(FILE *f) #ifdef HAVE_POSTGRESQL fprintf(f,"-d (--db) <conn. string> : get osm data out of a postgresql database with osm simple scheme and given connect string\n"); #endif + fprintf(f,"-D (--dump) : dump map data to standard output in Navit textfile format\n"); fprintf(f,"-e (--end) <phase> : end at specified phase\n"); fprintf(f,"-E (--experimental) : Enable experimental features (%s)\n", experimental_feature_description ? experimental_feature_description : "-not available in this version-"); fprintf(f,"-i (--input-file) <file> : specify the input file name (OSM), overrules default stdin\n"); fprintf(f,"-k (--keep-tmpfiles) : do not delete tmp files after processing. useful to reuse them\n"); - fprintf(f,"-M (--o5m) : input file os o5m\n"); + fprintf(f,"-M (--o5m) : input data is in o5m format\n"); + fprintf(f,"-n (--ignore-unknown) : do not output ways and nodes with unknown type\n"); fprintf(f,"-N (--nodes-only) : process only nodes\n"); - fprintf(f,"-o (--coverage) : map every street to item coverage\n"); - fprintf(f,"-P (--protobuf) : input file is protobuf\n"); + fprintf(f,"-P (--protobuf) : input data is in pbf (Protocol Buffer) format\n"); fprintf(f,"-r (--rule-file) <file> : read mapping rules from specified file\n"); fprintf(f,"-s (--start) <phase> : start at specified phase\n"); fprintf(f,"-S (--slice-size) <size> : limit memory to use for some large internal buffers, in bytes. Default is %dGB.\n", SLIZE_SIZE_DEFAULT_GB); - fprintf(f,"-t (--timestamp) y-m-dTh:m:s : Set zip timestamp\n"); + fprintf(f,"-t (--timestamp) <y-m-dTh:m:s> : Set zip timestamp\n"); fprintf(f,"-w (--dedupe-ways) : ensure no duplicate ways or nodes. useful when using several input files\n"); fprintf(f,"-W (--ways-only) : process only ways\n"); fprintf(f,"-U (--unknown-country) : add objects with unknown country to index\n"); @@ -309,6 +310,7 @@ usage(FILE *f) fprintf(f,"-m (--map) \n"); fprintf(f,"-O \n"); fprintf(f,"-p (--plugin) \n"); + fprintf(f,"-u (--url) \n"); exit(1); } |