X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/dd81e7621979eb3a2c1db1f63fe1453053786084..db771541ff9b86b3ef5e204d5d5d659ccf66e7e6:/src/gpx.c diff --git a/src/gpx.c b/src/gpx.c index 16ac2147..cc1a932d 100644 --- a/src/gpx.c +++ b/src/gpx.c @@ -1,7 +1,11 @@ /* * viking -- GPS Data and Topo Analyzer, Explorer, and Manager * - * Copyright (C) 2003-2005, Evan Battaglia + * Copyright (C) 2003-2007, Evan Battaglia + * Copyright (C) 2007, Quy Tonthat + * Copyright (C) 2008, Hein Ragas + * Copyright (C) 2009, Tal B + * Copyright (c) 2012-2014, Rob Norris * * Some of the code adapted from GPSBabel 1.2.7 * http://gpsbabel.sf.net/ @@ -22,43 +26,68 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #define _XOPEN_SOURCE /* glibc2 needs this */ #include "gpx.h" #include "viking.h" #include +#ifdef HAVE_STRING_H #include +#endif #include +#include +#include +#ifdef HAVE_MATH_H #include +#endif +#include typedef enum { tt_unknown = 0, tt_gpx, + tt_gpx_name, + tt_gpx_desc, + tt_gpx_author, + tt_gpx_time, + tt_gpx_keywords, 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_url, 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_trk_trkseg_trkpt_time, - /* extended */ + tt_trk_trkseg_trkpt_name, + /* extended */ tt_trk_trkseg_trkpt_course, tt_trk_trkseg_trkpt_speed, tt_trk_trkseg_trkpt_fix, tt_trk_trkseg_trkpt_sat, + tt_trk_trkseg_trkpt_hdop, + tt_trk_trkseg_trkpt_vdop, + tt_trk_trkseg_trkpt_pdop, + tt_waypoint, tt_waypoint_coord, tt_waypoint_name, @@ -75,13 +104,27 @@ typedef struct { } GpxWritingContext; /* - * xpath(ish) mappings between full tag paths and internal identifers. + * xpath(ish) mappings between full tag paths and internal identifiers. * These appear in the order they appear in the GPX specification. - * If it's not a tag we explictly handle, it doesn't go here. + * If it's not a tag we explicitly handle, it doesn't go here. */ tag_mapping tag_path_map[] = { + { tt_gpx, "/gpx" }, + { tt_gpx_name, "/gpx/name" }, + { tt_gpx_desc, "/gpx/desc" }, + { tt_gpx_time, "/gpx/time" }, + { tt_gpx_author, "/gpx/author" }, + { tt_gpx_keywords, "/gpx/keywords" }, + + // GPX 1.1 variant - basic properties moved into metadata namespace + { tt_gpx_name, "/gpx/metadata/name" }, + { tt_gpx_desc, "/gpx/metadata/desc" }, + { tt_gpx_time, "/gpx/metadata/time" }, + { tt_gpx_author, "/gpx/metadata/author" }, + { tt_gpx_keywords, "/gpx/metadata/keywords" }, + { tt_wpt, "/gpx/wpt" }, { tt_waypoint, "/loc/waypoint" }, @@ -89,27 +132,43 @@ tag_mapping tag_path_map[] = { { 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_url, "/gpx/wpt/url" }, { 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_course, "/gpx/trk/trkseg/trkpt/course" }, + { tt_trk_trkseg_trkpt_name, "/gpx/trk/trkseg/trkpt/name" }, + /* extended */ + { tt_trk_trkseg_trkpt_course, "/gpx/trk/trkseg/trkpt/course" }, { tt_trk_trkseg_trkpt_speed, "/gpx/trk/trkseg/trkpt/speed" }, { tt_trk_trkseg_trkpt_fix, "/gpx/trk/trkseg/trkpt/fix" }, { tt_trk_trkseg_trkpt_sat, "/gpx/trk/trkseg/trkpt/sat" }, + { 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_name, "/gpx/rte/rtept/name" }, + { tt_trk_trkseg_trkpt_ele, "/gpx/rte/rtept/ele" }, + {0} }; @@ -132,6 +191,7 @@ GString *c_cdata = NULL; VikTrackpoint *c_tp = NULL; VikWaypoint *c_wp = NULL; VikTrack *c_tr = NULL; +VikTRWMetadata *c_md = NULL; gchar *c_wp_name = NULL; gchar *c_tr_name = NULL; @@ -144,7 +204,7 @@ struct LatLon c_ll; 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 ) { @@ -159,8 +219,8 @@ static const char *get_attr ( const char **attr, const char *key ) static gboolean set_c_ll ( const char **attr ) { if ( (c_slat = get_attr ( attr, "lat" )) && (c_slon = get_attr ( attr, "lon" )) ) { - c_ll.lat = g_strtod(c_slat, NULL); - c_ll.lon = g_strtod(c_slon, NULL); + c_ll.lat = g_ascii_strtod(c_slat, NULL); + c_ll.lon = g_ascii_strtod(c_slon, NULL); return TRUE; } return FALSE; @@ -176,21 +236,29 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr) switch ( current_tag ) { + case tt_gpx: + c_md = vik_trw_metadata_new(); + break; + case tt_wpt: if ( set_c_ll( attr ) ) { c_wp = vik_waypoint_new (); - c_wp->altitude = VIK_DEFAULT_ALTITUDE; - 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; + vik_track_set_defaults ( c_tr ); + 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: @@ -200,7 +268,6 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr) case tt_trk_trkseg_trkpt: if ( set_c_ll( attr ) ) { c_tp = vik_trackpoint_new (); - c_tp->altitude = VIK_DEFAULT_ALTITUDE; vik_coord_load_from_latlon ( &(c_tp->coord), vik_trw_layer_get_coord_mode ( vtl ), &c_ll ); if ( f_tr_newseg ) { c_tp->newsegment = TRUE; @@ -210,12 +277,22 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr) } break; + case tt_gpx_name: + case tt_gpx_author: + case tt_gpx_desc: + case tt_gpx_keywords: + case tt_gpx_time: + case tt_trk_trkseg_trkpt_name: 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_url: 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 */ @@ -223,7 +300,6 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr) case tt_waypoint: c_wp = vik_waypoint_new (); - c_wp->altitude = VIK_DEFAULT_ALTITUDE; c_wp->visible = TRUE; break; @@ -248,15 +324,54 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr) 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 ); switch ( current_tag ) { + case tt_gpx: + vik_trw_layer_set_metadata ( vtl, c_md ); + c_md = NULL; + break; + + case tt_gpx_name: + vik_layer_rename ( VIK_LAYER(vtl), c_cdata->str ); + g_string_erase ( c_cdata, 0, -1 ); + break; + + case tt_gpx_author: + if ( c_md->author ) + g_free ( c_md->description ); + c_md->author = g_strdup ( c_cdata->str ); + g_string_erase ( c_cdata, 0, -1 ); + break; + + case tt_gpx_desc: + if ( c_md->description ) + g_free ( c_md->description ); + c_md->description = g_strdup ( c_cdata->str ); + g_string_erase ( c_cdata, 0, -1 ); + break; + + case tt_gpx_keywords: + if ( c_md->keywords ) + g_free ( c_md->keywords ); + c_md->keywords = g_strdup ( c_cdata->str ); + g_string_erase ( c_cdata, 0, -1 ); + break; + + case tt_gpx_time: + if ( c_md->timestamp ) + g_free ( c_md->timestamp ); + c_md->timestamp = g_strdup ( c_cdata->str ); + g_string_erase ( c_cdata, 0, -1 ); + break; + 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; @@ -265,7 +380,11 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) case tt_trk: if ( ! c_tr_name ) - c_tr_name = g_strdup_printf("VIKING_TR%d", unnamed_waypoints++); + 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; @@ -287,39 +406,65 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) break; case tt_wpt_ele: - c_wp->altitude = g_strtod ( c_cdata->str, NULL ); + c_wp->altitude = g_ascii_strtod ( c_cdata->str, NULL ); g_string_erase ( c_cdata, 0, -1 ); break; case tt_trk_trkseg_trkpt_ele: - c_tp->altitude = g_strtod ( c_cdata->str, NULL ); + c_tp->altitude = g_ascii_strtod ( c_cdata->str, NULL ); g_string_erase ( c_cdata, 0, -1 ); break; 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_wpt_url: + vik_waypoint_set_url ( c_wp, c_cdata->str ); + g_string_erase ( c_cdata, 0, -1 ); + break; + case tt_wpt_link: vik_waypoint_set_image ( c_wp, c_cdata->str ); g_string_erase ( c_cdata, 0, -1 ); break; case tt_wpt_sym: { - gchar *tmp_lower = g_utf8_strdown(c_cdata->str, -1); /* for things like Geocache */ - 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_name: + vik_trackpoint_set_name ( c_tp, c_cdata->str ); + 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; @@ -329,19 +474,16 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) break; case tt_trk_trkseg_trkpt_course: - c_tp->extended = TRUE; - c_tp->course = g_strtod ( c_cdata->str, NULL ); + c_tp->course = g_ascii_strtod ( c_cdata->str, NULL ); g_string_erase ( c_cdata, 0, -1 ); break; case tt_trk_trkseg_trkpt_speed: - c_tp->extended = TRUE; - c_tp->speed = g_strtod ( c_cdata->str, NULL ); + c_tp->speed = g_ascii_strtod ( c_cdata->str, NULL ); g_string_erase ( c_cdata, 0, -1 ); break; case tt_trk_trkseg_trkpt_fix: - c_tp->extended = TRUE; if (!strcmp("2d", c_cdata->str)) c_tp->fix_mode = VIK_GPS_MODE_2D; else if (!strcmp("3d", c_cdata->str)) @@ -352,11 +494,25 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) break; case tt_trk_trkseg_trkpt_sat: - c_tp->extended = TRUE; c_tp->nsats = atoi ( c_cdata->str ); g_string_erase ( c_cdata, 0, -1 ); break; + case tt_trk_trkseg_trkpt_hdop: + c_tp->hdop = g_strtod ( c_cdata->str, NULL ); + g_string_erase ( c_cdata, 0, -1 ); + break; + + case tt_trk_trkseg_trkpt_vdop: + c_tp->vdop = g_strtod ( c_cdata->str, NULL ); + g_string_erase ( c_cdata, 0, -1 ); + break; + + case tt_trk_trkseg_trkpt_pdop: + c_tp->pdop = g_strtod ( c_cdata->str, NULL ); + g_string_erase ( c_cdata, 0, -1 ); + break; + default: break; } @@ -366,19 +522,32 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) static void gpx_cdata(void *dta, const XML_Char *s, int len) { switch ( current_tag ) { + case tt_gpx_name: + case tt_gpx_author: + case tt_gpx_desc: + case tt_gpx_keywords: + case tt_gpx_time: case tt_wpt_name: 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_url: 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_name: case tt_trk_trkseg_trkpt_course: case tt_trk_trkseg_trkpt_speed: case tt_trk_trkseg_trkpt_fix: case tt_trk_trkseg_trkpt_sat: + case tt_trk_trkseg_trkpt_hdop: + case tt_trk_trkseg_trkpt_vdop: + case tt_trk_trkseg_trkpt_pdop: case tt_waypoint_name: /* .loc name is really description. */ g_string_append_len ( c_cdata, s, len ); break; @@ -390,9 +559,10 @@ static void gpx_cdata(void *dta, const XML_Char *s, int len) // make like a "stack" of tag names // like gpspoint's separated like /gpx/wpt/whatever -void a_gpx_read_file( VikTrwLayer *vtl, FILE *f ) { +gboolean a_gpx_read_file( VikTrwLayer *vtl, FILE *f ) { XML_Parser parser = XML_ParserCreate(NULL); int done=0, len; + enum XML_Status status = XML_STATUS_ERROR; XML_SetElementHandler(parser, (XML_StartElementHandler) gpx_start, (XML_EndElementHandler) gpx_end); XML_SetUserData(parser, vtl); /* in the future we could remove all global variables */ @@ -405,17 +575,21 @@ void a_gpx_read_file( VikTrwLayer *vtl, FILE *f ) { 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); done = feof(f) || !len; - XML_Parse(parser, buf, len, done); + status = XML_Parse(parser, buf, len, done); } + XML_ParserFree (parser); g_string_free ( xpath, TRUE ); g_string_free ( c_cdata, TRUE ); + + return status != XML_STATUS_ERROR; } /**** entitize from GPSBabel ****/ @@ -587,8 +761,12 @@ entitize(const char * str) /* export GPX */ -static void gpx_write_waypoint ( const gchar *name, VikWaypoint *wp, GpxWritingContext *context ) +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; @@ -596,12 +774,19 @@ static void gpx_write_waypoint ( const gchar *name, VikWaypoint *wp, GpxWritingC 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, "\n", s_lat, s_lon, wp->visible ? "" : " hidden=\"hidden\"" ); g_free ( s_lat ); g_free ( s_lon ); - tmp = entitize ( name ); + // Sanity clause + if ( wp->name ) + tmp = entitize ( wp->name ); + else + tmp = g_strdup ("waypoint"); + fprintf ( f, " %s\n", tmp ); g_free ( tmp); @@ -611,12 +796,36 @@ static void gpx_write_waypoint ( const gchar *name, VikWaypoint *wp, GpxWritingC fprintf ( f, " %s\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, " \n", time_iso8601 ); + g_free ( time_iso8601 ); + } + 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 ); } + if ( wp->url ) + { + tmp = entitize(wp->url); + fprintf ( f, " %s\n", tmp ); + g_free ( tmp ); + } if ( wp->image ) { tmp = entitize(wp->image); @@ -626,7 +835,14 @@ static void gpx_write_waypoint ( const gchar *name, VikWaypoint *wp, GpxWritingC if ( wp->symbol ) { tmp = entitize(wp->symbol); - fprintf ( f, " %s\n", tmp); + if ( a_vik_gpx_export_wpt_sym_name ( ) ) { + // Lowercase the symbol name + gchar *tmp2 = g_utf8_strdown ( tmp, -1 ); + fprintf ( f, " %s\n", tmp2 ); + g_free ( tmp2 ); + } + else + fprintf ( f, " %s\n", tmp); g_free ( tmp ); } @@ -637,19 +853,26 @@ static void gpx_write_trackpoint ( VikTrackpoint *tp, GpxWritingContext *context { FILE *f = context->file; static struct LatLon ll; - gchar *s_lat,*s_lon, *s_alt; + gchar *s_lat,*s_lon, *s_alt, *s_dop; 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; + if (tp->name) { + gchar *s_name = entitize(tp->name); + fprintf ( f, " %s\n", s_name ); + g_free(s_name); + } + s_alt = NULL; if ( tp->altitude != VIK_DEFAULT_ALTITUDE ) { @@ -667,6 +890,7 @@ static void gpx_write_trackpoint ( VikTrackpoint *tp, GpxWritingContext *context if ( tp->has_timestamp ) { GTimeVal timestamp; timestamp.tv_sec = tp->timestamp; + timestamp.tv_usec = 0; time_iso8601 = g_time_val_to_iso8601 ( ×tamp ); } @@ -682,47 +906,93 @@ static void gpx_write_trackpoint ( VikTrackpoint *tp, GpxWritingContext *context g_free(time_iso8601); time_iso8601 = NULL; - if (tp->extended && (tp->fix_mode >= VIK_GPS_MODE_2D)) { - if (!isnan(tp->course)) { - gchar *s_course = a_coords_dtostr(tp->course); - fprintf ( f, " %s\n", s_course ); - g_free(s_course); - } - if (!isnan(tp->speed)) { - gchar *s_speed = a_coords_dtostr(tp->speed); - fprintf ( f, " %s\n", s_speed ); - g_free(s_speed); - } - if (tp->fix_mode == VIK_GPS_MODE_2D) - fprintf ( f, " 2d\n"); - if (tp->fix_mode == VIK_GPS_MODE_3D) - fprintf ( f, " 3d\n"); - if (tp->nsats > 0) - fprintf ( f, " %d\n", tp->nsats ); + if (!isnan(tp->course)) { + gchar *s_course = a_coords_dtostr(tp->course); + fprintf ( f, " %s\n", s_course ); + g_free(s_course); + } + if (!isnan(tp->speed)) { + gchar *s_speed = a_coords_dtostr(tp->speed); + fprintf ( f, " %s\n", s_speed ); + g_free(s_speed); + } + if (tp->fix_mode == VIK_GPS_MODE_2D) + fprintf ( f, " 2d\n"); + if (tp->fix_mode == VIK_GPS_MODE_3D) + fprintf ( f, " 3d\n"); + if (tp->nsats > 0) + fprintf ( f, " %d\n", tp->nsats ); + + s_dop = NULL; + if ( tp->hdop != VIK_DEFAULT_DOP ) + { + s_dop = a_coords_dtostr ( tp->hdop ); + } + if (s_dop != NULL) + fprintf ( f, " %s\n", s_dop ); + g_free ( s_dop ); s_dop = NULL; + + if ( tp->vdop != VIK_DEFAULT_DOP ) + { + s_dop = a_coords_dtostr ( tp->vdop ); + } + if (s_dop != NULL) + fprintf ( f, " %s\n", s_dop ); + g_free ( s_dop ); s_dop = NULL; + + if ( tp->pdop != VIK_DEFAULT_DOP ) + { + s_dop = a_coords_dtostr ( tp->pdop ); } + if (s_dop != NULL) + 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" ); } -static void gpx_write_track ( const gchar *name, VikTrack *t, GpxWritingContext *context ) +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. */ - tmp = entitize ( name ); - fprintf ( f, "\n %s\n", t->visible ? "" : " hidden=\"hidden\"", tmp ); + // Sanity clause + if ( t->name ) + tmp = entitize ( t->name ); + else + tmp = g_strdup ("track"); + + // 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 %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; @@ -731,7 +1001,11 @@ static void gpx_write_track ( const gchar *name, VikTrack *t, GpxWritingContext 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 ) @@ -748,73 +1022,182 @@ static void gpx_write_footer( FILE *f ) fprintf(f, "\n"); } - - -typedef struct { - VikWaypoint *wp; - const gchar *name; -} gpx_waypoint_and_name; - -typedef struct { - gpx_waypoint_and_name *wps; - guint i; - guint n_wps; -} gpx_gather_waypoints_passalong_t; - -static void gpx_collect_waypoint ( const gchar *name, VikWaypoint *wp, gpx_gather_waypoints_passalong_t *passalong ) -{ - if ( passalong->i < passalong->n_wps ) { - passalong->wps[passalong->i].name = name; - passalong->wps[passalong->i].wp = wp; - passalong->i++; - } -} - -static int gpx_waypoint_and_name_compar(const void *x, const void *y) +static int gpx_waypoint_compare(const void *x, const void *y) { - gpx_waypoint_and_name *a = (gpx_waypoint_and_name *)x; - gpx_waypoint_and_name *b = (gpx_waypoint_and_name *)y; + VikWaypoint *a = (VikWaypoint *)x; + VikWaypoint *b = (VikWaypoint *)y; return strcmp(a->name,b->name); } -void a_gpx_write_file( VikTrwLayer *vtl, FILE *f ) +static int gpx_track_compare_name(const void *x, const void *y) { - a_gpx_write_file_options(NULL, vtl, f); + VikTrack *a = (VikTrack *)x; + VikTrack *b = (VikTrack *)y; + return strcmp(a->name,b->name); } -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 }; - int i; gpx_write_header ( f ); + gchar *tmp; + const gchar *name = vik_layer_get_name(VIK_LAYER(vtl)); + if ( name ) { + tmp = entitize ( name ); + fprintf ( f, " %s\n", tmp ); + g_free ( tmp ); + } - gpx_gather_waypoints_passalong_t passalong; - passalong.n_wps = g_hash_table_size ( vik_trw_layer_get_waypoints ( vtl ) ); - passalong.i = 0; - passalong.wps = g_new(gpx_waypoint_and_name,passalong.n_wps); - g_hash_table_foreach ( vik_trw_layer_get_waypoints ( vtl ), (GHFunc) gpx_collect_waypoint, &passalong ); - /* gather waypoints in a list, then sort */ - qsort(passalong.wps, passalong.n_wps, sizeof(gpx_waypoint_and_name), gpx_waypoint_and_name_compar); - for ( i = 0; i < passalong.n_wps; i++ ) - gpx_write_waypoint ( passalong.wps[i].name, passalong.wps[i].wp, &context); - g_free ( passalong.wps ); + VikTRWMetadata *md = vik_trw_layer_get_metadata (vtl); + if ( md ) { + if ( md->author ) { + tmp = entitize ( md->author ); + fprintf ( f, " %s\n", tmp ); + g_free ( tmp ); + } + if ( md->description ) { + tmp = entitize ( md->description ); + fprintf ( f, " %s\n", tmp ); + g_free ( tmp ); + } + if ( md->timestamp ) { + tmp = entitize ( md->timestamp ); + fprintf ( f, " \n", tmp ); + g_free ( tmp ); + } + if ( md->keywords ) { + tmp = entitize ( md->keywords ); + fprintf ( f, " %s\n", tmp ); + g_free ( tmp ); + } + } - g_hash_table_foreach ( vik_trw_layer_get_tracks ( vtl ), (GHFunc) gpx_write_track, &context ); + if ( vik_trw_layer_get_waypoints_visibility(vtl) || (options && options->hidden) ) { + // gather waypoints in a list, then sort + GList *gl = g_hash_table_get_values ( vik_trw_layer_get_waypoints ( vtl ) ); + gl = g_list_sort ( gl, gpx_waypoint_compare ); - gpx_write_footer ( f ); -} + for (GList *iter = g_list_first (gl); iter != NULL; iter = g_list_next (iter)) { + gpx_write_waypoint ( (VikWaypoint*)iter->data, &context ); + } + g_list_free ( gl ); + } -void a_gpx_write_track_file ( const gchar *name, VikTrack *t, FILE *f ) -{ - a_gpx_write_track_file_options ( NULL, name, t, f ); + GList *gl = NULL; + if ( vik_trw_layer_get_tracks_visibility(vtl) || (options && options->hidden) ) { + //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 + 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, vik_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 ); + } + + GList *glrte = NULL; + // Routes sorted by name + if ( vik_trw_layer_get_tracks_visibility(vtl) || (options && options->hidden) ) { + 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, 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 (GList *iter = g_list_first (gl); iter != NULL; iter = g_list_next (iter)) { + gpx_write_track ( (VikTrack*)iter->data, &context_tmp ); + } + + // Routes (to get routepoints) + context_tmp.options->is_route = TRUE; + for (GList *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 ); } -void a_gpx_write_track_file_options ( GpxWritingOptions *options, const gchar *name, VikTrack *t, FILE *f ) +void a_gpx_write_track_file ( VikTrack *trk, FILE *f, GpxWritingOptions *options ) { GpxWritingContext context = {options, f}; gpx_write_header ( f ); - gpx_write_track ( name, t, &context ); + gpx_write_track ( trk, &context ); gpx_write_footer ( f ); } + +/** + * Common write of a temporary GPX file + */ +static gchar* write_tmp_file ( VikTrwLayer *vtl, VikTrack *trk, GpxWritingOptions *options ) +{ + gchar *tmp_filename = NULL; + GError *error = NULL; + // Opening temporary file + int fd = g_file_open_tmp("viking_XXXXXX.gpx", &tmp_filename, &error); + if (fd < 0) { + g_warning ( _("failed to open temporary file: %s"), error->message ); + g_clear_error ( &error ); + return NULL; + } + g_debug ("%s: temporary file = %s", __FUNCTION__, tmp_filename); + + FILE *ff = fdopen (fd, "w"); + + if ( trk ) + a_gpx_write_track_file ( trk, ff, options ); + else + a_gpx_write_file ( vtl, ff, options ); + + fclose (ff); + + return tmp_filename; +} + +/* + * a_gpx_write_tmp_file: + * @vtl: The #VikTrwLayer to write + * @options: Possible ways of writing the file data (can be NULL) + * + * Returns: The name of newly created temporary GPX file + * This file should be removed once used and the string freed. + * If NULL then the process failed. + */ +gchar* a_gpx_write_tmp_file ( VikTrwLayer *vtl, GpxWritingOptions *options ) +{ + return write_tmp_file ( vtl, NULL, options ); +} + +/* + * a_gpx_write_track_tmp_file: + * @trk: The #VikTrack to write + * @options: Possible ways of writing the file data (can be NULL) + * + * Returns: The name of newly created temporary GPX file + * This file should be removed once used and the string freed. + * If NULL then the process failed. + */ +gchar* a_gpx_write_track_tmp_file ( VikTrack *trk, GpxWritingOptions *options ) +{ + return write_tmp_file ( NULL, trk, options ); +}