Add:tools/gpx2navit_txt:New option to disable track speed check.

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

4 files changed, 13 insertions, 3 deletions

diff --git a/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1 b/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1
index 26edd281..c04165ef 100644
--- a/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1
+++ b/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1
@@ -79,6 +79,9 @@ Sets time unit for speed calulation. Default is hour. You can set from day, hour
 .B \-\-length\-ellipsoid
 Sets length ellipsoid like UGS84, clrk66. The default is UGS84. You can see the unit list from "geod \-le" command.
 .TP 
+.B \-\-no\-speed-check
+Disables checking the track speed to be non-zero.
+.TP 
 .B \-v,  \-\-verbose
 Gives many messages.
 .TP 
diff --git a/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h b/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h
index a19c436c..038ca860 100644
--- a/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h
+++ b/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h
@@ -220,6 +220,7 @@ typedef struct g2sprop {
     int speed2sec;	/** value to convert speedTimeUnit to seconde */
     g2sstats *stats;	/** convert statistics */
     g2scolumns *cols;	/** attribute table column switch */
+    int nospeedcheck;	/** disables track check for speed to be non-zero */
 } g2sprop;
 
 /**
diff --git a/navit/tools/gpx2navit_txt/src/main.c b/navit/tools/gpx2navit_txt/src/main.c
index 834ce551..e244957f 100644
--- a/navit/tools/gpx2navit_txt/src/main.c
+++ b/navit/tools/gpx2navit_txt/src/main.c
@@ -120,6 +120,8 @@ void usage(char **argv)
     fprintf
 	(stdout,
 	 "                        You can see the unit list from \"geod -le\" command.\n");
+    fprintf(stdout,
+	    "    --no-speed-check   Disables track check for speed to be non-zero.\n");
     fprintf(stdout, "-v,  --verbose          Gives many messages.\n");
     fprintf(stdout, "     --version          Shows version.\n");
     fprintf(stdout, "-h,  --help             Shows this list.\n");
@@ -229,6 +231,7 @@ void setOptions(int argc, char **argv, g2sprop * prop)
 	{"verbose", no_argument, 0, 'v'},
 	{"gpxline", no_argument, 0, 'g'},
 	{"all", no_argument, 0, 'a'},
+	{"no-speed-check", no_argument, 0, '9'},
 	{"version", no_argument, 0, 'V'},
 	{"help", no_argument, 0, '?'},
 	{0, no_argument, 0, '0'},
@@ -240,7 +243,7 @@ void setOptions(int argc, char **argv, g2sprop * prop)
     }
     /* set option attributes */
     while ((result =
-	    getopt_long(argc, argv, "3wtrao:epfP:l:m:bS4:5:6:7:8:LTSsvg0",
+	    getopt_long(argc, argv, "3wtrao:epfP:l:m:bS4:5:6:7:8:LTSsvg09",
 			long_options, NULL)) != -1) {
 	switch (result) {
 	case '3':		/* 3d output */
@@ -346,6 +349,9 @@ void setOptions(int argc, char **argv, g2sprop * prop)
 	    prop->timeUnit = malloc(sizeof(char) * (strlen(optarg) + 1));
 	    strcpy(prop->timeUnit, optarg);
 	    break;
+	case '9':		/* disables speed check */
+	    prop->nospeedcheck=1;
+	    break;
 	case 'L':		/* doesn't make length column */
 	    prop->cols->length = 0;
 	    break;
diff --git a/navit/tools/gpx2navit_txt/src/setpath.c b/navit/tools/gpx2navit_txt/src/setpath.c
index 6b4d1555..3642415a 100644
--- a/navit/tools/gpx2navit_txt/src/setpath.c
+++ b/navit/tools/gpx2navit_txt/src/setpath.c
@@ -208,10 +208,10 @@ int checkPath(parsedata * pdata)
 	countUnconverted(pdata);
 	return 0;
 	/* check path speed */
-    } else if (pattr->speed == .0) {
+    } else if (!prop->nospeedcheck && pattr->speed == .0) {
 	fprintf
 	    (stderr,
-	     "gpx2navit_txt:%s:%i track was not converted because no move recorded.\n",
+	     "gpx2navit_txt:%s:%i track was not converted because no move recorded. Use --no-speed-check option to bypass this check.\n",
 	     prop->sourcefile, XML_GetCurrentLineNumber(pdata->parser));
 	countUnconverted(pdata);
 	return 0;