Fix:tools:Maptool command-line options clean-up. Ticket #760. Thanks sleske!

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4594 ffa7fe5e-494d-0410-b361-a75ebd5db220

2 files changed, 66 insertions, 32 deletions

diff --git a/man/maptool.1 b/man/maptool.1
index 417022a6..9d873b34 100644
--- a/man/maptool.1
+++ b/man/maptool.1
@@ -1,21 +1,34 @@
 .TH maptool 1  "$Date$" "$Revision$" "USER COMMANDS"
 .SH NAME
-maptool \- parse osm textfile and converts to NavIt binfile format
+maptool \- parse osm textfile and convert to Navit binfile format
 .SH SYNOPSIS
+.B For OSM XML data:
 .B bzcat planet.osm.bz2 | maptool mymap.bin
-[\-h] [\-N] [\-W] [\-a value] [\-c] [\-d connect string] [\-e phase]
-[\-k] [\-o] [\-s phase] [\-i input file] [\-w] [\-z level]
+[-h] [-2] [-5 <file>] [-6] [-a <level>] [-c] -[-d <connect string] 
+[-e <phase>] [-i <file>] [-k] [-M] [-N] [-o] [-r <file>] [-s <phase>]
+[-S <size>] [-w] [-W] [-U] [-z <level>]
+.B For OSM Protobuf/PBF data:
+.B maptool --protobuf -i planet.osm.pbf planet.bin
+[-h] [-2] [-5 <file>] [-6] [-a <level>] [-c] [-e <phase>] 
+[-i <file>] [-k] [-M] [-N] [-o] [-P] [-r <file>] [-s <phase>]
+[-S <size>] [-w] [-W] [-U] [-z <level>]
 .SH DESCRIPTION
-maptool parses osm textfile and converts to NavIt binfile format
+maptool parses osm textfile and converts it to Navit binfile format
 .SH OPTIONS
 .TP
 \-h (\-\-help)
 display a short help message
 .TP
+\-2 (\-\-dowai2poi)
+convert ways and polygons to POIs when applicable
+.TP
+\-4 (\-\-md5)
+set file where to write md5 sum
+.TP
 \-6 (-\-64bit)
 set zip 64 bit compression
 .TP
-\-a (\-\-attr-debug-level)
+\-a (\-\-attr-debug-level) <level>
 control which data is included in the debug attribute
 .TP
 \-c (\-\-dump-coordinates)
@@ -36,6 +49,17 @@ do not delete tmp files after processing. useful to reuse them
 \-N (\-\-nodes-only)
 process only nodes
 .TP
+\-o (\-\-coverage)
+converts every street to street_converage, 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
+.TP
+\-r (\-\-rule-file) <file>
+read mapping rules from specified file
+.TP
 \-s (\-\-start) <phase>
 start at specified phase
 .TP
@@ -48,6 +72,9 @@ ensure no duplicate ways or nodes. useful when using several input files
 \-W (\-\-ways-only)
 process only ways
 .TP
+\-U (\-\-unknown-country)
+add objects with unknown country to index
+.TP
 \-z (\-\-compression-level) <level>
 set the compression level
 .SH BUGS
diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c
index f918d173..a4204891 100644
--- a/navit/maptool/maptool.c
+++ b/navit/maptool/maptool.c
@@ -108,33 +108,41 @@ usage(FILE *f)
 {
 	/* DEVELOPPERS : don't forget to update the manpage if you modify theses options */
 	fprintf(f,"\n");
-	fprintf(f,"maptool - parse osm textfile and converts to Navit binfile format\n\n");
-	fprintf(f,"Usage :\n");
+	fprintf(f,"maptool - parse osm textfile and convert to Navit binfile format\n\n");
+	fprintf(f,"Usage (for OSM XML data):\n");
 	fprintf(f,"bzcat planet.osm.bz2 | maptool mymap.bin\n");
+    fprintf(f,"Usage (for OSM Protobuf/PBF data):\n");
+    fprintf(f,"maptool --protobuf -i planet.osm.pbf planet.bin\n");
 	fprintf(f,"Available switches:\n");
-	fprintf(f,"-h (--help)              : this screen\n");
-	fprintf(f,"-2 (--doway2poi)           : convert ways and polygons to POIs when applicable\n");
-	fprintf(f,"-5 (--md5)               : set file where to write md5 sum\n");
-	fprintf(f,"-6 (--64bit)             : set zip 64 bit compression\n");
-	fprintf(f,"-a (--attr-debug-level)  : control which data is included in the debug attribute\n");
-	fprintf(f,"-c (--dump-coordinates)  : dump coordinates after phase 1\n");
+	fprintf(f,"-h (--help)                       : this screen\n");
+	fprintf(f,"-2 (--doway2poi)                  : convert ways and polygons to POIs when applicable\n");
+	fprintf(f,"-5 (--md5) <file>                  : set file where to write md5 sum\n");
+	fprintf(f,"-6 (--64bit)                      : set zip 64 bit compression\n");
+	fprintf(f,"-a (--attr-debug-level)  <level>  : control which data is included in the debug attribute\n");
+	fprintf(f,"-c (--dump-coordinates)           : dump coordinates after phase 1\n");
 #ifdef HAVE_POSTGRESQL
-	fprintf(f,"-d (--db)                : get osm data out of a postgresql database with osm simple scheme and given connect string\n");
+	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,"-e (--end)               : end at specified phase\n");
-	fprintf(f,"-i (--input-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\n");
-	fprintf(f,"-M (--o5m)               : input file os o5m\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,"-r (--rule-file)         : read mapping rules from specified file\n");
-	fprintf(f,"-s (--start)             : start at specified phase\n");
-	fprintf(f,"-S (--slice-size)        : defines the amount of memory to use, in bytes. Default is 1GB\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,"-z (--compression-level) : set the compression level\n");
-	fprintf(f,"-U (--unknown-country)   : add objects with unknown country to index\n");
+	fprintf(f,"-e (--end) <phase>                : end at specified phase\n");
+	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\n");
+	fprintf(f,"-M (--o5m)                        : input file os o5m\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,"-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>          : defines the amount of memory to use, in bytes. Default is 1GB\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");
+    fprintf(f,"-z (--compression-level) <level>  : set the compression level\n");
+    fprintf(f,"Internal options (undocumented):\n");                                                                      
+    fprintf(f,"-b (--binfile)\n");                                                                                        
+    fprintf(f,"-B \n");                                                                                                   
+    fprintf(f,"-m (--map) \n");                                                                                           
+    fprintf(f,"-O \n");                                                                                                   
+    fprintf(f,"-p (--plugin) \n");                                                                                        
 	
 	exit(1);
 }
@@ -231,7 +239,7 @@ int main(int argc, char **argv)
 			{"unknown-country", 0, 0, 'U'},
 			{0, 0, 0, 0}
 		};
-		c = getopt_long (argc, argv, "25:6B:DMNO:PWS:a:bc"
+		c = getopt_long (argc, argv, "25:6B:DMNO:PS:Wa:bc"
 #ifdef HAVE_POSTGRESQL
 					      "d:"
 #endif
@@ -365,11 +373,10 @@ int main(int argc, char **argv)
 			compression_level=atoi(optarg);
 			break;
 #endif
-		case '?':
-			usage(stderr);
-			break;
+        case '?':
 		default:
 			fprintf(stderr,"c=%d\n", c);
+            usage(stderr);
 		}
 
 	}