---
src/gpspoint.c | 6 +-----
src/gpx.c | 7 -------
src/viktrack.c | 1 -
src/viktrack.h | 2 --
4 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/src/gpspoint.c b/src/gpspoint.c
index 51b5c62..96d279d 100644
--- a/src/gpspoint.c
+++ b/src/gpspoint.c
@@ -260,15 +260,11 @@ void a_gpspoint_read_file(VikTrwLayer *trw, FILE *f ) {
tp->timestamp = line_timestamp;
tp->altitude = line_altitude;
if (line_extended) {
- tp->extended = TRUE;
tp->speed = line_speed;
tp->course = line_course;
tp->nsats = line_sat;
tp->fix_mode = line_fix;
}
- else {
- tp->extended = FALSE;
- }
current_track->trackpoints = g_list_append ( current_track->trackpoints,
tp );
}
@@ -497,7 +493,7 @@ static void a_gpspoint_write_trackpoint ( VikTrackpoint
*tp, FILE *f )
if ( tp->newsegment )
fprintf ( f, " newsegment=\"yes\"" );
- if (tp->extended) {
+ if (!isnan(tp->speed) || !isnan(tp->course) || tp->nsats > 0) {
fprintf ( f, " extended=\"yes\"" );
if (!isnan(tp->speed)) {
gchar *s_speed = a_coords_dtostr(tp->speed);
diff --git a/src/gpx.c b/src/gpx.c
index c54f0eb..86d35b0 100644
--- a/src/gpx.c
+++ b/src/gpx.c
@@ -346,19 +346,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 +366,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;
diff --git a/src/viktrack.c b/src/viktrack.c
index 9ce1c0f..250e8d6 100644
--- a/src/viktrack.c
+++ b/src/viktrack.c
@@ -115,7 +115,6 @@ VikTrack *vik_track_copy ( const VikTrack *tr )
VikTrackpoint *vik_trackpoint_new()
{
VikTrackpoint *tp = g_malloc0(sizeof(VikTrackpoint));
- tp->extended = FALSE;
tp->speed = NAN;
tp->course = NAN;
return tp;
diff --git a/src/viktrack.h b/src/viktrack.h
index c76286b..ea2933b 100644
--- a/src/viktrack.h
+++ b/src/viktrack.h
@@ -40,8 +40,6 @@ struct _VikTrackpoint {
gboolean has_timestamp;
time_t timestamp;
gdouble altitude; /* VIK_DEFAULT_ALTITUDE if data unavailable */
- /* Most GPSs provide this in realtime mode (NMEA) but not in data mode */
- gboolean extended;
gdouble speed; /* NAN if data unavailable */
gdouble course; /* NAN if data unavailable */
guint nsats; /* number of satellites used. 0 if data unavailable */
--
1.6.0.4
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
_______________________________________________
Viking-devel mailing list
Viking-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/viking-devel
Viking home page: http://viking.sf.net/
