X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/bf35388d0815a5ae2749d4ab4545c2289076372e..700b0908d71f64c9449ba372d0b9a8363257afb1:/src/viktrack.c

diff --git a/src/viktrack.c b/src/viktrack.c
index d65449d7..dc87516f 100644
--- a/src/viktrack.c
+++ b/src/viktrack.c
@@ -23,6 +23,7 @@
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <math.h>
 #include "coords.h"
 #include "vikcoord.h"
@@ -451,6 +452,30 @@ void compute_spline(int n, double *x, double *f, spline_coeff_t *p)
 {
   double *h, *alpha, *B, *m;
   int i;
+  int orig_n = n;
+  double new_x[3], new_f[3];
+  
+  if (n==0) return;
+  if (n==1) {
+    new_x[0] = x[0];
+    new_f[0] = f[0];
+    new_x[1] = x[0]+0.00001;
+    new_f[1] = f[0];
+    x = new_x;
+    f = new_f;
+    n = 3;
+  }
+  if (n==2) {
+    new_x[0] = x[0];
+    new_f[0] = f[0];
+    new_x[1] = x[1];
+    new_f[1] = f[1];
+    new_x[2] = x[1] + x[1]-x[0];
+    new_f[2] = f[1] + f[1]-f[0];
+    x = new_x;
+    f = new_f;
+    n = 3;
+  }
   
   /* we're solving a linear system of equations of the form Ax = B. 
    * The matrix a is tridiagonal and consists of coefficients in 
@@ -494,7 +519,7 @@ void compute_spline(int n, double *x, double *f, spline_coeff_t *p)
     m[i] = (B[i]-h[i+1]*m[i+1])/alpha[i];
   }
 
-  for (i=0; i<n-1; i++) {
+  for (i=0; i<orig_n-1; i++) {
     double mi, mi1;
     mi = (i==(n-2)) ? 0 : m[i];
     mi1 = (i==0) ? 0 : m[i-1];
@@ -520,12 +545,20 @@ gdouble *vik_track_make_speed_map ( const VikTrack *tr, guint16 num_chunks )
   int i, pt_count, numpts, spline;
   GList *iter;
   spline_coeff_t *p;
+  GList *mytr;
 
   if ( ! tr->trackpoints )
     return NULL;
 
   g_assert ( num_chunks < 16000 );
 
+#ifdef XXXXXXXXXXXXXXXXXX
+  iter = tr->trackpoints;
+  while (iter) {
+    
+  }
+#endif /*XXXXXXXXXXXXXXXXXX*/
+
   t1 = VIK_TRACKPOINT(tr->trackpoints->data)->timestamp;
   t2 = VIK_TRACKPOINT(g_list_last(tr->trackpoints)->data)->timestamp;
   duration = t2 - t1;
@@ -600,15 +633,15 @@ gdouble *vik_track_make_speed_map ( const VikTrack *tr, guint16 num_chunks )
 }
 
 /* by Alex Foobarian */
-VikCoord *vik_track_get_closest_tp_by_percentage_dist ( VikTrack *tr, gdouble reldist )
+VikTrackpoint *vik_track_get_closest_tp_by_percentage_dist ( VikTrack *tr, gdouble reldist )
 {
   gdouble dist = vik_track_get_length_including_gaps(tr) * reldist;
   gdouble current_dist = 0.0;
   gdouble current_inc = 0.0;
-  VikCoord *rv;
   if ( tr->trackpoints )
   {
     GList *iter = tr->trackpoints->next;
+    GList *last_iter = NULL;
     while (iter)
     {
       current_inc = vik_coord_diff ( &(VIK_TRACKPOINT(iter->data)->coord),
@@ -616,20 +649,101 @@ VikCoord *vik_track_get_closest_tp_by_percentage_dist ( VikTrack *tr, gdouble re
       current_dist += current_inc;
       if ( current_dist >= dist )
         break;
+      last_iter = iter;
       iter = iter->next;
     }
+    if (!iter) /* passing the end the track */
+      return (last_iter ? last_iter->data : NULL);
     /* we've gone past the dist already, was prev trackpoint closer? */
     /* should do a vik_coord_average_weighted() thingy. */
     if ( iter->prev && abs(current_dist-current_inc-dist) < abs(current_dist-dist) )
       iter = iter->prev;
 
+    return VIK_TRACKPOINT(iter->data);
 
+  }
+  return NULL;
+}
 
-    rv = g_malloc(sizeof(VikCoord));
-    *rv = VIK_TRACKPOINT(iter->data)->coord;
+gboolean vik_track_get_minmax_alt ( const VikTrack *tr, gdouble *min_alt, gdouble *max_alt )
+{
+  *min_alt = 25000;
+  *max_alt = -5000;
+  if ( tr && tr->trackpoints && tr->trackpoints->data && (VIK_TRACKPOINT(tr->trackpoints->data)->altitude != VIK_DEFAULT_ALTITUDE) ) {
+    GList *iter = tr->trackpoints->next;
+    gdouble tmp_alt;
+    while (iter)
+    {
+      tmp_alt = VIK_TRACKPOINT(iter->data)->altitude;
+      if ( tmp_alt > *max_alt )
+        *max_alt = tmp_alt;
+      if ( tmp_alt < *min_alt )
+        *min_alt = tmp_alt;
+      iter = iter->next;
+    }
+    return TRUE;
+  }
+  return FALSE;
+}
 
-    return rv;
+void vik_track_marshall ( VikTrack *tr, guint8 **data, guint *datalen)
+{
+  GList *tps;
+  GByteArray *b = g_byte_array_new();
+  guint len;
+  guint intp, ntp;
+
+  g_byte_array_append(b, (guint8 *)tr, sizeof(*tr));
+
+  /* we'll fill out number of trackpoints later */
+  intp = b->len;
+  g_byte_array_append(b, (guint8 *)&len, sizeof(len));
+
+  tps = tr->trackpoints;
+  ntp = 0;
+  while (tps) {
+    g_byte_array_append(b, (guint8 *)tps->data, sizeof(VikTrackpoint));
+    tps = tps->next;
+    ntp++;
+  }
+  *(guint *)(b->data + intp) = ntp;
 
+  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);
+
+  *data = b->data;
+  *datalen = b->len;
+  g_byte_array_free(b, FALSE);
+}
+
+VikTrack *vik_track_unmarshall (guint8 *data, guint datalen)
+{
+  guint len;
+  VikTrack *new_tr = vik_track_new();
+  VikTrackpoint *new_tp;
+  guint ntp;
+  gint i;
+
+  /* only the visibility is needed */
+  new_tr->visible = ((VikTrack *)data)->visible;
+  data += sizeof(*new_tr);
+
+  ntp = *(guint *)data;
+  data += sizeof(ntp);
+
+  for (i=0; i<ntp; i++) {
+    new_tp = vik_trackpoint_new();
+    memcpy(new_tp, data, sizeof(*new_tp));
+    data += sizeof(*new_tp);
+    new_tr->trackpoints = g_list_append(new_tr->trackpoints, new_tp);
   }
-  return NULL;
+
+  len = *(guint *)data;
+  data += sizeof(len);
+  if (len) {
+    new_tr->comment = g_strdup((gchar *)data);
+  }
+  return new_tr;
 }
+