Fix:maptool:Made compileable on wince, updated manpage

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2733 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/man/maptool.1 b/man/maptool.1
new file mode 100644 (file)
index 0000000..9f03927
--- /dev/null
+++ b/man/maptool.1
@@ -0,0 +1,53 @@
+.TH maptool 1  "August, 21 2008" "version 0.0.4+svn" "USER COMMANDS"
+.SH NAME
+maptool \- parse osm textfile and converts to NavIt binfile format
+.SH SYNOPSIS
+.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
+maptool parses osm textfile and converts to NavIt binfile format
+.SH OPTIONS
+.TP
+\-h (\-\-help)
+display a short help message
+.TP
+\-N (\-\-nodes-only)
+process only nodes
+.TP
+\-W (\-\-ways-only)
+process only ways
+.TP
+\-a (\-\-attr-debug-level)
+control which data is included in the debug attribute
+.TP
+\-c (\-\-dump-coordinates)
+dump coordinates after phase 1
+.TP
+\-d (\-\-db) <connect string>
+get osm data out of a postgresql database with osm simple scheme and given connect string
+.TP
+\-e (\-\-end) <phase>
+end at specified phase
+.TP
+\-k (\-\-keep-tmpfiles)
+do not delete tmp files after processing. useful to reuse them
+.TP
+\-s (\-\-start) <phase>
+start at specified phase
+.TP
+\-i (\-\-input-file) <file>
+specify the input file name (OSM), overrules default stdin
+.TP
+\-w (\-\-dedupe-ways)
+ensure no duplicate ways or nodes. useful when using several input files
+.TP
+\-z (\-\-compression-level) <level>
+set the compression level
+.SH BUGS
+Should you find one, please report it :
+ http://trac.navit-project.org
+.SH AUTHOR
+The navit Team - http://www.navit-project.org
+.SH SEE ALSO
+navit(1)

diff --git a/man/osm2navit.1 b/man/osm2navit.1
deleted file mode 100644 (file)
index 2bb13c6..0000000
--- a/man/osm2navit.1
+++ /dev/null
@@ -1,56 +0,0 @@
-.TH osm2navit 1  "August, 21 2008" "version 0.0.4+svn" "USER COMMANDS"
-.SH NAME
-osm2navit \- parse osm textfile and converts to NavIt binfile format
-.SH SYNOPSIS
-.B bzcat planet.osm.bz2 | osm2navit 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
-.SH OPTIONS
-.TP
-\-h (\-\-help)
-display a short help message
-.TP
-\-N (\-\-nodes-only)
-process only nodes
-.TP
-\-W (\-\-ways-only)
-process only ways
-.TP
-\-a (\-\-attr-debug-level)
-control which data is included in the debug attribute
-.TP
-\-c (\-\-dump-coordinates)
-dump coordinates after phase 1
-.TP
-\-d (\-\-db) <connect string>
-get osm data out of a postgresql database with osm simple scheme and given connect string
-.TP
-\-e (\-\-end) <phase>
-end at specified phase
-.TP
-\-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
-\-i (\-\-input-file) <file>
-specify the input file name (OSM), overrules default stdin
-.TP
-\-w (\-\-dedupe-ways)
-ensure no duplicate ways or nodes. useful when using several input files
-.TP
-\-z (\-\-compression-level) <level>
-set the compression level
-.SH BUGS
-Should you find one, please report it :
- http://trac.navit-project.org
-.SH AUTHOR
-The navit Team - http://www.navit-project.org
-.SH SEE ALSO
-navit(1)

diff --git a/navit/maptool/ch.c b/navit/maptool/ch.c
index 31116c1..21ef4fe 100644 (file)
--- 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