* 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/
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_ele,
tt_wpt_sym,
tt_wpt_time,
+ tt_wpt_url,
tt_wpt_link, /* New in GPX 1.1 */
tt_trk,
tt_trk_trkseg_trkpt_ele,
tt_trk_trkseg_trkpt_time,
tt_trk_trkseg_trkpt_name,
- /* extended */
+ /* 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_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_trkseg_trkpt_ele, "/gpx/trk/trkseg/trkpt/ele" },
{ tt_trk_trkseg_trkpt_time, "/gpx/trk/trkseg/trkpt/time" },
{ tt_trk_trkseg_trkpt_name, "/gpx/trk/trkseg/trkpt/name" },
- /* extended */
- { tt_trk_trkseg_trkpt_course, "/gpx/trk/trkseg/trkpt/course" },
+ /* 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" },
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;
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 ();
}
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_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:
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 )
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 );
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_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:
fprintf ( f, " <desc>%s</desc>\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);
gpx_write_header ( f );
+ 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 );
+ }
+
+ VikTRWMetadata *md = vik_trw_layer_get_metadata (vtl);
+ if ( md ) {
+ if ( md->author ) {
+ tmp = entitize ( md->author );
+ fprintf ( f, " <author>%s</author>\n", tmp );
+ g_free ( tmp );
+ }
+ if ( md->description ) {
+ 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 ) {
+ tmp = entitize ( md->keywords );
+ fprintf ( f, " <keywords>%s</keywords>\n", tmp );
+ g_free ( tmp );
+ }
+ }
+
// 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 ) );
// 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;