summaryrefslogtreecommitdiff
path: root/navit/tools/gpx2navit_txt
diff options
context:
space:
mode:
Diffstat (limited to 'navit/tools/gpx2navit_txt')
-rw-r--r--navit/tools/gpx2navit_txt/COPYING10
-rw-r--r--navit/tools/gpx2navit_txt/INSTALL2
-rw-r--r--navit/tools/gpx2navit_txt/NEWS6
-rw-r--r--navit/tools/gpx2navit_txt/README18
-rwxr-xr-xnavit/tools/gpx2navit_txt/autogen.sh2
-rwxr-xr-xnavit/tools/gpx2navit_txt/install-sh14
-rw-r--r--navit/tools/gpx2navit_txt/man/gpx2navit_txt.164
-rw-r--r--navit/tools/gpx2navit_txt/src/errorcode.h2
-rw-r--r--navit/tools/gpx2navit_txt/src/geodesic.h4
-rw-r--r--navit/tools/gpx2navit_txt/src/gpx2navit_txt.h8
10 files changed, 65 insertions, 65 deletions
diff --git a/navit/tools/gpx2navit_txt/COPYING b/navit/tools/gpx2navit_txt/COPYING
index 514d6c73f..fc2670632 100644
--- a/navit/tools/gpx2navit_txt/COPYING
+++ b/navit/tools/gpx2navit_txt/COPYING
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
-
+
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
+
Appendix: How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
diff --git a/navit/tools/gpx2navit_txt/INSTALL b/navit/tools/gpx2navit_txt/INSTALL
index b5dbb9e31..7eae212e3 100644
--- a/navit/tools/gpx2navit_txt/INSTALL
+++ b/navit/tools/gpx2navit_txt/INSTALL
@@ -11,7 +11,7 @@ It's not special. Just type below like others.
./configure
make
- su
+ su
make install
gpx2navit_txt image will be at /usr/local/bin.
diff --git a/navit/tools/gpx2navit_txt/NEWS b/navit/tools/gpx2navit_txt/NEWS
index 7bd167323..d6f88c478 100644
--- a/navit/tools/gpx2navit_txt/NEWS
+++ b/navit/tools/gpx2navit_txt/NEWS
@@ -5,7 +5,7 @@
- Compile warning fixes
by Toshihiro Hiraoka
- Bug fix
-
+
0.68-1
======
by Petter Reinholdtsen
@@ -14,7 +14,7 @@
- RPM package for Vine 3.1
0.68
-====
+====
by Toshihiro Hiraoka
- Change XML parser from libxml2 to expat for big file support
- Remake almost all strucutes.
@@ -27,7 +27,7 @@
- README
- AUTHORS
- Change comment style to javadoc style.
- - Structures flow
+ - Structures flow
- Error code
0.65-1
diff --git a/navit/tools/gpx2navit_txt/README b/navit/tools/gpx2navit_txt/README
index ecb3f995f..d353cb50e 100644
--- a/navit/tools/gpx2navit_txt/README
+++ b/navit/tools/gpx2navit_txt/README
@@ -1,14 +1,14 @@
==============
gpx2navit_txt README
==============
-bodenseepingu
+bodenseepingu
4/01/2008
What's This
===========
gpx2navit_txt is a converter from GPX file to Navit Text map format
-For gpx2navit_txt was the original code from gpx2shp used and modified.
+For gpx2navit_txt was the original code from gpx2shp used and modified.
This is a output of Metro Manila Transit Map Project by JOCV (Japan
Overseas Cooperation Volunteers) program of JICA (Japan International
Cooperation Agency in 2004. It is provided you on GPL2.
@@ -28,7 +28,7 @@ Please try to convert a sample file "pinatest2.gpx" in this archive.
prompt> gpx2navit_txt pinatest2.gpx
prompt> ls
- pinatest2.gpx (source gpx)
+ pinatest2.gpx (source gpx)
pinatest2_meta.txt (meta data may be there)
You can convert only a certain type of data like only waypoint or
@@ -42,7 +42,7 @@ track point using option '-w' (waypoint), '-t' (trackpoint) or '-r'
you can convert it other ways using option '-p'(convert as point) and
'-e' (as edge). The edge file has '_edg' in the filename and the point
file has '_pnt' in the filename.
-
+
prompt> gpx2navit_txt -p -e pinatest2.gpx
- Statistics
@@ -87,14 +87,14 @@ try a example below.
- Length and time units
You can choose any length related units that are supported by proj4
-for attribute table using
- '--length-unit' (for length column, default: m),
- '--time-unit' (for time column, default: sec),
+for attribute table using
+ '--length-unit' (for length column, default: m),
+ '--time-unit' (for time column, default: sec),
'--speed-length-unit' (for speed column, default: km),
'--speed-time-unit' (for speed column, default: hour) and
'--length-ellipsoid' (for length calculation, default: UGS84).
- You can see the supported units by 'geod -lu' and 'geod -le' command.
- Supported time unit are 'sec', 'min', 'hour' and 'day'.
+ You can see the supported units by 'geod -lu' and 'geod -le' command.
+ Supported time unit are 'sec', 'min', 'hour' and 'day'.
- Other futures
There are other futures in gpx2navit_txt. Please check the option list using
diff --git a/navit/tools/gpx2navit_txt/autogen.sh b/navit/tools/gpx2navit_txt/autogen.sh
index ba84850ab..3951daa17 100755
--- a/navit/tools/gpx2navit_txt/autogen.sh
+++ b/navit/tools/gpx2navit_txt/autogen.sh
@@ -1,7 +1,7 @@
#!/bin/sh
for pkg in pkg-config libtool automake aclocal autoreconf:autoconf autopoint:gettext
do
- if ! ${pkg%%:*} --version >/dev/null
+ if ! ${pkg%%:*} --version >/dev/null
then
echo "You need to install ${pkg##*:}"
exit 1
diff --git a/navit/tools/gpx2navit_txt/install-sh b/navit/tools/gpx2navit_txt/install-sh
index 11870f1b0..a06f46705 100755
--- a/navit/tools/gpx2navit_txt/install-sh
+++ b/navit/tools/gpx2navit_txt/install-sh
@@ -115,7 +115,7 @@ fi
if [ x"$dir_arg" != x ]; then
dst=$src
src=""
-
+
if [ -d $dst ]; then
instcmd=:
chmodcmd=""
@@ -125,7 +125,7 @@ if [ x"$dir_arg" != x ]; then
else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
+# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if [ -f "$src" ] || [ -d "$src" ]
@@ -135,7 +135,7 @@ else
echo "install: $src does not exist"
exit 1
fi
-
+
if [ x"$dst" = x ]
then
echo "install: no destination specified"
@@ -202,17 +202,17 @@ else
# If we're going to rename the final executable, determine the name now.
- if [ x"$transformarg" = x ]
+ if [ x"$transformarg" = x ]
then
dstfile=`basename $dst`
else
- dstfile=`basename $dst $transformbasename |
+ dstfile=`basename $dst $transformbasename |
sed $transformarg`$transformbasename
fi
# don't allow the sed command to completely eliminate the filename
- if [ x"$dstfile" = x ]
+ if [ x"$dstfile" = x ]
then
dstfile=`basename $dst`
else
@@ -243,7 +243,7 @@ else
# Now rename the file to the real destination.
$doit $rmcmd -f $dstdir/$dstfile &&
- $doit $mvcmd $dsttmp $dstdir/$dstfile
+ $doit $mvcmd $dsttmp $dstdir/$dstfile
fi &&
diff --git a/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1 b/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1
index c04165efb..a0a07495a 100644
--- a/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1
+++ b/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1
@@ -1,103 +1,103 @@
-.\"
+.\"
.TH "gpx2navit_txt" "1" "0.1" "bodenseepingu" ""
.SH "NAME"
gpx2navit_txt \- Convert GPX files to navit txt files
.SH "SYNOPSIS"
gpx2navit_txt [options] [\-o output file] gpxfile
.SH "DESCRIPTION"
-gpx2navit_txt is a converter from GPX file to navit txt file
+gpx2navit_txt is a converter from GPX file to navit txt file
The original gpx2shp was used for that program.
This is a output of Metro Manila Transit Map Project by JOCV (Japan Overseas Cooperation Volunteers) program of JICA (Japan International Cooperation Agency) in 2004. It is provided you on GPL2.
.SH "OPTIONS"
-.TP
+.TP
.B \-o, \-\-output
Sets output basename. The default is (source file name) \- (extention name)
-.TP
+.TP
.B \-w, \-\-waypoints
Converts only waypoints data from a gpx file.
-.TP
+.TP
.B \-t, \-\-trackpoints
Converts only trackpoints data from a gpx file.
-.TP
+.TP
.B \-r, \-\-routes
Converts only routes data from a gpx file.
-.TP
+.TP
.B \-a, \-\-all
Converts all types of data from a gpx file.(default)
-.TP
+.TP
.B \-e, \-\-as\-edge
Makes a separated output by each edges.
-.TP
+.TP
.B \-p, \-\-as\-point
Makes a separated output by each points.
-.TP
+.TP
.B \-s, \-\-stats
Shows simple statistics of the outputs.
-.TP
+.TP
.B \-b, \-\-basic\-columns
Stores only basic data as attribures to reduce memory and storage usage. (ele, name, cmt, type, time, fix, sym and number).
-.TP
+.TP
.B \-L, \-\-no\-length
Removes length column from a waypoint or trackpoint attribute table.
-.TP
+.TP
.B \-S, \-\-no\-speed
Removes speed column from a waypoint or trackpoint attribute table.
-.TP
+.TP
.B \-T, \-\-no\-time
Removes time column from an attribute table.
-.TP
+.TP
.B \-g, \-\-gpxline
Adds line number of GPX file as attribures.
-.TP
+.TP
.B \-f, \-\-fast
Make it faster without any checks.
-.TP
+.TP
.B \-3, \-\-3d
Converts data using 3d format. (It's not compatible for Arcview 3.x.)
-.TP
+.TP
.B \-\-min\-points
Sets path minimum points to convert for noise reduction. Default is 2.
-.TP
+.TP
.B \-\-min\-length
Sets path minimum length to convert for noise reduction. Default is 0.
-.TP
+.TP
.B \-\-min\-time
Sets path minimum time period to convert for noise reduction. Default is 0.
-.TP
+.TP
.B \-\-length\-unit
Sets length unit from m,km,feet,mi and etc. The default is m. You can see the unit list from "geod \-lu" command.
-.TP
+.TP
.B \-\-time\-unit
Sets time unit. The default is sec. You can set from day, hour, min and sec.
-.TP
-.B \-\-speed\-length\-unit
+.TP
+.B \-\-speed\-length\-unit
Sets length unit for speed. The default is km. You can see the unit list from "geod \-lu" command.
-.TP
+.TP
.B \-\-speed\-time\-unit
Sets time unit for speed calulation. Default is hour. You can set from day, hour, min and sec.
-.TP
+.TP
.B \-\-length\-ellipsoid
Sets length ellipsoid like UGS84, clrk66. The default is UGS84. You can see the unit list from "geod \-le" command.
-.TP
+.TP
.B \-\-no\-speed-check
Disables checking the track speed to be non-zero.
-.TP
+.TP
.B \-v, \-\-verbose
Gives many messages.
-.TP
+.TP
.B \-\-version
Shows version.
-.TP
+.TP
.B \-h, \-\-help
Shows this list.
.SH "AUTHORS"
Toshihiro Hiraoka
-.br
+.br
Petter Reinholdtsen
.SH "BUGS or OPINIONS"
Please e\-mail your bugs or opinions to
-.br
+.br
washitoshi at yahoo.co.jp
.SH "SEE ALSO"
diff --git a/navit/tools/gpx2navit_txt/src/errorcode.h b/navit/tools/gpx2navit_txt/src/errorcode.h
index f12d6cffd..29636fc1d 100644
--- a/navit/tools/gpx2navit_txt/src/errorcode.h
+++ b/navit/tools/gpx2navit_txt/src/errorcode.h
@@ -34,7 +34,7 @@
#define ERR_ISNOTGPX 31
#define ERR_PARSEERROR 32
/* unit */
-#define ERR_ELLPSUNIT 41
+#define ERR_ELLPSUNIT 41
#define ERR_LENGTHUNIT 42
#define ERR_TIMEUNIT 43
diff --git a/navit/tools/gpx2navit_txt/src/geodesic.h b/navit/tools/gpx2navit_txt/src/geodesic.h
index 5f818c37a..200f98659 100644
--- a/navit/tools/gpx2navit_txt/src/geodesic.h
+++ b/navit/tools/gpx2navit_txt/src/geodesic.h
@@ -56,10 +56,10 @@ GEOD_EXTERN struct geodesic {
# define f64 GEODESIC.FLAT64
# define ellipse GEODESIC.ELLIPSE
-
+
GEOD_EXTERN int n_alpha, n_S;
GEOD_EXTERN double to_meter, fr_meter, del_alpha;
-
+
void geod_set(int, char **);
void geod_for(void);
void geod_pre(void);
diff --git a/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h b/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h
index 038ca8605..9b37f0031 100644
--- a/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h
+++ b/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h
@@ -150,7 +150,7 @@ typedef struct g2sattr {
} g2sattr;
/**
- * statistics structure
+ * statistics structure
*/
typedef struct g2sstats {
int trkpoints; /** track point total count */
@@ -161,12 +161,12 @@ typedef struct g2sstats {
double rtelength; /** route total length */
int wptpoints; /** way point total count */
int trkunconverted; /** unconverted track path count */
- int rteunconverted; /** unconverted route path count */
+ int rteunconverted; /** unconverted route path count */
} g2sstats;
/**
* cluster of all dbfhandles
- */
+ */
//typedef struct dbfhandles {
// DBFHandle trk; /** for track */
// DBFHandle wpt; /** for waypoint */
@@ -224,7 +224,7 @@ typedef struct g2sprop {
} g2sprop;
/**
- * userdata structure between expat methods
+ * userdata structure between expat methods
*/
typedef struct parsedata {
int depth; /** xml path depth */