* 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_sym,
+ tt_wpt_sym,
+ tt_wpt_time,
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_waypoint_name, "/loc/waypoint/name" },
{ tt_wpt_ele, "/gpx/wpt/ele" },
+ { tt_wpt_time, "/gpx/wpt/time" },
{ 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}
};
gboolean f_tr_newseg;
guint unnamed_waypoints = 0;
guint unnamed_tracks = 0;
-
+guint unnamed_routes = 0;
static const char *get_attr ( const char **attr, const char *key )
{
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;
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_time:
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 */
static void gpx_end(VikTrwLayer *vtl, const char *el)
{
static GTimeVal tp_time;
+ static GTimeVal wp_time;
g_string_truncate ( xpath, xpath->len - strlen(el) - 1 );
case tt_waypoint:
case tt_wpt:
if ( ! c_wp_name )
- c_wp_name = g_strdup_printf("VIKING_WP%d", unnamed_waypoints++);
+ c_wp_name = g_strdup_printf("VIKING_WP%04d", unnamed_waypoints++);
vik_trw_layer_filein_add_waypoint ( vtl, c_wp_name, c_wp );
g_free ( c_wp_name );
c_wp = NULL;
case tt_trk:
if ( ! c_tr_name )
- c_tr_name = g_strdup_printf("VIKING_TR%d", unnamed_tracks++);
+ c_tr_name = g_strdup_printf("VIKING_TR%03d", unnamed_tracks++);
+ // Delibrate fall through
+ case tt_rte:
+ if ( ! c_tr_name )
+ c_tr_name = g_strdup_printf("VIKING_RT%03d", unnamed_routes++);
vik_trw_layer_filein_add_track ( vtl, c_tr_name, c_tr );
g_free ( c_tr_name );
c_tr = NULL;
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;
break;
case tt_wpt_sym: {
- gchar *tmp_lower = g_utf8_strdown(c_cdata->str, -1); /* for things like <type>Geocache</type> */
- vik_waypoint_set_symbol ( c_wp, tmp_lower );
- g_free ( tmp_lower );
+ vik_waypoint_set_symbol ( 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_wpt_time:
+ if ( g_time_val_from_iso8601(c_cdata->str, &wp_time) ) {
+ c_wp->timestamp = wp_time.tv_sec;
+ c_wp->has_timestamp = TRUE;
+ }
+ g_string_erase ( c_cdata, 0, -1 );
+ break;
+
case tt_trk_trkseg_trkpt_time:
if ( g_time_val_from_iso8601(c_cdata->str, &tp_time) ) {
c_tp->timestamp = tp_time.tv_sec;
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_wpt_time:
case tt_trk_trkseg_trkpt_course:
case tt_trk_trkseg_trkpt_speed:
case tt_trk_trkseg_trkpt_fix:
xpath = g_string_new ( "" );
c_cdata = g_string_new ( "" );
- unnamed_waypoints = 0;
- unnamed_tracks = 0;
+ unnamed_waypoints = 1;
+ unnamed_tracks = 1;
+ unnamed_routes = 1;
while (!done) {
len = fread(buf, 1, sizeof(buf)-7, f);
fprintf ( f, " <ele>%s</ele>\n", tmp );
g_free ( tmp );
}
+
+ if ( wp->has_timestamp ) {
+ GTimeVal timestamp;
+ timestamp.tv_sec = wp->timestamp;
+ timestamp.tv_usec = 0;
+
+ gchar *time_iso8601 = g_time_val_to_iso8601 ( ×tamp );
+ if ( time_iso8601 != NULL )
+ fprintf ( f, " <time>%s</time>\n", time_iso8601 );
+ g_free ( time_iso8601 );
+ }
+
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 );
}
if ( wp->symbol )
{
tmp = entitize(wp->symbol);
- fprintf ( f, " <sym>%s</sym>\n", tmp);
+ if ( a_vik_gpx_export_wpt_sym_name ( ) ) {
+ // Lowercase the symbol name
+ gchar *tmp2 = g_utf8_strdown ( tmp, -1 );
+ fprintf ( f, " <sym>%s</sym>\n", tmp2 );
+ g_free ( tmp2 );
+ }
+ else
+ fprintf ( f, " <sym>%s</sym>\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" );
}
// 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, "<trk%s>\n <name>%s</name>\n", t->visible ? "" : " hidden=\"hidden\"", tmp );
+ 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 )
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_compare_timestamp (const void *x, const void *y)
{
}
g_list_free ( gl );
- /* Sort by timestamp */
- gl = g_hash_table_get_values ( vik_trw_layer_get_tracks ( vtl ) );
- gl = g_list_sort ( gl, gpx_track_compare_timestamp );
+ //gl = g_hash_table_get_values ( vik_trw_layer_get_tracks ( vtl ) );
+ // Forming the list manually seems to produce one that is more likely to be nearer to the creation order
+ gl = NULL;
+ gpointer key, value;
+ GHashTableIter ght_iter;
+ g_hash_table_iter_init ( &ght_iter, vik_trw_layer_get_tracks ( vtl ) );
+ while ( g_hash_table_iter_next (&ght_iter, &key, &value) ) {
+ gl = g_list_prepend ( gl ,value );
+ }
+ gl = g_list_reverse ( gl );
+
+ // 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 if ( a_vik_get_gpx_export_trk_sort() == VIK_GPX_EXPORT_TRK_SORT_ALPHA )
+ 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 );
gpx_write_footer ( f );
}
projects / andy / viking.git / blobdiff