diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-11-09 06:49:19 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-11-09 06:49:19 +0000 |
| commit | a347baecbd22436441a911cd4a0be3796f59a38e (patch) | |
| tree | 63a688de46883cf016921023286693cbaf809c42 | |
| parent | f78eda00cab3a8de7c9301f8314d552d7f50482f (diff) | |
| download | navit-a347baecbd22436441a911cd4a0be3796f59a38e.tar.gz | |
Fix:maptool:Made compileable on wince, updated manpage
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2733 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | man/maptool.1 (renamed from man/osm2navit.1) | 11 | ||||
| -rw-r--r-- | navit/maptool/ch.c | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/man/osm2navit.1 b/man/maptool.1 index 2bb13c6f4..9f0392747 100644 --- a/man/osm2navit.1 +++ b/man/maptool.1 @@ -1,12 +1,12 @@ -.TH osm2navit 1 "August, 21 2008" "version 0.0.4+svn" "USER COMMANDS" +.TH maptool 1 "August, 21 2008" "version 0.0.4+svn" "USER COMMANDS" .SH NAME -osm2navit \- parse osm textfile and converts to NavIt binfile format +maptool \- parse osm textfile and converts to NavIt binfile format .SH SYNOPSIS -.B bzcat planet.osm.bz2 | osm2navit mymap.bin +.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] .SH DESCRIPTION -osm2navit parses osm textfile and converts to NavIt binfile format +maptool parses osm textfile and converts to NavIt binfile format .SH OPTIONS .TP \-h (\-\-help) @@ -33,9 +33,6 @@ end at specified phase \-k (\-\-keep-tmpfiles) do not delete tmp files after processing. useful to reuse them .TP -\-o (\-\-coverage) -map every street to item overage -.TP \-s (\-\-start) <phase> start at specified phase .TP diff --git a/navit/maptool/ch.c b/navit/maptool/ch.c index 31116c19e..21ef4fe22 100644 --- a/navit/maptool/ch.c +++ b/navit/maptool/ch.c @@ -202,6 +202,7 @@ ch_generate_ddsg(FILE *in, FILE *ref, FILE *idx, FILE *ddsg) static void ch_generate_sgr(char *suffix) { +#ifndef HAVE_API_WIN32_CE char command[1024]; sprintf(command,"./contraction-hierarchies-20080621/main -s -p -f ddsg_%s.tmp -o hcn_%s.tmp -l hcn_log_%s.tmp -x 190 -y 1 -e 600 -p 1000 -k 1,3.3,2,10,3,10,5",suffix,suffix,suffix); printf("%s\n",command); @@ -209,6 +210,7 @@ ch_generate_sgr(char *suffix) sprintf(command,"./contraction-hierarchies-20080621/main -c -f ddsg_%s.tmp -h hcn_%s.tmp -k 1,3.3,2,10,3,10,5 -C ch_%s.tmp -O 1 -z sgr_%s.tmp",suffix,suffix,suffix,suffix); printf("%s\n",command); system(command); +#endif } static void |