* Copyright (C) 2007, Quy Tonthat <qtonthat@gmail.com>
* Copyright (C) 2008, Hein Ragas <viking@ragas.nl>
* Copyright (C) 2009, Tal B <tal.bav@gmail.com>
+ * Copyright (c) 2012, Rob Norris <rw_norris@hotmail.com>
*
* Some of the code adapted from GPSBabel 1.2.7
* http://gpsbabel.sf.net/
tt_gpx,
tt_wpt,
+ tt_wpt_cmt,
tt_wpt_desc,
tt_wpt_name,
tt_wpt_ele,
tt_wpt_link, /* New in GPX 1.1 */
tt_trk,
+ tt_trk_cmt,
tt_trk_desc,
tt_trk_name,
+ tt_rte,
+
tt_trk_trkseg,
tt_trk_trkseg_trkpt,
tt_trk_trkseg_trkpt_ele,
{ tt_wpt_ele, "/gpx/wpt/ele" },
{ tt_wpt_name, "/gpx/wpt/name" },
+ { tt_wpt_cmt, "/gpx/wpt/cmt" },
{ tt_wpt_desc, "/gpx/wpt/desc" },
{ tt_wpt_sym, "/gpx/wpt/sym" },
{ tt_wpt_sym, "/loc/waypoint/type" },
{ tt_wpt_link, "/gpx/wpt/link" }, /* GPX 1.1 */
{ tt_trk, "/gpx/trk" },
- { tt_trk, "/gpx/rte" },
{ tt_trk_name, "/gpx/trk/name" },
+ { tt_trk_cmt, "/gpx/trk/cmt" },
{ tt_trk_desc, "/gpx/trk/desc" },
{ tt_trk_trkseg, "/gpx/trk/trkseg" },
{ tt_trk_trkseg_trkpt, "/gpx/trk/trkseg/trkpt" },
- { tt_trk_trkseg_trkpt, "/gpx/rte/rtept" },
{ tt_trk_trkseg_trkpt_ele, "/gpx/trk/trkseg/trkpt/ele" },
{ tt_trk_trkseg_trkpt_time, "/gpx/trk/trkseg/trkpt/time" },
/* extended */
{ tt_trk_trkseg_trkpt_hdop, "/gpx/trk/trkseg/trkpt/hdop" },
{ tt_trk_trkseg_trkpt_vdop, "/gpx/trk/trkseg/trkpt/vdop" },
{ tt_trk_trkseg_trkpt_pdop, "/gpx/trk/trkseg/trkpt/pdop" },
+
+ { tt_rte, "/gpx/rte" },
+ // NB Route reuses track point feature tags
+ { tt_trk_name, "/gpx/rte/name" },
+ { tt_trk_cmt, "/gpx/rte/cmt" },
+ { tt_trk_desc, "/gpx/rte/desc" },
+ { tt_trk_trkseg_trkpt, "/gpx/rte/rtept" },
+ { tt_trk_trkseg_trkpt_ele, "/gpx/rte/rtept/ele" },
+
{0}
};
case tt_wpt:
if ( set_c_ll( attr ) ) {
c_wp = vik_waypoint_new ();
- if ( ! get_attr ( attr, "hidden" ) )
- c_wp->visible = TRUE;
+ c_wp->visible = TRUE;
+ if ( get_attr ( attr, "hidden" ) )
+ c_wp->visible = FALSE;
vik_coord_load_from_latlon ( &(c_wp->coord), vik_trw_layer_get_coord_mode ( vtl ), &c_ll );
}
break;
case tt_trk:
+ case tt_rte:
c_tr = vik_track_new ();
- if ( ! get_attr ( attr, "hidden" ) )
- c_tr->visible = TRUE;
+ c_tr->is_route = (current_tag == tt_rte) ? TRUE : FALSE;
+ c_tr->visible = TRUE;
+ if ( get_attr ( attr, "hidden" ) )
+ c_tr->visible = FALSE;
break;
case tt_trk_trkseg:
case tt_trk_trkseg_trkpt_ele:
case tt_trk_trkseg_trkpt_time:
+ case tt_wpt_cmt:
case tt_wpt_desc:
case tt_wpt_name:
case tt_wpt_ele:
case tt_wpt_link:
+ case tt_trk_cmt:
case tt_trk_desc:
case tt_trk_name:
g_string_erase ( c_cdata, 0, -1 ); /* clear the cdata buffer */
break;
case tt_trk:
+ case tt_rte:
if ( ! c_tr_name )
c_tr_name = g_strdup_printf("VIKING_TR%d", unnamed_tracks++);
vik_trw_layer_filein_add_track ( vtl, c_tr_name, c_tr );
case tt_waypoint_name: /* .loc name is really description. */
case tt_wpt_desc:
+ vik_waypoint_set_description ( c_wp, c_cdata->str );
+ g_string_erase ( c_cdata, 0, -1 );
+ break;
+
+ case tt_wpt_cmt:
vik_waypoint_set_comment ( c_wp, c_cdata->str );
g_string_erase ( c_cdata, 0, -1 );
break;
}
case tt_trk_desc:
+ vik_track_set_description ( c_tr, c_cdata->str );
+ g_string_erase ( c_cdata, 0, -1 );
+ break;
+
+ case tt_trk_cmt:
vik_track_set_comment ( c_tr, c_cdata->str );
g_string_erase ( c_cdata, 0, -1 );
break;
case tt_trk_name:
case tt_wpt_ele:
case tt_trk_trkseg_trkpt_ele:
+ case tt_wpt_cmt:
case tt_wpt_desc:
case tt_wpt_sym:
case tt_wpt_link:
+ case tt_trk_cmt:
case tt_trk_desc:
case tt_trk_trkseg_trkpt_time:
case tt_trk_trkseg_trkpt_course:
static void gpx_write_waypoint ( VikWaypoint *wp, GpxWritingContext *context )
{
+ // Don't write invisible waypoints when specified
+ if (context->options && !context->options->hidden && !wp->visible)
+ return;
+
FILE *f = context->file;
static struct LatLon ll;
gchar *s_lat,*s_lon;
vik_coord_to_latlon ( &(wp->coord), &ll );
s_lat = a_coords_dtostr( ll.lat );
s_lon = a_coords_dtostr( ll.lon );
+ // NB 'hidden' is not part of any GPX standard - this appears to be a made up Viking 'extension'
+ // luckily most other GPX processing software ignores things they don't understand
fprintf ( f, "<wpt lat=\"%s\" lon=\"%s\"%s>\n",
s_lat, s_lon, wp->visible ? "" : " hidden=\"hidden\"" );
g_free ( s_lat );
if ( wp->comment )
{
tmp = entitize(wp->comment);
+ fprintf ( f, " <cmt>%s</cmt>\n", tmp );
+ g_free ( tmp );
+ }
+ if ( wp->description )
+ {
+ tmp = entitize(wp->description);
fprintf ( f, " <desc>%s</desc>\n", tmp );
g_free ( tmp );
}
gchar *time_iso8601;
vik_coord_to_latlon ( &(tp->coord), &ll );
- if ( tp->newsegment )
+ // No such thing as a rteseg! So make sure we don't put them in
+ if ( context->options && !context->options->is_route && tp->newsegment )
fprintf ( f, " </trkseg>\n <trkseg>\n" );
s_lat = a_coords_dtostr( ll.lat );
s_lon = a_coords_dtostr( ll.lon );
- fprintf ( f, " <trkpt lat=\"%s\" lon=\"%s\">\n", s_lat, s_lon );
+ fprintf ( f, " <%spt lat=\"%s\" lon=\"%s\">\n", (context->options && context->options->is_route) ? "rte" : "trk", s_lat, s_lon );
g_free ( s_lat ); s_lat = NULL;
g_free ( s_lon ); s_lon = NULL;
fprintf ( f, " <pdop>%s</pdop>\n", s_dop );
g_free ( s_dop ); s_dop = NULL;
-
- fprintf ( f, " </trkpt>\n" );
+ fprintf ( f, " </%spt>\n", (context->options && context->options->is_route) ? "rte" : "trk" );
}
static void gpx_write_track ( VikTrack *t, GpxWritingContext *context )
{
+ // Don't write invisible tracks when specified
+ if (context->options && !context->options->hidden && !t->visible)
+ return;
+
FILE *f = context->file;
gchar *tmp;
gboolean first_tp_is_newsegment = FALSE; /* must temporarily make it not so, but we want to restore state. not that it matters. */
else
tmp = g_strdup ("track");
- fprintf ( f, "<trk%s>\n <name>%s</name>\n", t->visible ? "" : " hidden=\"hidden\"", tmp );
+ // NB 'hidden' is not part of any GPX standard - this appears to be a made up Viking 'extension'
+ // luckily most other GPX processing software ignores things they don't understand
+ fprintf ( f, "<%s%s>\n <name>%s</name>\n",
+ t->is_route ? "rte" : "trk",
+ t->visible ? "" : " hidden=\"hidden\"",
+ tmp );
g_free ( tmp );
if ( t->comment )
{
tmp = entitize ( t->comment );
+ fprintf ( f, " <cmt>%s</cmt>\n", tmp );
+ g_free ( tmp );
+ }
+
+ if ( t->description )
+ {
+ tmp = entitize ( t->description );
fprintf ( f, " <desc>%s</desc>\n", tmp );
g_free ( tmp );
}
- fprintf ( f, " <trkseg>\n" );
+ /* No such thing as a rteseg! */
+ if ( !t->is_route )
+ fprintf ( f, " <trkseg>\n" );
if ( t->trackpoints && t->trackpoints->data ) {
first_tp_is_newsegment = VIK_TRACKPOINT(t->trackpoints->data)->newsegment;
VIK_TRACKPOINT(t->trackpoints->data)->newsegment = first_tp_is_newsegment; /* restore state */
}
- fprintf ( f, "</trkseg>\n</trk>\n" );
+ /* NB apparently no such thing as a rteseg! */
+ if (!t->is_route)
+ fprintf ( f, " </trkseg>\n");
+
+ fprintf ( f, "</%s>\n", t->is_route ? "rte" : "trk" );
}
static void gpx_write_header( FILE *f )
fprintf(f, "</gpx>\n");
}
-/* Type to hold name of track and timestamp of first trackpoint */
-typedef struct {
- time_t first_timestamp;
- gpointer id;
-} gpx_track_and_timestamp;
-
-typedef struct {
- gpx_track_and_timestamp *trks;
- guint i;
- guint n_trks;
-} gpx_gather_tracks_passalong_t;
-
-/* Function to collect a track and the first timestamp in the list */
-static void gpx_collect_track (const gpointer id, VikTrack *track, gpx_gather_tracks_passalong_t *passalong)
-{
- if (passalong->i < passalong->n_trks)
- {
- passalong->trks[passalong->i].id = id;
- if (track && track->trackpoints && track->trackpoints->data)
- {
- VikTrackpoint *first_point = (VikTrackpoint *)track->trackpoints->data;
- passalong->trks[passalong->i].first_timestamp = first_point->timestamp;
- }
- else
- {
- passalong->trks[passalong->i].first_timestamp = 0;
- }
- passalong->i++;
- }
-}
-
static int gpx_waypoint_compare(const void *x, const void *y)
{
VikWaypoint *a = (VikWaypoint *)x;
return strcmp(a->name,b->name);
}
+static int gpx_track_compare_name(const void *x, const void *y)
+{
+ VikTrack *a = (VikTrack *)x;
+ VikTrack *b = (VikTrack *)y;
+ return strcmp(a->name,b->name);
+}
+
/* Function to compare two tracks by their first timestamp */
-static int gpx_track_and_timestamp_compare(const void *x, const void *y)
+static int gpx_track_compare_timestamp (const void *x, const void *y)
{
- gpx_track_and_timestamp *a = (gpx_track_and_timestamp *)x;
- gpx_track_and_timestamp *b = (gpx_track_and_timestamp *)y;
- if (a->first_timestamp < b->first_timestamp)
- {
- return -1;
+ VikTrack *a = (VikTrack *)x;
+ VikTrack *b = (VikTrack *)y;
+
+ VikTrackpoint *tpa = NULL;
+ VikTrackpoint *tpb = NULL;
+
+ if ( a->trackpoints )
+ tpa = VIK_TRACKPOINT(g_list_first(a->trackpoints)->data);
+
+ if ( b->trackpoints )
+ tpb = VIK_TRACKPOINT(g_list_first(b->trackpoints)->data);
+
+ if ( tpa && tpb ) {
+ if ( tpa->timestamp < tpb->timestamp )
+ return -1;
+ if ( tpa->timestamp > tpb->timestamp )
+ return 1;
}
- if (a->first_timestamp > b->first_timestamp)
- {
+
+ if ( tpa && !tpb )
return 1;
- }
- return 0;
-}
-void a_gpx_write_file( VikTrwLayer *vtl, FILE *f )
-{
- a_gpx_write_file_options(NULL, vtl, f);
+ if ( !tpa && tpb )
+ return -1;
+
+ return 0;
}
-void a_gpx_write_file_options ( GpxWritingOptions *options, VikTrwLayer *vtl, FILE *f )
+void a_gpx_write_file ( VikTrwLayer *vtl, FILE *f, GpxWritingOptions *options )
{
GpxWritingContext context = { options, f };
}
g_list_free ( gl );
-
- gpx_gather_tracks_passalong_t passalong_tracks;
- passalong_tracks.n_trks = g_hash_table_size ( vik_trw_layer_get_tracks (vtl) );
- passalong_tracks.i = 0;
- passalong_tracks.trks = g_new(gpx_track_and_timestamp,passalong_tracks.n_trks);
- g_hash_table_foreach (vik_trw_layer_get_tracks(vtl), (GHFunc) gpx_collect_track, &passalong_tracks);
- /* Sort by timestamp */
+
gl = g_hash_table_get_values ( vik_trw_layer_get_tracks ( vtl ) );
- gl = g_list_sort ( gl, gpx_track_and_timestamp_compare );
+ // Sort method determined by preference
+ if ( a_vik_get_gpx_export_trk_sort() == VIK_GPX_EXPORT_TRK_SORT_TIME )
+ gl = g_list_sort ( gl, gpx_track_compare_timestamp );
+ else
+ gl = g_list_sort ( gl, gpx_track_compare_name );
+
+ // Routes sorted by name
+ GList *glrte = g_hash_table_get_values ( vik_trw_layer_get_routes ( vtl ) );
+ glrte = g_list_sort ( glrte, gpx_track_compare_name );
+ // g_list_concat doesn't copy memory properly
+ // so process each list separately
+
+ GpxWritingContext context_tmp = context;
+ GpxWritingOptions opt_tmp = { FALSE, FALSE, FALSE };
+ // Force trackpoints on tracks
+ if ( !context.options )
+ context_tmp.options = &opt_tmp;
+ context_tmp.options->is_route = FALSE;
+
+ // Loop around each list and write each one
for (iter = g_list_first (gl); iter != NULL; iter = g_list_next (iter)) {
- gpx_write_track ( (VikTrack*)iter->data, &context );
+ gpx_write_track ( (VikTrack*)iter->data, &context_tmp );
+ }
+
+ // Routes (to get routepoints)
+ context_tmp.options->is_route = TRUE;
+ for (iter = g_list_first (glrte); iter != NULL; iter = g_list_next (iter)) {
+ gpx_write_track ( (VikTrack*)iter->data, &context_tmp );
}
g_list_free ( gl );
+ g_list_free ( glrte );
- g_free ( passalong_tracks.trks );
gpx_write_footer ( f );
}
-void a_gpx_write_track_file ( VikTrack *trk, FILE *f )
-{
- a_gpx_write_track_file_options ( NULL, trk, f );
-}
-
-void a_gpx_write_track_file_options ( GpxWritingOptions *options, VikTrack *trk, FILE *f )
+void a_gpx_write_track_file ( VikTrack *trk, FILE *f, GpxWritingOptions *options )
{
GpxWritingContext context = {options, f};
gpx_write_header ( f );
projects / andy / viking.git / blobdiff