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,
{ 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}
};
case tt_wpt:
if ( ! c_wp_name )
c_wp_name = g_strdup_printf("VIKING_WP%d", unnamed_waypoints++);
- g_hash_table_insert ( vik_trw_layer_get_waypoints ( vtl ), c_wp_name, c_wp );
+ vik_trw_layer_filein_add_waypoint ( vtl, c_wp_name, c_wp );
+ g_free ( c_wp_name );
c_wp = NULL;
c_wp_name = NULL;
break;
case tt_trk:
if ( ! c_tr_name )
c_tr_name = g_strdup_printf("VIKING_TR%d", unnamed_waypoints++);
- g_hash_table_insert ( vik_trw_layer_get_tracks ( vtl ), c_tr_name, c_tr );
+ vik_trw_layer_filein_add_track ( vtl, c_tr_name, c_tr );
+ g_free ( c_tr_name );
c_tr = NULL;
c_tr_name = NULL;
break;
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);
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;
}
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;
time_buf [ strftime ( time_buf, sizeof(time_buf)-1, GPX_TIME_FORMAT, localtime(&(tp->timestamp)) ) ] = '\0';
fprintf ( f, " <time>%s</time>\n", time_buf );
}
+ if (tp->extended && (tp->fix_mode >= VIK_GPS_MODE_2D)) {
+ if (!isnan(tp->course)) {
+ gchar *s_course = a_coords_dtostr(tp->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);
+ 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->nsats > 0)
+ fprintf ( f, " <sat>%d</sat>\n", tp->nsats );
+ }
+
fprintf ( f, " </trkpt>\n" );
}
static void gpx_write_track ( const gchar *name, VikTrack *t, FILE *f )
{
gchar *tmp;
- gboolean first_tp_is_newsegment; /* must temporarily make it not so, but we want to restore state. not that it matters. */
+ 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, "<trk%s>\n <name>%s</name>\n", t->visible ? "" : " hidden=\"hidden\"", tmp );
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 </trkseg><trkseg> already */
- }
- g_list_foreach ( t->trackpoints, (GFunc) gpx_write_trackpoint, f );
- if ( t->trackpoints && t->trackpoints->data )
+ g_list_foreach ( t->trackpoints, (GFunc) gpx_write_trackpoint, f );
VIK_TRACKPOINT(t->trackpoints->data)->newsegment = first_tp_is_newsegment; /* restore state */
+ }
fprintf ( f, "</trkseg>\n</trk>\n" );
}
-void a_gpx_write_file( VikTrwLayer *vtl, FILE *f )
+static void gpx_write_header( FILE *f )
{
fprintf(f, "<?xml version=\"1.0\"?>\n"
"<gpx version=\"1.0\" creator=\"Viking -- http://viking.sf.net/\"\n"
"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
"xmlns=\"http://www.topografix.com/GPX/1/0\"\n"
"xsi:schemaLocation=\"http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd\">\n");
- 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 );
+}
+
+static void gpx_write_footer( FILE *f )
+{
fprintf(f, "</gpx>\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 )
+{
+ int i;
+
+ gpx_write_header ( 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, f);
+ g_free ( passalong.wps );
+
+ g_hash_table_foreach ( vik_trw_layer_get_tracks ( vtl ), (GHFunc) gpx_write_track, f );
+
+ gpx_write_footer ( f );
+}
+
+void a_gpx_write_track_file ( const gchar *name, VikTrack *t, FILE *f )
+{
+ gpx_write_header ( f );
+ gpx_write_track ( name, t, f );
+ gpx_write_footer ( f );
}
projects / andy / viking.git / blobdiff