GPX export: sort track by time. (By Hein Ragas).

Some application can make use of this feature when reading gpx files.

Signed-off-by: Quy Tonthat <qtonthat@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index 415d5fc5bddf9db93ff3764e6d672ffbb686dcf8..5de4d05582b3093f4be0196c1f32e58c656ac84d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-03
+Hein Ragas <viking@ragas.nl>
+       * GPX export: sort track by time. Some application can make use
+       of this feature when reading gpx files.
+
 2008-11-22
 Quy Tonthat <qtonthat@gmail.com>:
        * Merging tracks by name. Users can now select more than one tracks to

diff --git a/src/gpx.c b/src/gpx.c
index 7f30d71953854eba154e6cde0a356df451abe282..981987fd6ad3225436df1b8779ea416a18b652af 100644 (file)
--- a/src/gpx.c
+++ b/src/gpx.c
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <glib.h>
 #include <math.h>
+#include <time.h>
 
 typedef enum {
         tt_unknown = 0,
@@ -762,6 +763,18 @@ typedef struct {
   guint n_wps;
 } gpx_gather_waypoints_passalong_t;
 
+/* Type to hold name of track and timestamp of first trackpoint */
+typedef struct {
+  time_t first_timestamp;
+  const gchar *name;
+} gpx_track_and_timestamp;
+
+typedef struct {
+  gpx_track_and_timestamp *trks;
+  guint i;
+  guint n_trks;
+} gpx_gather_tracks_passalong_t;
+
 static void gpx_collect_waypoint ( const gchar *name, VikWaypoint *wp, gpx_gather_waypoints_passalong_t *passalong )
 {
   if ( passalong->i < passalong->n_wps ) {
@@ -771,6 +784,18 @@ static void gpx_collect_waypoint ( const gchar *name, VikWaypoint *wp, gpx_gathe
   }
 }
 
+/* Function to collect a track and the first timestamp in the list */
+static void gpx_collect_track (const gchar *name, VikTrack *track, gpx_gather_tracks_passalong_t *passalong)
+{
+  if (passalong->i < passalong->n_trks)
+  {
+    VikTrackpoint *first_point = (VikTrackpoint *)track->trackpoints->data;
+    passalong->trks[passalong->i].name = name;
+    passalong->trks[passalong->i].first_timestamp = first_point->timestamp;
+    passalong->i++;
+  }
+}
+
 static int gpx_waypoint_and_name_compar(const void *x, const void *y)
 {
   gpx_waypoint_and_name *a = (gpx_waypoint_and_name *)x;
@@ -778,6 +803,22 @@ static int gpx_waypoint_and_name_compar(const void *x, const void *y)
   return strcmp(a->name,b->name);
 }
 
+/* Function to compare two tracks by their first timestamp */
+static int gpx_track_and_timestamp_compar(const void *x, const void *y)
+{
+  gpx_track_and_timestamp *a = (gpx_track_and_timestamp *)x;
+  gpx_track_and_timestamp *b = (gpx_track_and_timestamp *)y;
+  if (a->first_timestamp < b->first_timestamp)
+  {
+    return -1;
+  }
+  if (a->first_timestamp > b->first_timestamp)
+  {
+    return 1;
+  }
+  return 0;
+}
+
 void a_gpx_write_file( VikTrwLayer *vtl, FILE *f )
 {
        a_gpx_write_file_options(NULL, vtl, f);
@@ -802,8 +843,18 @@ void a_gpx_write_file_options ( GpxWritingOptions *options, VikTrwLayer *vtl, FI
     gpx_write_waypoint ( passalong.wps[i].name, passalong.wps[i].wp, &context);
   g_free ( passalong.wps );
 
-  g_hash_table_foreach ( vik_trw_layer_get_tracks ( vtl ), (GHFunc) gpx_write_track, &context );
-
+  gpx_gather_tracks_passalong_t passalong_tracks;
+  passalong_tracks.n_trks = g_hash_table_size ( vik_trw_layer_get_tracks (vtl) );
+  passalong_tracks.i = 0;
+  passalong_tracks.trks = g_new(gpx_track_and_timestamp,passalong_tracks.n_trks);
+  g_hash_table_foreach (vik_trw_layer_get_tracks(vtl), (GHFunc) gpx_collect_track, &passalong_tracks);
+  /* Sort by timestamp */
+  qsort(passalong_tracks.trks, passalong_tracks.n_trks, sizeof(gpx_track_and_timestamp), gpx_track_and_timestamp_compar);
+  for (i=0;i<passalong_tracks.n_trks; i++)
+  {
+    gpx_write_track(passalong_tracks.trks[i].name, (VikTrack *)g_hash_table_lookup(vik_trw_layer_get_tracks(vtl), passalong_tracks.trks[i].name), &context);
+  }
+  g_free ( passalong_tracks.trks );
   gpx_write_footer ( f );
 }