Gpslayer: New menu items to remove all tracks and waypoints in GPS folders.

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

diff --git a/src/viktrack.c b/src/viktrack.c
index 006cd695a22d502a7a62b481d039ac8e7b2ea896..dc87516f3d185983ac260bb725d078dfcfee2b21 100644 (file)
--- a/src/viktrack.c
+++ b/src/viktrack.c
@@ -545,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;
   int i, pt_count, numpts, spline;
   GList *iter;
   spline_coeff_t *p;

+  GList *mytr;

 
   if ( ! tr->trackpoints )
     return NULL;
 
   g_assert ( num_chunks < 16000 );
 
 
   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;
   t1 = VIK_TRACKPOINT(tr->trackpoints->data)->timestamp;
   t2 = VIK_TRACKPOINT(g_list_last(tr->trackpoints)->data)->timestamp;
   duration = t2 - t1;


@@ -625,15 +633,15 @@ gdouble *vik_track_make_speed_map ( const VikTrack *tr, guint16 num_chunks )
 }
 
 /* by Alex Foobarian */
 }
 
 /* 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;
 {
   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;
   if ( tr->trackpoints )
   {
     GList *iter = tr->trackpoints->next;

+    GList *last_iter = NULL;

     while (iter)
     {
       current_inc = vik_coord_diff ( &(VIK_TRACKPOINT(iter->data)->coord),
     while (iter)
     {
       current_inc = vik_coord_diff ( &(VIK_TRACKPOINT(iter->data)->coord),


@@ -641,19 +649,17 @@ VikCoord *vik_track_get_closest_tp_by_percentage_dist ( VikTrack *tr, gdouble re
       current_dist += current_inc;
       if ( current_dist >= dist )
         break;
       current_dist += current_inc;
       if ( current_dist >= dist )
         break;

+      last_iter = iter;

       iter = iter->next;
     }
       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;
 
     /* 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;
 

-
-
-    rv = g_malloc(sizeof(VikCoord));
-    *rv = VIK_TRACKPOINT(iter->data)->coord;
-
-    return rv;
+    return VIK_TRACKPOINT(iter->data);

 
   }
   return NULL;
 
   }
   return NULL;