Make the track name a property of the track.

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

diff --git a/src/viktrack.c b/src/viktrack.c
index 06bac07742deeb77b4004920e834d2f50ba242f0..ec13707f5f6a68de8981110ee7b388f472c05f55 100644 (file)
--- a/src/viktrack.c
+++ b/src/viktrack.c
@@ -53,6 +53,17 @@ void vik_track_set_comment_no_copy(VikTrack *tr, gchar *comment)
 }
 
 
+void vik_track_set_name(VikTrack *tr, const gchar *name)
+{
+  if ( tr->name )
+    g_free ( tr->name );
+
+  if ( name && name[0] != '\0' )
+    tr->name = g_strdup(name);
+  else
+    tr->name = NULL;
+}
+
 void vik_track_set_comment(VikTrack *tr, const gchar *comment)
 {
   if ( tr->comment )
@@ -85,6 +96,8 @@ void vik_track_free(VikTrack *tr)
   if ( tr->ref_count-- > 1 )
     return;
 
+  if ( tr->name )
+    g_free ( tr->name );
   if ( tr->comment )
     g_free ( tr->comment );
   g_list_foreach ( tr->trackpoints, (GFunc) g_free, NULL );
@@ -109,6 +122,7 @@ VikTrack *vik_track_copy ( const VikTrack *tr )
     new_tr->trackpoints = g_list_append ( new_tr->trackpoints, new_tp );
     tp_iter = tp_iter->next;
   }
+  vik_track_set_name(new_tr,tr->name);
   vik_track_set_comment(new_tr,tr->comment);
   return new_tr;
 }
@@ -253,6 +267,9 @@ VikTrack **vik_track_split_into_segments(VikTrack *t, guint *ret_len)
       iter->prev->next = NULL;
       iter->prev = NULL;
       rv[i] = vik_track_new();
+      // TODO: consider new naming strategy here
+      if ( tr->name )
+        vik_track_set_name ( rv[i], tr->name );
       if ( tr->comment )
         vik_track_set_comment ( rv[i], tr->comment );
       rv[i]->visible = tr->visible;
@@ -525,6 +542,43 @@ void vik_track_get_total_elevation_gain(const VikTrack *tr, gdouble *up, gdouble
     *up = *down = VIK_DEFAULT_ALTITUDE;
 }
 
+gdouble *vik_track_make_gradient_map ( const VikTrack *tr, guint16 num_chunks )
+{
+  gdouble *pts;
+  gdouble *altitudes;
+  gdouble total_length, chunk_length, current_gradient;
+  gdouble altitude1, altitude2;
+  guint16 current_chunk;
+
+  g_assert ( num_chunks < 16000 );
+
+  total_length = vik_track_get_length_including_gaps ( tr );
+  chunk_length = total_length / num_chunks;
+
+  /* Zero chunk_length (eg, track of 2 tp with the same loc) will cause crash */
+  if (chunk_length <= 0) {
+    return NULL;
+  }
+
+  altitudes = vik_track_make_elevation_map (tr, num_chunks);
+  if (altitudes == NULL) {
+    return NULL;
+  }
+
+  current_gradient = 0.0;
+  pts = g_malloc ( sizeof(gdouble) * num_chunks );
+  for (current_chunk = 0; current_chunk < (num_chunks - 1); current_chunk++) {
+    altitude1 = altitudes[current_chunk];
+    altitude2 = altitudes[current_chunk + 1];
+    current_gradient = 100.0 * (altitude2 - altitude1) / chunk_length;
+
+    pts[current_chunk] = current_gradient;
+  }
+
+  pts[current_chunk] = current_gradient;
+
+  return pts;
+}
 
 /* by Alex Foobarian */
 gdouble *vik_track_make_speed_map ( const VikTrack *tr, guint16 num_chunks )
@@ -1048,6 +1102,10 @@ void vik_track_marshall ( VikTrack *tr, guint8 **data, guint *datalen)
   }
   *(guint *)(b->data + intp) = ntp;
 
+  len = (tr->name) ? strlen(tr->name)+1 : 0;
+  g_byte_array_append(b, (guint8 *)&len, sizeof(len));
+  if (tr->name) g_byte_array_append(b, (guint8 *)tr->name, len);
+
   len = (tr->comment) ? strlen(tr->comment)+1 : 0; 
   g_byte_array_append(b, (guint8 *)&len, sizeof(len)); 
   if (tr->comment) g_byte_array_append(b, (guint8 *)tr->comment, len);
@@ -1079,6 +1137,13 @@ VikTrack *vik_track_unmarshall (guint8 *data, guint datalen)
     new_tr->trackpoints = g_list_append(new_tr->trackpoints, new_tp);
   }
 
+  len = *(guint *)data;
+  data += sizeof(len);
+  if (len) {
+    new_tr->name = g_strdup((gchar *)data);
+  }
+  data += len;
+
   len = *(guint *)data;
   data += sizeof(len);
   if (len) {