* 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>
+ * Copyright (c) 2012-2014, Rob Norris <rw_norris@hotmail.com>
*
* Some of the code adapted from GPSBabel 1.2.7
* http://gpsbabel.sf.net/
#include <string.h>
#endif
#include <glib.h>
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
#ifdef HAVE_MATH_H
#include <math.h>
#endif
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_src,
+ tt_wpt_type,
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_src,
+ tt_trk_type,
tt_trk_name,
tt_rte,
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,
} 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" },
{ 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_src, "/gpx/wpt/src" },
+ { tt_wpt_type, "/gpx/wpt/type" },
{ 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_name, "/gpx/trk/name" },
{ tt_trk_cmt, "/gpx/trk/cmt" },
{ tt_trk_desc, "/gpx/trk/desc" },
+ { tt_trk_src, "/gpx/trk/src" },
+ { tt_trk_type, "/gpx/trk/type" },
{ tt_trk_trkseg, "/gpx/trk/trkseg" },
{ tt_trk_trkseg_trkpt, "/gpx/trk/trkseg/trkpt" },
{ 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_name, "/gpx/rte/name" },
{ tt_trk_cmt, "/gpx/rte/cmt" },
{ tt_trk_desc, "/gpx/rte/desc" },
+ { tt_trk_src, "/gpx/rte/src" },
{ 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}
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;
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 )
{
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 ();
case tt_trk:
case tt_rte:
c_tr = vik_track_new ();
+ 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" ) )
}
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_src:
+ case tt_wpt_type:
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_src:
+ case tt_trk_type:
case tt_trk_name:
g_string_erase ( c_cdata, 0, -1 ); /* clear the cdata buffer */
break;
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->author );
+ 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;
break;
case tt_trk:
+ if ( ! c_tr_name )
+ 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_TR%d", unnamed_tracks++);
+ 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;
g_string_erase ( c_cdata, 0, -1 );
break;
+ case tt_wpt_src:
+ vik_waypoint_set_source ( c_wp, c_cdata->str );
+ g_string_erase ( c_cdata, 0, -1 );
+ break;
+
+ case tt_wpt_type:
+ vik_waypoint_set_type ( 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 );
g_string_erase ( c_cdata, 0, -1 );
break;
+ case tt_trk_src:
+ vik_track_set_source ( c_tr, c_cdata->str );
+ g_string_erase ( c_cdata, 0, -1 );
+ break;
+
+ case tt_trk_type:
+ vik_track_set_type ( 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;
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 */
+ else if (!strcmp("dgps", c_cdata->str))
+ c_tp->fix_mode = VIK_GPS_MODE_DGPS;
+ else if (!strcmp("pps", c_cdata->str))
+ c_tp->fix_mode = VIK_GPS_MODE_PPS;
+ else
c_tp->fix_mode = VIK_GPS_MODE_NOT_SEEN;
g_string_erase ( c_cdata, 0, -1 );
break;
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_src:
+ case tt_wpt_type:
case tt_wpt_sym:
+ case tt_wpt_url:
case tt_wpt_link:
case tt_trk_cmt:
case tt_trk_desc:
+ case tt_trk_src:
+ case tt_trk_type:
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:
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);
return;
FILE *f = context->file;
- static struct LatLon ll;
- gchar *s_lat,*s_lon;
+ struct LatLon ll;
+ gchar s_lat[COORDS_STR_BUFFER_SIZE];
+ gchar s_lon[COORDS_STR_BUFFER_SIZE];
gchar *tmp;
vik_coord_to_latlon ( &(wp->coord), &ll );
- s_lat = a_coords_dtostr( ll.lat );
- s_lon = a_coords_dtostr( ll.lon );
+ a_coords_dtostr_buffer ( ll.lat, s_lat );
+ a_coords_dtostr_buffer ( ll.lon, s_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 );
- g_free ( s_lon );
// Sanity clause
if ( wp->name )
if ( wp->altitude != VIK_DEFAULT_ALTITUDE )
{
- tmp = a_coords_dtostr ( wp->altitude );
- fprintf ( f, " <ele>%s</ele>\n", tmp );
- g_free ( tmp );
+ gchar s_alt[COORDS_STR_BUFFER_SIZE];
+ a_coords_dtostr_buffer ( wp->altitude, s_alt );
+ fprintf ( f, " <ele>%s</ele>\n", s_alt );
+ }
+
+ 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, " <desc>%s</desc>\n", tmp );
g_free ( tmp );
}
+ if ( wp->source )
+ {
+ tmp = entitize(wp->source);
+ fprintf ( f, " <src>%s</src>\n", tmp );
+ g_free ( tmp );
+ }
+ if ( wp->type )
+ {
+ tmp = entitize(wp->type);
+ fprintf ( f, " <type>%s</type>\n", tmp );
+ g_free ( tmp );
+ }
+ if ( wp->url )
+ {
+ tmp = entitize(wp->url);
+ fprintf ( f, " <url>%s</url>\n", tmp );
+ g_free ( tmp );
+ }
if ( wp->image )
{
tmp = entitize(wp->image);
static void gpx_write_trackpoint ( VikTrackpoint *tp, GpxWritingContext *context )
{
FILE *f = context->file;
- static struct LatLon ll;
- gchar *s_lat,*s_lon, *s_alt, *s_dop;
+ struct LatLon ll;
+ gchar s_lat[COORDS_STR_BUFFER_SIZE];
+ gchar s_lon[COORDS_STR_BUFFER_SIZE];
+ gchar s_alt[COORDS_STR_BUFFER_SIZE];
+ gchar s_dop[COORDS_STR_BUFFER_SIZE];
gchar *time_iso8601;
vik_coord_to_latlon ( &(tp->coord), &ll );
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 );
+ a_coords_dtostr_buffer ( ll.lat, s_lat );
+ a_coords_dtostr_buffer ( ll.lon, 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;
- s_alt = NULL;
+ if (tp->name) {
+ gchar *s_name = entitize(tp->name);
+ fprintf ( f, " <name>%s</name>\n", s_name );
+ g_free(s_name);
+ }
+
if ( tp->altitude != VIK_DEFAULT_ALTITUDE )
{
- s_alt = a_coords_dtostr ( tp->altitude );
+ a_coords_dtostr_buffer ( tp->altitude, s_alt );
+ fprintf ( f, " <ele>%s</ele>\n", s_alt );
}
else if ( context->options != NULL && context->options->force_ele )
{
- s_alt = a_coords_dtostr ( 0 );
+ fprintf ( f, " <ele>0</ele>\n" );
}
- if (s_alt != NULL)
- fprintf ( f, " <ele>%s</ele>\n", s_alt );
- g_free ( s_alt ); s_alt = NULL;
time_iso8601 = NULL;
if ( tp->has_timestamp ) {
time_iso8601 = NULL;
if (!isnan(tp->course)) {
- gchar *s_course = a_coords_dtostr(tp->course);
+ gchar s_course[COORDS_STR_BUFFER_SIZE];
+ a_coords_dtostr_buffer ( tp->course, s_course );
fprintf ( f, " <course>%s</course>\n", s_course );
- g_free(s_course);
}
if (!isnan(tp->speed)) {
- gchar *s_speed = a_coords_dtostr(tp->speed);
+ gchar s_speed[COORDS_STR_BUFFER_SIZE];
+ a_coords_dtostr_buffer ( tp->speed, s_speed );
fprintf ( f, " <speed>%s</speed>\n", s_speed );
- g_free(s_speed);
}
if (tp->fix_mode == VIK_GPS_MODE_2D)
fprintf ( f, " <fix>2d</fix>\n");
if (tp->fix_mode == VIK_GPS_MODE_3D)
fprintf ( f, " <fix>3d</fix>\n");
+ if (tp->fix_mode == VIK_GPS_MODE_DGPS)
+ fprintf ( f, " <fix>dgps</fix>\n");
+ if (tp->fix_mode == VIK_GPS_MODE_PPS)
+ fprintf ( f, " <fix>pps</fix>\n");
if (tp->nsats > 0)
fprintf ( f, " <sat>%d</sat>\n", tp->nsats );
- s_dop = NULL;
- if ( tp->hdop != VIK_DEFAULT_DOP )
- {
- s_dop = a_coords_dtostr ( tp->hdop );
- }
- if (s_dop != NULL)
+ if ( tp->hdop != VIK_DEFAULT_DOP ) {
+ a_coords_dtostr_buffer ( tp->hdop, s_dop );
fprintf ( f, " <hdop>%s</hdop>\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, " <vdop>%s</vdop>\n", s_dop );
- g_free ( s_dop ); s_dop = NULL;
- if ( tp->pdop != VIK_DEFAULT_DOP )
- {
- s_dop = a_coords_dtostr ( tp->pdop );
+ if ( tp->vdop != VIK_DEFAULT_DOP ) {
+ a_coords_dtostr_buffer ( tp->vdop, s_dop );
+ fprintf ( f, " <vdop>%s</vdop>\n", s_dop );
}
- if (s_dop != NULL)
+
+ if ( tp->pdop != VIK_DEFAULT_DOP ) {
+ a_coords_dtostr_buffer ( tp->pdop, s_dop );
fprintf ( f, " <pdop>%s</pdop>\n", s_dop );
- g_free ( s_dop ); s_dop = NULL;
+ }
fprintf ( f, " </%spt>\n", (context->options && context->options->is_route) ? "rte" : "trk" );
}
g_free ( tmp );
}
+ if ( t->source )
+ {
+ tmp = entitize ( t->source );
+ fprintf ( f, " <src>%s</src>\n", tmp );
+ g_free ( tmp );
+ }
+
+ if ( t->type )
+ {
+ tmp = entitize ( t->type );
+ fprintf ( f, " <type>%s</type>\n", tmp );
+ g_free ( tmp );
+ }
+
/* No such thing as a rteseg! */
if ( !t->is_route )
fprintf ( f, " <trkseg>\n" );
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)
-{
- 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 ( tpa && !tpb )
- return 1;
-
- if ( !tpa && tpb )
- return -1;
-
- return 0;
-}
-
void a_gpx_write_file ( VikTrwLayer *vtl, FILE *f, GpxWritingOptions *options )
{
GpxWritingContext context = { options, f };
gpx_write_header ( f );
- // gather waypoints in a list, then sort
- // g_hash_table_get_values: glib 2.14+
- GList *gl = g_hash_table_get_values ( vik_trw_layer_get_waypoints ( vtl ) );
- gl = g_list_sort ( gl, gpx_waypoint_compare );
+ gchar *tmp;
+ const gchar *name = vik_layer_get_name(VIK_LAYER(vtl));
+ if ( name ) {
+ tmp = entitize ( name );
+ fprintf ( f, " <name>%s</name>\n", tmp );
+ g_free ( tmp );
+ }
- GList *iter;
- for (iter = g_list_first (gl); iter != NULL; iter = g_list_next (iter)) {
- gpx_write_waypoint ( (VikWaypoint*)iter->data, &context );
+ VikTRWMetadata *md = vik_trw_layer_get_metadata (vtl);
+ if ( md ) {
+ if ( md->author && strlen(md->author) > 0 ) {
+ tmp = entitize ( md->author );
+ fprintf ( f, " <author>%s</author>\n", tmp );
+ g_free ( tmp );
+ }
+ if ( md->description && strlen(md->description) > 0) {
+ tmp = entitize ( md->description );
+ fprintf ( f, " <desc>%s</desc>\n", tmp );
+ g_free ( tmp );
+ }
+ if ( md->timestamp ) {
+ tmp = entitize ( md->timestamp );
+ fprintf ( f, " <time>%s</time>\n", tmp );
+ g_free ( tmp );
+ }
+ if ( md->keywords && strlen(md->keywords) > 0) {
+ tmp = entitize ( md->keywords );
+ fprintf ( f, " <keywords>%s</keywords>\n", tmp );
+ g_free ( tmp );
+ }
}
- g_list_free ( gl );
+ 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 );
- gl = g_hash_table_get_values ( vik_trw_layer_get_tracks ( vtl ) );
- // 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 );
+ 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 );
+ }
+
+ 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
- GList *glrte = g_hash_table_get_values ( vik_trw_layer_get_routes ( vtl ) );
- glrte = g_list_sort ( glrte, gpx_track_compare_name );
+ if ( vik_trw_layer_get_routes_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 };
+ 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 (iter = g_list_first (gl); iter != NULL; iter = g_list_next (iter)) {
+ 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 (iter = g_list_first (glrte); iter != NULL; iter = g_list_next (iter)) {
+ for (GList *iter = g_list_first (glrte); iter != NULL; iter = g_list_next (iter)) {
gpx_write_track ( (VikTrack*)iter->data, &context_tmp );
}
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 );
+}
projects / andy / viking.git / blobdiff