Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Change default Mapsource version output to 5.

  • Loading branch information...
commit 79b36cb26743a4e26e9f705d1737043e771ff4cf 1 parent 267b422
robertl authored
Showing with 38 additions and 16 deletions.
  1. +31 −9 README
  2. +1 −1  mapsource.c
  3. +6 −6 testo
View
40 README
@@ -154,15 +154,19 @@ THE FORMATS
MAPSOURCE
- Garmin Mapsource format appears compatible with the various
- members of that product family. Icon mapping is attempted between
- different MapSource versions. Altitude is supported, but proximity
- and depth are not. Naming files *.mps will allow file->open in
- Mapsource to find the files more easily. Versions 3, 4 and 5
- of the Mapsource data format are handled automatically on input
- and by default the output is version 3 for maximum compatibility.
- Waypoints, routes and tracklogs are all handled, but maps sets are
- ignored.
+ Garmin Mapsource format appears compatible with the various
+ members of that product family. Icon mapping is attempted
+ between different MapSource versions. Altitude is supported,
+ but proximity and depth are not. Naming files *.mps will
+ allow file->open in Mapsource to find the files more easily.
+ Versions 3, 4 and 5 of the Mapsource data format are handled
+ automatically on input and by default the output is version 5.
+ (Until 3/2004, it was version 3, but since Mapsource updates
+ are free, the convenience of having modern icon sets outweighs
+ the backward compatibility concern. Users of other versions
+ can either upgrade or specify the switches to get get output in
+ a compatible format.) Waypoints, routes and tracklogs are all
+ handled, but maps sets are ignored.
Information on the Garmin Mapsource format was provided by Ian
Cowley and Mark Bradley. The code was implemented by Robert Lipe
@@ -461,6 +465,23 @@ THE FORMATS
This is a catch-all used by many Delorme mapping products and
reads the anr, rte, and rtd formats as either tracks or routes.
+<<<<<<< README
+ saplus
+
+ This format is for Street Atlas USA 2004 Plus.
+
+ For geocachers importing data from a tool like GSAK or Spinner,
+ import the file twice in XData. One will create a file with the
+ Cache description as a hyperlink on the flag. This can clutter
+ up the screen and when you try to zoom in, it causes problems.
+ So the second one will only have a flag. Thus you can turn off
+ and on which one you want to view. The first time you import
+ the file, in the assign field types, check the circle above Full
+ Name and then next. The second time you import the file do not
+ check any circle and in the second to last column, change URL to
+ none and then click next. Use the same name you used the first
+ time but add -Flag to it.
+=======
saplus
This format is for Street Atlas USA 2004 Plus.
@@ -492,6 +513,7 @@ THE FORMATS
http://www.gpsu.co.uk/
http://www.kolumbus.fi/eino.uikkanen/geoconvgb/index.htm
+>>>>>>> 1.56
DATA FILTERS
View
2  mapsource.c
@@ -1788,7 +1788,7 @@ mps_write(void)
if (mpsverout)
mps_ver_out = atoi(mpsverout);
else
- mps_ver_out = 3;
+ mps_ver_out = 5;
mkshort_handle = mkshort_new_handle();
View
12 testo
@@ -234,13 +234,13 @@ compare ${TMPDIR}/ms1.gpx ${TMPDIR}/ms2.gpx
# MRCB mapsource track test
#
rm -f ${TMPDIR}/mps-track.mps
-${PNAME} -t -i mapsource -f reference/track/mps-track.mps -o mapsource \
+${PNAME} -t -i mapsource -f reference/track/mps-track.mps -o mapsource,mpsverout=3 \
-F ${TMPDIR}/mps-track.mps
compare ${TMPDIR}/mps-track.mps reference/track/
# Now do a test of reading waypoints from a track-only file - should have an empty result
rm -f ${TMPDIR}/mps-track.mps
-${PNAME} -i mapsource -f reference/track/mps-track.mps -o mapsource \
+${PNAME} -i mapsource -f reference/track/mps-track.mps -o mapsource,mpsverout=3 \
-F ${TMPDIR}/mps-track.mps
compare ${TMPDIR}/mps-track.mps reference/mps-empty.mps
@@ -254,7 +254,7 @@ compare ${TMPDIR}/mps-route.mps reference/route/route.mps
# Now do a test of reading tracks from a route-only file - should have an empty result
rm -f ${TMPDIR}/mps-route.mps
-${PNAME} -t -i mapsource -f reference/route/route.mps -o mapsource \
+${PNAME} -t -i mapsource -f reference/route/route.mps -o mapsource,mpsverout=3 \
-F ${TMPDIR}/mps-route.mps
compare ${TMPDIR}/mps-route.mps reference/mps-empty.mps
@@ -391,7 +391,7 @@ compare reference/psitwpts.txt ${TMPDIR}/psit-ww.txt
# Now test correct "empty" handling - ask for routes when there aren't any
# Uses mapsource as the empty handling for this has already happened above
rm -f ${TMPDIR}/psit-wr.mps
-${PNAME} -r -i psitrex -f reference/psitwpts.txt -o mapsource -F ${TMPDIR}/psit-wr.mps
+${PNAME} -r -i psitrex -f reference/psitwpts.txt -o mapsource,mpsverout=3 -F ${TMPDIR}/psit-wr.mps
compare reference/mps-empty.mps ${TMPDIR}/psit-wr.mps
# Routes next
@@ -403,7 +403,7 @@ compare reference/route/psitrtes.txt ${TMPDIR}/psit-rr.txt
# Now test correct "empty" handling - ask for tracks when there aren't any
# Uses mapsource as the empty handling for this has already happened above
rm -f ${TMPDIR}/psit-rt.mps
-${PNAME} -t -i psitrex -f reference/route/psitrtes.txt -o mapsource -F ${TMPDIR}/psit-rt.mps
+${PNAME} -t -i psitrex -f reference/route/psitrtes.txt -o mapsource,mpsverout=3 -F ${TMPDIR}/psit-rt.mps
compare reference/mps-empty.mps ${TMPDIR}/psit-rt.mps
# Tracks last
@@ -415,7 +415,7 @@ compare reference/track/psittrks.txt ${TMPDIR}/psit-tt.txt
# Now test correct "empty" handling - ask for waypoints when there aren't any
# Uses mapsource as the empty handling for this has already happened above
rm -f ${TMPDIR}/psit-tw.mps
-${PNAME} -i psitrex -f reference/track/psittrks.txt -o mapsource -F ${TMPDIR}/psit-tw.mps
+${PNAME} -i psitrex -f reference/track/psittrks.txt -o mapsource,mpsverout=3 -F ${TMPDIR}/psit-tw.mps
compare reference/mps-empty.mps ${TMPDIR}/psit-tw.mps
#
Please sign in to comment.
Something went wrong with that request. Please try again.