GPX write, clickable v-vs-t diagram

diff --git a/src/file.c b/src/file.c
index d0b8df8d1fe6e8993888e7cdce0a281663e07120..c376c012436919fb52fa5f12439e05910748907b 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -507,6 +507,8 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_ty
   {
     if ( file_type == FILE_TYPE_GPSMAPPER )
       a_gpsmapper_write_file ( vtl, f );
+    else if ( file_type == FILE_TYPE_GPX )
+      a_gpx_write_file ( vtl, f );
     else
       a_gpspoint_write_file ( vtl, f );
     fclose ( f );

diff --git a/src/file.h b/src/file.h
index 8d3ba29f8b53ef74bd7f0c5a1834e98d1fcce4e3..70ce5c9120c737da92c6e5e83ffdb1a97b75b588 100644 (file)
--- a/src/file.h
+++ b/src/file.h
@@ -24,6 +24,7 @@
 
 #define FILE_TYPE_GPSPOINT 1
 #define FILE_TYPE_GPSMAPPER 2
+#define FILE_TYPE_GPX 3
 
 const gchar *a_file_basename ( const gchar *filename );
 

diff --git a/src/gpx.c b/src/gpx.c
index c0763b715009348dbba30050f2f9ae7bdb65f3f9..4c6d36b2c54162737dd2cd195299faa891e78517 100644 (file)
--- a/src/gpx.c
+++ b/src/gpx.c
@@ -30,6 +30,8 @@
 #include <expat.h>
 #include <string.h>
 
+#define GPX_TIME_FORMAT "%Y-%m-%dT%H:%M:%SZ"
+
 typedef enum {
         tt_unknown = 0,
 
@@ -80,11 +82,12 @@ tag_mapping tag_path_map[] = {
         { tt_wpt_link, "/gpx/wpt/link" },                    /* GPX 1.1 */
 
         { tt_trk, "/gpx/trk" },
+        { tt_trk, "/gpx/rte" },
         { tt_trk_name, "/gpx/trk/name" },
         { tt_trk_desc, "/gpx/trk/desc" },
         { tt_trk_trkseg, "/gpx/trk/trkseg" },
-
         { tt_trk_trkseg_trkpt, "/gpx/trk/trkseg/trkpt" },
+        { tt_trk_trkseg_trkpt, "/gpx/rte/rtept" },
         { tt_trk_trkseg_trkpt_ele, "/gpx/trk/trkseg/trkpt/ele" },
         { tt_trk_trkseg_trkpt_time, "/gpx/trk/trkseg/trkpt/time" },
 
@@ -288,7 +291,7 @@ static void gpx_end(VikTrwLayer *vtl, const char *el)
        break;
 
      case tt_trk_trkseg_trkpt_time:
-       if ( strptime(c_cdata->str, "%Y-%m-%dT%H:%M:%SZ", &tm) != c_cdata->str ) { /* it read at least one char */
+       if ( strptime(c_cdata->str, GPX_TIME_FORMAT, &tm) != c_cdata->str ) { /* it read at least one char */
          c_tp->timestamp = mktime(&tm);
          c_tp->has_timestamp = TRUE;
        }
@@ -350,3 +353,264 @@ void a_gpx_read_file( VikTrwLayer *vtl, FILE *f ) {
   g_string_free ( xpath, TRUE );
   g_string_free ( c_cdata, TRUE );
 }
+
+/**** entitize from GPSBabel ****/
+typedef struct {
+        const char * text;
+        const char * entity;
+        int  not_html;
+} entity_types;
+
+static
+entity_types stdentities[] =  {
+        { "&",  "&amp;", 0 },
+        { "'",  "&apos;", 1 },
+        { "<",  "&lt;", 0 },
+        { ">",  "&gt;", 0 },
+        { "\"", "&quot;", 0 },
+        { NULL, NULL, 0 }
+};
+
+void utf8_to_int( const char *cp, int *bytes, int *value )
+{
+        if ( (*cp & 0xe0) == 0xc0 ) {
+                if ( (*(cp+1) & 0xc0) != 0x80 ) goto dodefault;
+                *bytes = 2;
+                *value = ((*cp & 0x1f) << 6) |
+                        (*(cp+1) & 0x3f);
+        }
+        else if ( (*cp & 0xf0) == 0xe0 ) {
+                if ( (*(cp+1) & 0xc0) != 0x80 ) goto dodefault;
+                if ( (*(cp+2) & 0xc0) != 0x80 ) goto dodefault;
+                *bytes = 3;
+                *value = ((*cp & 0x0f) << 12) |
+                        ((*(cp+1) & 0x3f) << 6) |
+                        (*(cp+2) & 0x3f);
+        }
+        else if ( (*cp & 0xf8) == 0xf0 ) {
+                if ( (*(cp+1) & 0xc0) != 0x80 ) goto dodefault;
+                if ( (*(cp+2) & 0xc0) != 0x80 ) goto dodefault;
+                if ( (*(cp+3) & 0xc0) != 0x80 ) goto dodefault;
+                *bytes = 4;
+                *value = ((*cp & 0x07) << 18) |
+                        ((*(cp+1) & 0x3f) << 12) |
+                        ((*(cp+2) & 0x3f) << 6) |
+                        (*(cp+3) & 0x3f);
+        }
+        else if ( (*cp & 0xfc) == 0xf8 ) {
+                if ( (*(cp+1) & 0xc0) != 0x80 ) goto dodefault;
+                if ( (*(cp+2) & 0xc0) != 0x80 ) goto dodefault;
+                if ( (*(cp+3) & 0xc0) != 0x80 ) goto dodefault;
+                if ( (*(cp+4) & 0xc0) != 0x80 ) goto dodefault;
+                *bytes = 5;
+                *value = ((*cp & 0x03) << 24) |
+                        ((*(cp+1) & 0x3f) << 18) |
+                        ((*(cp+2) & 0x3f) << 12) |
+                        ((*(cp+3) & 0x3f) << 6) |
+                        (*(cp+4) & 0x3f);
+        }
+        else if ( (*cp & 0xfe) == 0xfc ) {
+                if ( (*(cp+1) & 0xc0) != 0x80 ) goto dodefault;
+                if ( (*(cp+2) & 0xc0) != 0x80 ) goto dodefault;
+                if ( (*(cp+3) & 0xc0) != 0x80 ) goto dodefault;
+                if ( (*(cp+4) & 0xc0) != 0x80 ) goto dodefault;
+                if ( (*(cp+5) & 0xc0) != 0x80 ) goto dodefault;
+                *bytes = 6;
+                *value = ((*cp & 0x01) << 30) |
+                        ((*(cp+1) & 0x3f) << 24) |
+                        ((*(cp+2) & 0x3f) << 18) |
+                        ((*(cp+3) & 0x3f) << 12) |
+                        ((*(cp+4) & 0x3f) << 6) |
+                        (*(cp+5) & 0x3f);
+        }
+        else {
+dodefault:
+                *bytes = 1;
+                *value = (unsigned char)*cp;
+        }
+}
+
+static
+char *
+entitize(const char * str)
+{
+        int elen, ecount, nsecount;
+        entity_types *ep;
+        const char * cp;
+        char * p, * tmp, * xstr;
+
+        char tmpsub[20];
+        int bytes = 0;
+        int value = 0;
+        ep = stdentities;
+        elen = ecount = nsecount = 0;
+
+        /* figure # of entity replacements and additional size. */
+        while (ep->text) {
+                cp = str;
+                while ((cp = strstr(cp, ep->text)) != NULL) {
+                        elen += strlen(ep->entity) - strlen(ep->text);
+                        ecount++;
+                        cp += strlen(ep->text);
+                }
+                ep++;
+        }
+
+        /* figure the same for other than standard entities (i.e. anything
+         * that isn't in the range U+0000 to U+007F */
+        for ( cp = str; *cp; cp++ ) {
+                if ( *cp & 0x80 ) {
+
+                        utf8_to_int( cp, &bytes, &value );
+                        cp += bytes-1;
+                        elen += sprintf( tmpsub, "&#x%x;", value ) - bytes;
+                        nsecount++;
+                }
+        }
+
+        /* enough space for the whole string plus entity replacements, if any */
+        tmp = g_malloc((strlen(str) + elen + 1));
+        strcpy(tmp, str);
+
+        /* no entity replacements */
+        if (ecount == 0 && nsecount == 0)
+                return (tmp);
+
+        if ( ecount != 0 ) {
+                for (ep = stdentities; ep->text; ep++) {
+                        p = tmp;
+                        while ((p = strstr(p, ep->text)) != NULL) {
+                                elen = strlen(ep->entity);
+
+                                xstr = g_strdup(p + strlen(ep->text));
+
+                                strcpy(p, ep->entity);
+                                strcpy(p + elen, xstr);
+
+                                g_free(xstr);
+
+                                p += elen;
+                        }
+                }
+        }
+
+        if ( nsecount != 0 ) {
+                p = tmp;
+                while (*p) {
+                        if ( *p & 0x80 ) {
+                                utf8_to_int( p, &bytes, &value );
+                                if ( p[bytes] ) {
+                                        xstr = g_strdup( p + bytes );
+                                }
+                                else {
+                                        xstr = NULL;
+                                }
+                                sprintf( p, "&#x%x;", value );
+                                p = p+strlen(p);
+                                if ( xstr ) {
+                                        strcpy( p, xstr );
+                                        g_free(xstr);
+                                }
+                        }
+                        else {
+                                p++;
+                        }
+                }
+        }
+        return (tmp);
+}
+/**** end GPSBabel code ****/
+
+/* export GPX */
+static void gpx_write_waypoint ( const gchar *name, VikWaypoint *wp, FILE *f ) 
+{
+  static struct LatLon ll;
+  gchar *tmp;
+  vik_coord_to_latlon ( &(wp->coord), &ll );
+  fprintf ( f, "<wpt lat=\"%f\" lon=\"%f\"%s>\n",
+               ll.lat, ll.lon, wp->visible ? "" : " hidden=\"hidden\"" );
+
+  tmp = entitize ( name );
+  fprintf ( f, "  <name>%s</name>\n", tmp );
+  g_free ( tmp);
+
+  if ( wp->altitude != VIK_DEFAULT_ALTITUDE )
+    fprintf ( f, "  <ele>%f</ele>\n", wp->altitude );
+  if ( wp->comment )
+  {
+    tmp = entitize(wp->comment);
+    fprintf ( f, "  <desc>%s</desc>\n", tmp );
+    g_free ( tmp );
+  }
+  if ( wp->image )
+  {
+    tmp = entitize(wp->image);
+    fprintf ( f, "  <link>%s</link>\n", tmp );
+    g_free ( tmp );
+  }
+  fprintf ( f, "</wpt>\n" );
+}
+
+static void gpx_write_trackpoint ( VikTrackpoint *tp, FILE *f )
+{
+  static struct LatLon ll;
+  static gchar time_buf[30];
+  vik_coord_to_latlon ( &(tp->coord), &ll );
+
+  if ( tp->newsegment )
+    fprintf ( f, "  </trkseg>\n  <trkseg>\n" );
+
+  fprintf ( f, "  <trkpt lat=\"%f\" lon=\"%f\">\n", ll.lat, ll.lon );
+
+  if ( tp->altitude != VIK_DEFAULT_ALTITUDE )
+    fprintf ( f, "    <ele>%f</ele>\n", tp->altitude );
+  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 );
+  }
+  fprintf ( f, "  </trkpt>\n" );
+}
+
+
+static void gpx_write_track ( const gchar *name, VikTrack *t, FILE *f )
+{
+  gchar *tmp;
+  gboolean first_tp_is_newsegment; /* must temporarily make it not so, but we want to restore state. not that it matters. */
+
+  tmp = entitize ( name );
+  fprintf ( f, "<trk%s>\n  <name>%s</name>\n", t->visible ? "" : " hidden=\"hidden\"", tmp );
+  g_free ( tmp );
+
+  if ( t->comment )
+  {
+    tmp = entitize ( t->comment );
+    fprintf ( f, "  <desc>%s</desc>\n", tmp );
+    g_free ( tmp );
+  }
+
+  fprintf ( f, "  <trkseg>\n" );
+
+  if ( t->trackpoints && t->trackpoints->data ) {
+    first_tp_is_newsegment = VIK_TRACKPOINT(t->trackpoints->data)->newsegment;
+    VIK_TRACKPOINT(t->trackpoints->data)->newsegment = FALSE; /* so we won't write </trkseg><trkseg> already */
+  }
+  g_list_foreach ( t->trackpoints, (GFunc) gpx_write_trackpoint, f );
+  if ( t->trackpoints && t->trackpoints->data )
+    VIK_TRACKPOINT(t->trackpoints->data)->newsegment = first_tp_is_newsegment; /* restore state */
+
+  fprintf ( f, "</trkseg>\n</trk>\n" );
+}
+
+void a_gpx_write_file( VikTrwLayer *vtl, FILE *f )
+{
+  fprintf(f, "<?xml version=\"1.0\"?>\n"
+          "<gpx version=\"1.0\" creator=\"Viking -- http://viking.sf.net/\"\n"
+          "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+          "xmlns=\"http://www.topografix.com/GPX/1/0\"\n"
+          "xsi:schemaLocation=\"http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd\">\n");
+  g_hash_table_foreach ( vik_trw_layer_get_waypoints ( vtl ), (GHFunc) gpx_write_waypoint, f );
+  g_hash_table_foreach ( vik_trw_layer_get_tracks ( vtl ), (GHFunc) gpx_write_track, f );
+  fprintf(f, "</gpx>\n");
+
+
+}

diff --git a/src/gpx.h b/src/gpx.h
index 0ef03cb6cbbd54489418519cccde3fafb6dd8ceb..710774d3b1a228b3d9b04786e81b06e764b69417 100644 (file)
--- a/src/gpx.h
+++ b/src/gpx.h
@@ -23,5 +23,6 @@
 #define _VIKING_GPX_H
 
 void a_gpx_read_file ( VikTrwLayer *trw, FILE *f );
+void a_gpx_write_file ( VikTrwLayer *trw, FILE *f );
 
 #endif

diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c
index c30fe0425bed85739db0e28a1a28108de59ad0b8..8d53281e34e40ac731682a5c580082b4e5dcaf2a 100644 (file)
--- a/src/viktrwlayer.c
+++ b/src/viktrwlayer.c
@@ -1263,6 +1263,11 @@ static void trw_layer_export_gpsmapper ( gpointer layer_and_vlp[2] )
   trw_layer_export ( layer_and_vlp, FILE_TYPE_GPSMAPPER );
 }
 
+static void trw_layer_export_gpx ( gpointer layer_and_vlp[2] )
+{
+  trw_layer_export ( layer_and_vlp, FILE_TYPE_GPX );
+}
+
 static void trw_layer_goto_wp ( gpointer layer_and_vlp[2] )
 {
   GHashTable *wps = vik_trw_layer_get_waypoints ( VIK_TRW_LAYER(layer_and_vlp[0]) );
@@ -1369,6 +1374,11 @@ void vik_trw_layer_add_menu_items ( VikTrwLayer *vtl, GtkMenu *menu, gpointer vl
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show ( item );
 
+  item = gtk_menu_item_new_with_label ( "Export Layer as GPX" );
+  g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(trw_layer_export_gpx), pass_along );
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+  gtk_widget_show ( item );
+
   item = gtk_menu_item_new_with_label ( "New Waypoint" );
   g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(trw_layer_new_wp), pass_along );
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);

diff --git a/src/viktrwlayer_propwin.c b/src/viktrwlayer_propwin.c
index 097d2c911eb681e188a41176ed8e17e15a9b9752..66e49a0e14be443832f9aa64fcbca306205d812a 100644 (file)
--- a/src/viktrwlayer_propwin.c
+++ b/src/viktrwlayer_propwin.c
@@ -75,9 +75,9 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gdoub
 {
   GdkPixmap *pix;
   GtkWidget *image;
-  GtkWidget *eventbox;
   gdouble *altitudes = vik_track_make_elevation_map ( tr, PROFILE_WIDTH );
   gdouble mina, maxa;
+  GtkWidget *eventbox;
   gpointer *pass_along;
   guint i;
 
@@ -165,13 +165,18 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gdoub
 #define MTOK(v) ( (v)*3600.0/1000.0 * 0.6214) /* m/s to mph - we'll handle this globally eventually but for now ...*/
 #endif
 
-GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr)
+GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpointer vlp)
 {
   GdkPixmap *pix;
   GtkWidget *image;
   gdouble mins, maxs;
   guint i;
+  GtkWidget *eventbox;
+  gpointer *pass_along;
 
+  pass_along = g_malloc ( sizeof(gpointer) * 2 );
+  pass_along[0] = tr;
+  pass_along[1] = vlp;
 
   gdouble *speeds = vik_track_make_speed_map ( tr, PROFILE_WIDTH );
   if ( speeds == NULL )
@@ -250,7 +255,13 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr)
 
   g_object_unref ( G_OBJECT(pix) );
   g_free ( speeds );
-  return image;
+
+  eventbox = gtk_event_box_new ();
+  g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_profile_click), pass_along );
+  g_signal_connect_swapped ( G_OBJECT(eventbox), "destroy", G_CALLBACK(g_free), pass_along );
+  gtk_container_add ( GTK_CONTAINER(eventbox), image );
+
+  return eventbox;
 }
 #undef MARGIN
 #undef LINES
@@ -280,7 +291,7 @@ gint vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrack *tr, gpointer vlp )
 
   gdouble min_alt, max_alt;
   GtkWidget *profile = vik_trw_layer_create_profile(GTK_WIDGET(parent),tr,&min_alt,&max_alt,vlp);
-  GtkWidget *vtdiag = vik_trw_layer_create_vtdiag(GTK_WIDGET(parent), tr);
+  GtkWidget *vtdiag = vik_trw_layer_create_vtdiag(GTK_WIDGET(parent), tr, vlp);
   GtkWidget *graphs = gtk_notebook_new();
 
   static gchar *label_texts[] = { "<b>Comment:</b>", "<b>Track Length:</b>", "<b>Trackpoints:</b>", "<b>Segments:</b>", "<b>Duplicate Points:</b>", "<b>Max Speed:</b>", "<b>Avg. Speed:</b>", "<b>Avg. Dist. Between TPs:</b>", "<b>Elevation Range:</b>", "<b>Total Elevation Gain/Loss:</b>", "<b>Start:</b>",  "<b>End:</b>",  "<b>Duration:</b>" };