X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/5092de80d905b2500af04ec610db0e05a8a24225..80471a6a905e00bf80ad04fa2061f88ea81f15cb:/src/gpx.c?ds=inline diff --git a/src/gpx.c b/src/gpx.c index 53c08b88..7f30d719 100644 --- a/src/gpx.c +++ b/src/gpx.c @@ -26,14 +26,13 @@ #define _XOPEN_SOURCE /* glibc2 needs this */ +#include "gpx.h" #include "viking.h" #include #include #include #include -#define GPX_TIME_FORMAT "%Y-%m-%dT%H:%M:%SZ" - typedef enum { tt_unknown = 0, @@ -54,6 +53,11 @@ typedef enum { tt_trk_trkseg_trkpt, tt_trk_trkseg_trkpt_ele, tt_trk_trkseg_trkpt_time, + /* extended */ + tt_trk_trkseg_trkpt_course, + tt_trk_trkseg_trkpt_speed, + tt_trk_trkseg_trkpt_fix, + tt_trk_trkseg_trkpt_sat, tt_waypoint, tt_waypoint_coord, @@ -65,6 +69,11 @@ typedef struct tag_mapping { const char *tag_name; /* xpath-ish tag name */ } tag_mapping; +typedef struct { + GpxWritingOptions *options; + FILE *file; +} GpxWritingContext; + /* * xpath(ish) mappings between full tag paths and internal identifers. * These appear in the order they appear in the GPX specification. @@ -95,6 +104,11 @@ tag_mapping tag_path_map[] = { { 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_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" }, {0} }; @@ -233,7 +247,8 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr) static void gpx_end(VikTrwLayer *vtl, const char *el) { - static struct tm tm; + static GTimeVal tp_time; + g_string_truncate ( xpath, xpath->len - strlen(el) - 1 ); switch ( current_tag ) { @@ -306,14 +321,42 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) break; case tt_trk_trkseg_trkpt_time: - - if ( strptime(c_cdata->str, GPX_TIME_FORMAT, &tm) != c_cdata->str ) { /* it read at least one char */ - c_tp->timestamp = mktime(&tm); + if ( g_time_val_from_iso8601(c_cdata->str, &tp_time) ) { + c_tp->timestamp = tp_time.tv_sec; c_tp->has_timestamp = TRUE; } g_string_erase ( c_cdata, 0, -1 ); break; + case tt_trk_trkseg_trkpt_course: + c_tp->extended = TRUE; + c_tp->course = g_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 ); + 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)) + c_tp->fix_mode = VIK_GPS_MODE_3D; + else /* TODO: more fix modes here */ + c_tp->fix_mode = VIK_GPS_MODE_NOT_SEEN; + g_string_erase ( c_cdata, 0, -1 ); + 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; + default: break; } @@ -332,6 +375,10 @@ static void gpx_cdata(void *dta, const XML_Char *s, int len) case tt_wpt_link: case tt_trk_desc: case tt_trk_trkseg_trkpt_time: + 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_waypoint_name: /* .loc name is really description. */ g_string_append_len ( c_cdata, s, len ); break; @@ -540,8 +587,9 @@ entitize(const char * str) /* export GPX */ -static void gpx_write_waypoint ( const gchar *name, VikWaypoint *wp, FILE *f ) +static void gpx_write_waypoint ( const gchar *name, VikWaypoint *wp, GpxWritingContext *context ) { + FILE *f = context->file; static struct LatLon ll; gchar *s_lat,*s_lon; gchar *tmp; @@ -585,11 +633,12 @@ static void gpx_write_waypoint ( const gchar *name, VikWaypoint *wp, FILE *f ) fprintf ( f, "\n" ); } -static void gpx_write_trackpoint ( VikTrackpoint *tp, FILE *f ) +static void gpx_write_trackpoint ( VikTrackpoint *tp, GpxWritingContext *context ) { + FILE *f = context->file; static struct LatLon ll; gchar *s_lat,*s_lon, *s_alt; - static gchar time_buf[30]; + gchar *time_iso8601; vik_coord_to_latlon ( &(tp->coord), &ll ); if ( tp->newsegment ) @@ -598,25 +647,68 @@ static void gpx_write_trackpoint ( VikTrackpoint *tp, FILE *f ) s_lat = a_coords_dtostr( ll.lat ); s_lon = a_coords_dtostr( ll.lon ); fprintf ( f, " \n", s_lat, s_lon ); - g_free ( s_lat ); - g_free ( s_lon ); + g_free ( s_lat ); s_lat = NULL; + g_free ( s_lon ); s_lon = NULL; + s_alt = NULL; if ( tp->altitude != VIK_DEFAULT_ALTITUDE ) { s_alt = a_coords_dtostr ( tp->altitude ); - fprintf ( f, " %s\n", s_alt ); - g_free ( s_alt ); } + else if ( context->options != NULL && context->options->force_ele ) + { + s_alt = a_coords_dtostr ( 0 ); + } + if (s_alt != NULL) + fprintf ( f, " %s\n", s_alt ); + g_free ( s_alt ); s_alt = NULL; + + time_iso8601 = NULL; if ( tp->has_timestamp ) { - time_buf [ strftime ( time_buf, sizeof(time_buf)-1, GPX_TIME_FORMAT, localtime(&(tp->timestamp)) ) ] = '\0'; - fprintf ( f, " \n", time_buf ); + GTimeVal timestamp; + timestamp.tv_sec = tp->timestamp; + timestamp.tv_usec = 0; + + time_iso8601 = g_time_val_to_iso8601 ( ×tamp ); + } + else if ( context->options != NULL && context->options->force_time ) + { + GTimeVal current; + g_get_current_time ( ¤t ); + + time_iso8601 = g_time_val_to_iso8601 ( ¤t ); + } + if ( time_iso8601 != NULL ) + fprintf ( f, " \n", time_iso8601 ); + 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 ); } + fprintf ( f, " \n" ); } -static void gpx_write_track ( const gchar *name, VikTrack *t, FILE *f ) +static void gpx_write_track ( const gchar *name, VikTrack *t, GpxWritingContext *context ) { + 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. */ @@ -636,7 +728,7 @@ static void gpx_write_track ( const gchar *name, VikTrack *t, FILE *f ) if ( t->trackpoints && t->trackpoints->data ) { first_tp_is_newsegment = VIK_TRACKPOINT(t->trackpoints->data)->newsegment; VIK_TRACKPOINT(t->trackpoints->data)->newsegment = FALSE; /* so we won't write already */ - g_list_foreach ( t->trackpoints, (GFunc) gpx_write_trackpoint, f ); + g_list_foreach ( t->trackpoints, (GFunc) gpx_write_trackpoint, context ); VIK_TRACKPOINT(t->trackpoints->data)->newsegment = first_tp_is_newsegment; /* restore state */ } @@ -657,17 +749,73 @@ 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) +{ + gpx_waypoint_and_name *a = (gpx_waypoint_and_name *)x; + gpx_waypoint_and_name *b = (gpx_waypoint_and_name *)y; + return strcmp(a->name,b->name); +} + void a_gpx_write_file( VikTrwLayer *vtl, FILE *f ) { + a_gpx_write_file_options(NULL, vtl, f); +} + +void a_gpx_write_file_options ( GpxWritingOptions *options, VikTrwLayer *vtl, FILE *f ) +{ + GpxWritingContext context = { options, f }; + int i; + gpx_write_header ( f ); - g_hash_table_foreach ( vik_trw_layer_get_waypoints ( vtl ), (GHFunc) gpx_write_waypoint, f ); - g_hash_table_foreach ( vik_trw_layer_get_tracks ( vtl ), (GHFunc) gpx_write_track, f ); + + + 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 ); + + g_hash_table_foreach ( vik_trw_layer_get_tracks ( vtl ), (GHFunc) gpx_write_track, &context ); + gpx_write_footer ( f ); } void a_gpx_write_track_file ( const gchar *name, VikTrack *t, FILE *f ) { + a_gpx_write_track_file_options ( NULL, name, t, f ); +} + +void a_gpx_write_track_file_options ( GpxWritingOptions *options, const gchar *name, VikTrack *t, FILE *f ) +{ + GpxWritingContext context = {options, f}; gpx_write_header ( f ); - gpx_write_track ( name, t, f ); + gpx_write_track ( name, t, &context ); gpx_write_footer ( f ); }