Revision: 5268
http://navit.svn.sourceforge.net/navit/?rev=5268&view=rev
Author: mdankov
Date: 2012-11-11 12:23:16 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
Add:tools/gpx2navit_txt:New option to disable track speed check.
Modified Paths:
--------------
trunk/navit/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1
trunk/navit/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h
trunk/navit/navit/tools/gpx2navit_txt/src/main.c
trunk/navit/navit/tools/gpx2navit_txt/src/setpath.c
Modified: trunk/navit/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1
===================================================================
--- trunk/navit/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1 2012-11-11 10:43:47 UTC (rev 5267)
+++ trunk/navit/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1 2012-11-11 12:23:16 UTC (rev 5268)
@@ -79,6 +79,9 @@
.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
Modified: trunk/navit/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h
===================================================================
--- trunk/navit/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h 2012-11-11 10:43:47 UTC (rev 5267)
+++ trunk/navit/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h 2012-11-11 12:23:16 UTC (rev 5268)
@@ -220,6 +220,7 @@
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;
/**
Modified: trunk/navit/navit/tools/gpx2navit_txt/src/main.c
===================================================================
--- trunk/navit/navit/tools/gpx2navit_txt/src/main.c 2012-11-11 10:43:47 UTC (rev 5267)
+++ trunk/navit/navit/tools/gpx2navit_txt/src/main.c 2012-11-11 12:23:16 UTC (rev 5268)
@@ -120,6 +120,8 @@
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 @@
{"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 @@
}
/* 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 @@
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;
Modified: trunk/navit/navit/tools/gpx2navit_txt/src/setpath.c
===================================================================
--- trunk/navit/navit/tools/gpx2navit_txt/src/setpath.c 2012-11-11 10:43:47 UTC (rev 5267)
+++ trunk/navit/navit/tools/gpx2navit_txt/src/setpath.c 2012-11-11 12:23:16 UTC (rev 5268)
@@ -208,10 +208,10 @@
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|