Add default values to ele and time fields (due to OSM)

Submitted by Oddgeir Kvien

diff --git a/ChangeLog b/ChangeLog
index c2039fdbb672ef8bf1d8afa887a9a830fad70151..ab1b6088b5bfaf7a479550b08cf061ceaf8727cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-23
+Oddgeir Kvien <oddgeir@oddgeirkvien.com>
+       * Add default values to ele and time fields (due to OSM)
+
 2007-12-21
 Evan Battaglia <gtoevan@gmx.net>
        * Preferences groups/tabs

diff --git a/src/gpx.c b/src/gpx.c
index 979c6560ed18d59040917f67efe6681ba21a3e37..04607db34bf4f29c9f55c7713e85ac9313bbdca0 100644 (file)
--- a/src/gpx.c
+++ b/src/gpx.c
@@ -647,13 +647,26 @@ static void gpx_write_trackpoint ( VikTrackpoint *tp, FILE *f )
   if ( tp->altitude != VIK_DEFAULT_ALTITUDE )
   {
     s_alt = a_coords_dtostr ( tp->altitude );
-    fprintf ( f, "    <ele>%s</ele>\n", s_alt );
-    g_free ( s_alt );
   }
+  else /* Modified to always include altitude, needed for OSM export */
+  {
+    s_alt = a_coords_dtostr ( 0 );
+  }
+  fprintf ( f, "    <ele>%s</ele>\n", s_alt );
+  g_free ( s_alt );
+  
   if ( tp->has_timestamp ) {
     time_buf [ strftime ( time_buf, sizeof(time_buf)-1, GPX_TIME_FORMAT, localtime(&(tp->timestamp)) ) ] = '\0';
-    fprintf ( f, "    <time>%s</time>\n", time_buf );
   }
+  else /* Modified to always include time, needed for OSM export */
+  {
+    time_t rawtime;
+    time ( &rawtime );
+  
+    time_buf [strftime ( time_buf, sizeof(time_buf)-1, GPX_TIME_FORMAT, localtime(&rawtime)) ] ='\0';
+  }
+  fprintf ( f, "    <time>%s</time>\n", time_buf );
+  
   if (tp->extended && (tp->fix_mode >= VIK_GPS_MODE_2D)) {
     if (!isnan(tp->course)) {
       gchar *s_course = a_coords_dtostr(tp->course);