Really empty GPS realtime layers.

[andy/viking.git] / src / viktrack.c

diff --git a/src/viktrack.c b/src/viktrack.c
index 6df31c7f97e686beb311de2b04a77367810ebc78..0a5dd73bc9931a23f82ad72ad7ef90bfb87e51cd 100644 (file)
--- a/src/viktrack.c
+++ b/src/viktrack.c
@@ -105,6 +105,28 @@ void vik_track_set_description(VikTrack *tr, const gchar *description)
     tr->description = NULL;
 }
 
+void vik_track_set_source(VikTrack *tr, const gchar *source)
+{
+  if ( tr->source )
+    g_free ( tr->source );
+
+  if ( source && source[0] != '\0' )
+    tr->source = g_strdup(source);
+  else
+    tr->source = NULL;
+}
+
+void vik_track_set_type(VikTrack *tr, const gchar *type)
+{
+  if ( tr->type )
+    g_free ( tr->type );
+
+  if ( type && type[0] != '\0' )
+    tr->type = g_strdup(type);
+  else
+    tr->type = NULL;
+}
+
 void vik_track_ref(VikTrack *tr)
 {
   tr->ref_count++;
@@ -132,6 +154,10 @@ void vik_track_free(VikTrack *tr)
     g_free ( tr->comment );
   if ( tr->description )
     g_free ( tr->description );
+  if ( tr->source )
+    g_free ( tr->source );
+  if ( tr->type )
+    g_free ( tr->type );
   g_list_foreach ( tr->trackpoints, (GFunc) vik_trackpoint_free, NULL );
   g_list_free( tr->trackpoints );
   if (tr->property_dialog)
@@ -177,6 +203,7 @@ VikTrack *vik_track_copy ( const VikTrack *tr, gboolean copy_points )
   vik_track_set_name(new_tr,tr->name);
   vik_track_set_comment(new_tr,tr->comment);
   vik_track_set_description(new_tr,tr->description);
+  vik_track_set_source(new_tr,tr->source);
   return new_tr;
 }
 
@@ -562,22 +589,38 @@ void vik_track_reverse ( VikTrack *tr )
 /**
  * vik_track_get_duration:
  * @trk: The track
+ * @segment_gaps: Whether the duration should include gaps between segments
  *
- * Returns: The time in seconds that covers the whole track including gaps
+ * Returns: The time in seconds
  *  NB this may be negative particularly if the track has been reversed
  */
-time_t vik_track_get_duration(const VikTrack *trk)
+time_t vik_track_get_duration(const VikTrack *trk, gboolean segment_gaps)
 {
   time_t duration = 0;
   if ( trk->trackpoints ) {
     // Ensure times are available
     if ( vik_track_get_tp_first(trk)->has_timestamp ) {
       // Get trkpt only once - as using vik_track_get_tp_last() iterates whole track each time
-      VikTrackpoint *trkpt_last = vik_track_get_tp_last(trk);
-      if ( trkpt_last->has_timestamp ) {
-        time_t t1 = vik_track_get_tp_first(trk)->timestamp;
-        time_t t2 = trkpt_last->timestamp;
-        duration = t2 - t1;
+      if (segment_gaps) {
+        // Simple duration
+        VikTrackpoint *trkpt_last = vik_track_get_tp_last(trk);
+        if ( trkpt_last->has_timestamp ) {
+          time_t t1 = vik_track_get_tp_first(trk)->timestamp;
+          time_t t2 = trkpt_last->timestamp;
+          duration = t2 - t1;
+        }
+      }
+      else {
+        // Total within segments
+        GList *iter = trk->trackpoints->next;
+        while (iter) {
+          if ( VIK_TRACKPOINT(iter->data)->has_timestamp &&
+               VIK_TRACKPOINT(iter->prev->data)->has_timestamp &&
+              (!VIK_TRACKPOINT(iter->data)->newsegment) ) {
+            duration += ABS(VIK_TRACKPOINT(iter->data)->timestamp - VIK_TRACKPOINT(iter->prev->data)->timestamp);
+          }
+          iter = iter->next;
+        }
       }
     }
   }
@@ -1487,6 +1530,7 @@ void vik_track_marshall ( VikTrack *tr, guint8 **data, guint *datalen)
   vtm_append(tr->name);
   vtm_append(tr->comment);
   vtm_append(tr->description);
+  vtm_append(tr->source);
 
   *data = b->data;
   *datalen = b->len;
@@ -1541,6 +1585,7 @@ VikTrack *vik_track_unmarshall (guint8 *data, guint datalen)
   vtu_get(new_tr->name);
   vtu_get(new_tr->comment);
   vtu_get(new_tr->description);
+  vtu_get(new_tr->source);
 
   return new_tr;
 }