X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/2c512739651df74b9a3e575e3f401afa59db63b1..6de95419da92c374ae4851c780b05daecbafd86a:/src/gpx.c diff --git a/src/gpx.c b/src/gpx.c index 9ce413ac..7892b200 100644 --- a/src/gpx.c +++ b/src/gpx.c @@ -5,6 +5,7 @@ * Copyright (C) 2007, Quy Tonthat * Copyright (C) 2008, Hein Ragas * Copyright (C) 2009, Tal B + * Copyright (c) 2012, Rob Norris * * Some of the code adapted from GPSBabel 1.2.7 * http://gpsbabel.sf.net/ @@ -49,6 +50,7 @@ typedef enum { tt_gpx, tt_wpt, + tt_wpt_cmt, tt_wpt_desc, tt_wpt_name, tt_wpt_ele, @@ -56,9 +58,12 @@ typedef enum { 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, @@ -104,18 +109,18 @@ tag_mapping tag_path_map[] = { { 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 */ @@ -127,6 +132,15 @@ tag_mapping tag_path_map[] = { { 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} }; @@ -205,7 +219,9 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr) break; case tt_trk: + case tt_rte: c_tr = vik_track_new (); + c_tr->is_route = (current_tag == tt_rte) ? TRUE : FALSE; c_tr->visible = TRUE; if ( get_attr ( attr, "hidden" ) ) c_tr->visible = FALSE; @@ -229,10 +245,12 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr) 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 */ @@ -280,6 +298,7 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) 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 ); @@ -314,6 +333,11 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) 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; @@ -332,6 +356,11 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) } 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; @@ -397,9 +426,11 @@ static void gpx_cdata(void *dta, const XML_Char *s, int len) 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: @@ -659,6 +690,12 @@ static void gpx_write_waypoint ( VikWaypoint *wp, GpxWritingContext *context ) if ( wp->comment ) { tmp = entitize(wp->comment); + fprintf ( f, " %s\n", tmp ); + g_free ( tmp ); + } + if ( wp->description ) + { + tmp = entitize(wp->description); fprintf ( f, " %s\n", tmp ); g_free ( tmp ); } @@ -686,12 +723,13 @@ static void gpx_write_trackpoint ( VikTrackpoint *tp, GpxWritingContext *context 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, " \n \n" ); s_lat = a_coords_dtostr( ll.lat ); s_lon = a_coords_dtostr( ll.lon ); - fprintf ( f, " \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; @@ -770,8 +808,7 @@ static void gpx_write_trackpoint ( VikTrackpoint *tp, GpxWritingContext *context fprintf ( f, " %s\n", s_dop ); g_free ( s_dop ); s_dop = NULL; - - fprintf ( f, " \n" ); + fprintf ( f, " \n", (context->options && context->options->is_route) ? "rte" : "trk" ); } @@ -793,16 +830,29 @@ static void gpx_write_track ( VikTrack *t, GpxWritingContext *context ) // 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, "\n %s\n", t->visible ? "" : " hidden=\"hidden\"", tmp ); + fprintf ( f, "<%s%s>\n %s\n", + t->is_route ? "rte" : "trk", + t->visible ? "" : " hidden=\"hidden\"", + tmp ); g_free ( tmp ); if ( t->comment ) { tmp = entitize ( t->comment ); + fprintf ( f, " %s\n", tmp ); + g_free ( tmp ); + } + + if ( t->description ) + { + tmp = entitize ( t->description ); fprintf ( f, " %s\n", tmp ); g_free ( tmp ); } - fprintf ( f, " \n" ); + + /* No such thing as a rteseg! */ + if ( !t->is_route ) + fprintf ( f, " \n" ); if ( t->trackpoints && t->trackpoints->data ) { first_tp_is_newsegment = VIK_TRACKPOINT(t->trackpoints->data)->newsegment; @@ -811,7 +861,11 @@ static void gpx_write_track ( VikTrack *t, GpxWritingContext *context ) VIK_TRACKPOINT(t->trackpoints->data)->newsegment = first_tp_is_newsegment; /* restore state */ } - fprintf ( f, "\n\n" ); + /* NB apparently no such thing as a rteseg! */ + if (!t->is_route) + fprintf ( f, " \n"); + + fprintf ( f, "\n", t->is_route ? "rte" : "trk" ); } static void gpx_write_header( FILE *f ) @@ -828,37 +882,6 @@ static void gpx_write_footer( FILE *f ) fprintf(f, "\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; @@ -866,19 +889,41 @@ static int gpx_waypoint_compare(const void *x, const void *y) 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; - } + + if ( !tpa && tpb ) + return -1; + return 0; } @@ -899,23 +944,42 @@ void a_gpx_write_file ( VikTrwLayer *vtl, FILE *f, GpxWritingOptions *options ) } 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 ); }