X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/4a42b2543552f6789fe484d2c9be63357f50f688..e13ab673e45ea48de49661f7838e75925f405514:/src/gpx.c?ds=sidebyside
diff --git a/src/gpx.c b/src/gpx.c
index 6c611a87..9802fdb6 100644
--- a/src/gpx.c
+++ b/src/gpx.c
@@ -193,7 +193,6 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr)
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;
@@ -214,10 +213,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;
- c_tp->hdop = VIK_DEFAULT_DOP;
- c_tp->vdop = VIK_DEFAULT_DOP;
- c_tp->pdop = VIK_DEFAULT_DOP;
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;
@@ -240,7 +235,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;
@@ -282,7 +276,7 @@ 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%d", unnamed_tracks++);
vik_trw_layer_filein_add_track ( vtl, c_tr_name, c_tr );
g_free ( c_tr_name );
c_tr = NULL;
@@ -346,19 +340,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_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_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))
@@ -369,25 +360,21 @@ 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->extended = TRUE;
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->extended = TRUE;
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->extended = TRUE;
c_tp->pdop = g_strtod ( c_cdata->str, NULL );
g_string_erase ( c_cdata, 0, -1 );
break;
@@ -722,24 +709,22 @@ 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 )