]> git.street.me.uk Git - andy/viking.git/blobdiff - src/vikgpslayer.c
Add menu item for help contents
[andy/viking.git] / src / vikgpslayer.c
index f3875c85a973ddad38254416be603c37a89700c7..d06f5a322e498a995f5492e809c3092a7790e44e 100644 (file)
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
+#ifdef HAVE_MATH_H
 #include <math.h>
+#endif
 #include "viking.h"
-#include "vikgpslayer_pixmap.h"
+#include "icons/icons.h"
 #include "babel.h"
 
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <glib.h>
 #include <glib/gprintf.h>
+#include <glib/gi18n.h>
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
 #include <gps.h>
+#endif
+
+#if ! GLIB_CHECK_VERSION(2,14,0)
+inline guint g_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data) {
+  return g_timeout_add(interval*1000, function, data);
+}
+#endif
 
 #define DISCONNECT_UPDATE_SIGNAL(vl, val) g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, val)
 static VikGpsLayer *vik_gps_layer_create (VikViewport *vp);
@@ -46,20 +63,25 @@ static void gps_layer_change_coord_mode ( VikGpsLayer *val, VikCoordMode mode );
 static void gps_layer_add_menu_items( VikGpsLayer *vtl, GtkMenu *menu, gpointer vlp );
 static void gps_layer_drag_drop_request ( VikGpsLayer *val_src, VikGpsLayer *val_dest, GtkTreeIter *src_item_iter, GtkTreePath *dest_path );
 
-static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp);
-
 static void gps_upload_cb( gpointer layer_and_vlp[2] );
 static void gps_download_cb( gpointer layer_and_vlp[2] );
 static void gps_empty_upload_cb( gpointer layer_and_vlp[2] );
 static void gps_empty_download_cb( gpointer layer_and_vlp[2] );
 static void gps_empty_all_cb( gpointer layer_and_vlp[2] );
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
 static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2] );
+static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp);
+#endif
 
 typedef enum {GARMIN_P = 0, MAGELLAN_P, NUM_PROTOCOLS} vik_gps_proto;
 static gchar * params_protocols[] = {"Garmin", "Magellan", NULL};
 static gchar * protocols_args[]   = {"garmin", "magellan"};
 /*#define NUM_PROTOCOLS (sizeof(params_protocols)/sizeof(params_protocols[0]) - 1) */
+#ifdef WINDOWS
+static gchar * params_ports[] = {"com1", "usb:", NULL};
+#else
 static gchar * params_ports[] = {"/dev/ttyS0", "/dev/ttyS1", "/dev/ttyUSB0", "/dev/ttyUSB1", "usb:", NULL};
+#endif
 #define NUM_PORTS (sizeof(params_ports)/sizeof(params_ports[0]) - 1)
 typedef enum {GPS_DOWN=0, GPS_UP} gps_dir;
 
@@ -84,24 +106,52 @@ typedef struct {
 } GpsSession;
 static void gps_session_delete(GpsSession *sess);
 
-static gchar *params_groups[] = {"Data Mode", "Realtime Tracking Mode"};
+static gchar *params_groups[] = {
+  "Data Mode",
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+  "Realtime Tracking Mode",
+#endif
+};
+
 enum {GROUP_DATA_MODE, GROUP_REALTIME_MODE};
 
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+static gchar *params_vehicle_position[] = {
+  "Keep vehicle at center",
+  "Keep vehicle on screen",
+  "Disable",
+  NULL
+};
+enum {
+  VEHICLE_POSITION_CENTERED = 0,
+  VEHICLE_POSITION_ON_SCREEN,
+  VEHICLE_POSITION_NONE,
+};
+#endif
+
 static VikLayerParam gps_layer_params[] = {
-  { "gps_protocol", VIK_LAYER_PARAM_UINT, GROUP_DATA_MODE, "GPS Protocol:", VIK_LAYER_WIDGET_COMBOBOX, params_protocols, NULL},
-  { "gps_port", VIK_LAYER_PARAM_UINT, GROUP_DATA_MODE, "Serial Port:", VIK_LAYER_WIDGET_COMBOBOX, params_ports, NULL},
-
-  { "record_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, "Recording tracks", VIK_LAYER_WIDGET_CHECKBUTTON},
-  { "center_start_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, "Jump to current position on start", VIK_LAYER_WIDGET_CHECKBUTTON},
-  { "centered_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, "Keep current position at center", VIK_LAYER_WIDGET_CHECKBUTTON},
-  { "gpsd_host", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, "Gpsd Host:", VIK_LAYER_WIDGET_ENTRY},
-  { "gpsd_port", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, "Gpsd Port:", VIK_LAYER_WIDGET_ENTRY},
+  { "gps_protocol", VIK_LAYER_PARAM_UINT, GROUP_DATA_MODE, N_("GPS Protocol:"), VIK_LAYER_WIDGET_COMBOBOX, params_protocols, NULL},
+  { "gps_port", VIK_LAYER_PARAM_UINT, GROUP_DATA_MODE, N_("Serial Port:"), VIK_LAYER_WIDGET_COMBOBOX, params_ports, NULL},
+
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+  { "record_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Recording tracks"), VIK_LAYER_WIDGET_CHECKBUTTON},
+  { "center_start_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Jump to current position on start"), VIK_LAYER_WIDGET_CHECKBUTTON},
+  { "moving_map_method", VIK_LAYER_PARAM_UINT, GROUP_REALTIME_MODE, N_("Moving Map Method:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_vehicle_position, NULL},
+  { "gpsd_host", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Host:"), VIK_LAYER_WIDGET_ENTRY},
+  { "gpsd_port", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Port:"), VIK_LAYER_WIDGET_ENTRY},
+  { "gpsd_retry_interval", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Retry Interval (seconds):"), VIK_LAYER_WIDGET_ENTRY},
+#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
 };
-enum {PARAM_PROTOCOL=0, PARAM_PORT, PARAM_REALTIME_REC, PARAM_REALTIME_CENTER_START, PARAM_REALTIME_CENTERED, PARAM_GPSD_HOST, PARAM_GPSD_PORT, NUM_PARAMS};
+enum {
+  PARAM_PROTOCOL=0, PARAM_PORT,
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+  PARAM_REALTIME_REC, PARAM_REALTIME_CENTER_START, PARAM_VEHICLE_POSITION, PARAM_GPSD_HOST, PARAM_GPSD_PORT, PARAM_GPSD_RETRY_INTERVAL,
+#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
+  NUM_PARAMS};
 
 VikLayerInterface vik_gps_layer_interface = {
   "GPS",
-  &gpslayer_pixbuf,
+  &vikgpslayer_pixbuf,
 
   NULL,
   0,
@@ -147,9 +197,19 @@ VikLayerInterface vik_gps_layer_interface = {
   (VikLayerFuncDragDropRequest)                gps_layer_drag_drop_request,
 };
 
-enum {TRW_DOWNLOAD=0, TRW_UPLOAD, TRW_REALTIME, NUM_TRW};
-static gchar * trw_names[] = {"GPS Download", "GPS Upload", "GPS Realtime Tracking"};
+enum {TRW_DOWNLOAD=0, TRW_UPLOAD,
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+  TRW_REALTIME,
+#endif
+  NUM_TRW};
+static gchar * trw_names[] = {
+  N_("GPS Download"), N_("GPS Upload"),
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+  N_("GPS Realtime Tracking"),
+#endif
+};
 
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
 typedef struct {
   struct gps_data_t gpsd;
   VikGpsLayer *vgl;
@@ -157,27 +217,29 @@ typedef struct {
 
 typedef struct {
   struct gps_fix_t fix;
+  gint satellites_used;
   gboolean dirty;   /* needs to be saved */
 } GpsFix;
+#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
 
 struct _VikGpsLayer {
   VikLayer vl;
   VikTrwLayer * trw_children[NUM_TRW];
   GList * children;    /* used only for writing file */
   int cur_read_child;   /* used only for reading file */
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
   VglGpsd *vgpsd;
-  gboolean realtime_tracking;
-  GMutex *realtime_tracking_mutex;
+  gboolean realtime_tracking;  /* set/reset only by the callback */
+  gboolean first_realtime_trackpoint;
   GpsFix realtime_fix;
   GpsFix last_fix;
 
-  enum unit realtime_gpsd_unit;
-
   VikTrack *realtime_track;
   gchar *realtime_track_name;
 
   GIOChannel *realtime_io_channel;
   guint realtime_io_watch_id;
+  guint realtime_retry_timer;
   GdkGC *realtime_track_gc;
   GdkGC *realtime_track_bg_gc;
   GdkGC *realtime_track_pt_gc;
@@ -185,14 +247,15 @@ struct _VikGpsLayer {
   GdkGC *realtime_track_pt2_gc;
 
   /* params */
-  guint protocol_id;
-  guint serial_port_id;
-  /* TODO: show on diaglog */
   gchar *gpsd_host;
   gchar *gpsd_port;
+  gint gpsd_retry_interval;
   gboolean realtime_record;
   gboolean realtime_jump_to_start;
-  gboolean realtime_keep_at_center;
+  guint vehicle_position;
+#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
+  guint protocol_id;
+  guint serial_port_id;
 };
 
 GType vik_gps_layer_get_type ()
@@ -301,19 +364,19 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara
 {
   switch ( id )
   {
-    /* TODO: gpsd_host, gpsd_port */
     case PARAM_PROTOCOL:
       if (data.u < NUM_PROTOCOLS)
         vgl->protocol_id = data.u;
       else
-        g_warning("Unknown GPS Protocol");
+        g_warning(_("Unknown GPS Protocol"));
       break;
     case PARAM_PORT:
       if (data.u < NUM_PORTS)
         vgl->serial_port_id = data.u;
       else
-        g_warning("Unknown serial port device");
+        g_warning(_("Unknown serial port device"));
       break;
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
     case PARAM_GPSD_HOST:
       if (vgl->gpsd_host)
         g_free(vgl->gpsd_host);
@@ -324,15 +387,19 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara
         g_free(vgl->gpsd_port);
       vgl->gpsd_port = g_strdup(data.s); /* TODO: check for number */
       break;
+    case PARAM_GPSD_RETRY_INTERVAL:
+      vgl->gpsd_retry_interval = strtol(data.s, NULL, 10);
+      break;
     case PARAM_REALTIME_REC:
       vgl->realtime_record = data.b;
       break;
     case PARAM_REALTIME_CENTER_START:
       vgl->realtime_jump_to_start = data.b;
       break;
-    case PARAM_REALTIME_CENTERED:
-      vgl->realtime_keep_at_center = data.b;
+    case PARAM_VEHICLE_POSITION:
+      vgl->vehicle_position = data.u;
       break;
+#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
     default:
       g_warning("gps_layer_set_param(): unknown parameter");
   }
@@ -345,30 +412,34 @@ static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id )
   VikLayerParamData rv;
   switch ( id )
   {
-    /* TODO: gpsd_host, gpsd_port */
     case PARAM_PROTOCOL:
       rv.u = vgl->protocol_id;
       break;
     case PARAM_PORT:
       rv.u = vgl->serial_port_id;
       break;
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
     case PARAM_GPSD_HOST:
       rv.s = vgl->gpsd_host ? vgl->gpsd_host : "";
       break;
     case PARAM_GPSD_PORT:
       rv.s = vgl->gpsd_port ? vgl->gpsd_port : g_strdup(DEFAULT_GPSD_PORT);
       break;
+    case PARAM_GPSD_RETRY_INTERVAL:
+      rv.s = g_strdup_printf("%d", vgl->gpsd_retry_interval);
+      break;
     case PARAM_REALTIME_REC:
       rv.b = vgl->realtime_record;
       break;
     case PARAM_REALTIME_CENTER_START:
       rv.b = vgl->realtime_jump_to_start;
       break;
-    case PARAM_REALTIME_CENTERED:
-      rv.b = vgl->realtime_keep_at_center;
+    case PARAM_VEHICLE_POSITION:
+      rv.u = vgl->vehicle_position;
       break;
+#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
     default:
-      g_warning("gps_layer_get_param(): unknown parameter");
+      g_warning(_("%s: unknown parameter"), __FUNCTION__);
   }
 
   return rv;
@@ -385,26 +456,30 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp)
   vgl->children = NULL;
   vgl->cur_read_child = 0;
 
-  vgl->realtime_tracking_mutex = g_mutex_new();
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
   vgl->realtime_tracking = FALSE;
+  vgl->first_realtime_trackpoint = FALSE;
   vgl->vgpsd = NULL;
+  vgl->realtime_io_channel = NULL;
+  vgl->realtime_io_watch_id = 0;
+  vgl->realtime_retry_timer = 0;
   vgl->realtime_track_gc = vik_viewport_new_gc ( vp, "#203070", 2 );
   vgl->realtime_track_bg_gc = vik_viewport_new_gc ( vp, "grey", 2 );
   vgl->realtime_track_pt1_gc = vik_viewport_new_gc ( vp, "red", 2 );
   vgl->realtime_track_pt2_gc = vik_viewport_new_gc ( vp, "green", 2 );
   vgl->realtime_track_pt_gc = vgl->realtime_track_pt1_gc;
-  vgl->realtime_gpsd_unit = gpsd_units();
-  // fprintf(stderr, "DEBUG: gpsd_unit = %d\n", vgl->realtime_gpsd_unit);
   vgl->realtime_track = NULL;
 
   /* Setting params here */
-  vgl->protocol_id = 0;
-  vgl->serial_port_id = 0;
   vgl->gpsd_host = g_strdup("localhost");
   vgl->gpsd_port = g_strdup(DEFAULT_GPSD_PORT);
   vgl->realtime_record = TRUE;
   vgl->realtime_jump_to_start = TRUE;
-  vgl->realtime_keep_at_center = FALSE;
+  vgl->vehicle_position = VEHICLE_POSITION_ON_SCREEN;
+  vgl->gpsd_retry_interval = 10;
+#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
+  vgl->protocol_id = 0;
+  vgl->serial_port_id = 0;
 
   return vgl;
 }
@@ -428,6 +503,7 @@ static void vik_gps_layer_draw ( VikGpsLayer *vgl, gpointer data )
     if (!vik_viewport_get_half_drawn( VIK_VIEWPORT(data)))
       vik_layer_draw ( vl, data );
   }
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
   if (vgl->realtime_tracking) {
     if (VIK_LAYER(vgl) == trigger) {
       if ( vik_viewport_get_half_drawn ( VIK_VIEWPORT(data) ) ) {
@@ -440,6 +516,7 @@ static void vik_gps_layer_draw ( VikGpsLayer *vgl, gpointer data )
     if (!vik_viewport_get_half_drawn( VIK_VIEWPORT(data)))
       realtime_tracking_draw(vgl, VIK_VIEWPORT(data));
   }
+#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
 }
 
 static void gps_layer_change_coord_mode ( VikGpsLayer *vgl, VikCoordMode mode )
@@ -461,16 +538,17 @@ static void gps_layer_add_menu_items( VikGpsLayer *vgl, GtkMenu *menu, gpointer
   gtk_menu_shell_append ( GTK_MENU_SHELL(menu), item );
   gtk_widget_show ( item );
 
-  item = gtk_menu_item_new_with_label ( "Upload to GPS" );
+  item = gtk_menu_item_new_with_label ( _("Upload to GPS") );
   g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_upload_cb), pass_along );
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show ( item );
 
-  item = gtk_menu_item_new_with_label ( "Download from GPS" );
+  item = gtk_menu_item_new_with_label ( _("Download from GPS") );
   g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_download_cb), pass_along );
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show ( item );
 
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
   item = gtk_menu_item_new_with_label ( vgl->realtime_tracking  ?
                                        "Stop realtime tracking" :
                                        "Start realtime tracking" );
@@ -481,18 +559,19 @@ static void gps_layer_add_menu_items( VikGpsLayer *vgl, GtkMenu *menu, gpointer
   item = gtk_menu_item_new();
   gtk_menu_shell_append ( GTK_MENU_SHELL(menu), item );
   gtk_widget_show ( item );
+#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
 
-  item = gtk_menu_item_new_with_label ( "Empty Upload" );
+  item = gtk_menu_item_new_with_label ( _("Empty Upload") );
   g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_empty_upload_cb), pass_along );
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show ( item );
 
-  item = gtk_menu_item_new_with_label ( "Empty Download" );
+  item = gtk_menu_item_new_with_label ( _("Empty Download") );
   g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_empty_download_cb), pass_along );
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show ( item );
 
-  item = gtk_menu_item_new_with_label ( "Empty All" );
+  item = gtk_menu_item_new_with_label ( _("Empty All") );
   g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_empty_all_cb), pass_along );
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show ( item );
@@ -512,6 +591,7 @@ static void vik_gps_layer_free ( VikGpsLayer *vgl )
       disconnect_layer_signal(VIK_LAYER(vgl->trw_children[i]), vgl);
     g_object_unref(vgl->trw_children[i]);
   }
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
   if (vgl->realtime_track_gc != NULL)
     g_object_unref(vgl->realtime_track_gc);
   if (vgl->realtime_track_bg_gc != NULL)
@@ -520,8 +600,7 @@ static void vik_gps_layer_free ( VikGpsLayer *vgl )
     g_object_unref(vgl->realtime_track_pt1_gc);
   if (vgl->realtime_track_pt2_gc != NULL)
     g_object_unref(vgl->realtime_track_pt2_gc);
-  if (vgl->realtime_tracking_mutex != NULL)
-   g_mutex_free(vgl->realtime_tracking_mutex);
+#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
 }
 
 gboolean vik_gps_layer_delete ( VikGpsLayer *vgl, GtkTreeIter *iter )
@@ -549,7 +628,7 @@ static void vik_gps_layer_realize ( VikGpsLayer *vgl, VikTreeview *vt, GtkTreeIt
   for (ix = 0; ix < NUM_TRW; ix++) {
     VikLayer * trw = VIK_LAYER(vgl->trw_children[ix]);
     vik_treeview_add_layer ( VIK_LAYER(vgl)->vt, layer_iter, &iter,
-        trw_names[ix], vgl, 
+        _(trw_names[ix]), vgl, 
         trw, trw->type, trw->type );
     if ( ! trw->visible )
       vik_treeview_item_set_visible ( VIK_LAYER(vgl)->vt, &iter, FALSE );
@@ -621,9 +700,23 @@ static void set_total_count(gint cnt, GpsSession *sess)
   gdk_threads_enter();
   g_mutex_lock(sess->mutex);
   if (sess->ok) {
-    g_sprintf(s, "%s %d %s...",
-        (sess->direction == GPS_DOWN) ? "Downloading" : "Uploading", cnt,
-        (sess->progress_label == sess->wp_label) ? "waypoints" : "trackpoints");
+    const gchar *tmp_str;
+    if (sess->direction == GPS_DOWN)
+    {
+      if (sess->progress_label == sess->wp_label)
+        tmp_str = ngettext("Downloading %d waypoint...", "Downloading %d waypoints...", cnt);
+      else
+        tmp_str = ngettext("Downloading %d trackpoint...", "Downloading %d trackpoints...", cnt);
+    }
+    else 
+    {
+      if (sess->progress_label == sess->wp_label)
+        tmp_str = ngettext("Uploading %d waypoint...", "Uploading %d waypoints...", cnt);
+      else
+        tmp_str = ngettext("Uploading %d trackpoint...", "Uploading %d trackpoints...", cnt);
+    }
+
+    g_snprintf(s, 128, tmp_str, cnt);
     gtk_label_set_text ( GTK_LABEL(sess->progress_label), s );
     gtk_widget_show ( sess->progress_label );
     sess->total_count = cnt;
@@ -635,15 +728,41 @@ static void set_total_count(gint cnt, GpsSession *sess)
 static void set_current_count(gint cnt, GpsSession *sess)
 {
   gchar s[128];
-  gchar *dir_str = (sess->direction == GPS_DOWN) ? "Downloaded" : "Uploaded";
+  const gchar *tmp_str;
 
   gdk_threads_enter();
   g_mutex_lock(sess->mutex);
   if (sess->ok) {
     if (cnt < sess->total_count) {
-      g_sprintf(s, "%s %d out of %d %s...", dir_str, cnt, sess->total_count, (sess->progress_label == sess->wp_label) ? "waypoints" : "trackpoints");
+      if (sess->direction == GPS_DOWN)
+      {
+        if (sess->progress_label == sess->wp_label)
+          tmp_str = ngettext("Downloaded %d out of %d waypoint...", "Downloaded %d out of %d waypoints...", sess->total_count);
+        else
+          tmp_str = ngettext("Downloaded %d out of %d trackpoint...", "Downloaded %d out of %d trackpoints...", sess->total_count);
+      }
+      else {
+        if (sess->progress_label == sess->wp_label)
+          tmp_str = ngettext("Uploaded %d out of %d waypoint...", "Uploaded %d out of %d waypoints...", sess->total_count);
+        else
+          tmp_str = ngettext("Uploaded %d out of %d trackpoint...", "Uploaded %d out of %d trackpoints...", sess->total_count);
+      }
+      g_snprintf(s, 128, tmp_str, cnt, sess->total_count);
     } else {
-      g_sprintf(s, "%s %d %s.", dir_str, cnt, (sess->progress_label == sess->wp_label) ? "waypoints" : "trackpoints");
+      if (sess->direction == GPS_DOWN)
+      {
+        if (sess->progress_label == sess->wp_label)
+          tmp_str = ngettext("Downloaded %d waypoint", "Downloaded %d waypoints", cnt);
+        else
+          tmp_str = ngettext("Downloaded %d trackpoint", "Downloaded %d trackpoints", cnt);
+      }
+      else {
+        if (sess->progress_label == sess->wp_label)
+          tmp_str = ngettext("Uploaded %d waypoint", "Uploaded %d waypoints", cnt);
+        else
+          tmp_str = ngettext("Uploaded %d trackpoint", "Uploaded %d trackpoints", cnt);
+      }
+      g_snprintf(s, 128, tmp_str, cnt);
     }    
     gtk_label_set_text ( GTK_LABEL(sess->progress_label), s );
   }
@@ -657,7 +776,7 @@ static void set_gps_info(const gchar *info, GpsSession *sess)
   gdk_threads_enter();
   g_mutex_lock(sess->mutex);
   if (sess->ok) {
-    g_sprintf(s, "GPS Device: %s", info);
+    g_snprintf(s, 256, _("GPS Device: %s"), info);
     gtk_label_set_text ( GTK_LABEL(sess->gps_label), s );
   }
   g_mutex_unlock(sess->mutex);
@@ -826,12 +945,12 @@ static void gps_comm_thread(GpsSession *sess)
 
   gdk_threads_enter();
   if (!result) {
-    gtk_label_set_text ( GTK_LABEL(sess->status_label), "Error: couldn't find gpsbabel." );
+    gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Error: couldn't find gpsbabel.") );
   } 
   else {
     g_mutex_lock(sess->mutex);
     if (sess->ok) {
-      gtk_label_set_text ( GTK_LABEL(sess->status_label), "Done." );
+      gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Done.") );
       gtk_dialog_set_response_sensitive ( GTK_DIALOG(sess->dialog), GTK_RESPONSE_ACCEPT, TRUE );
       gtk_dialog_set_response_sensitive ( GTK_DIALOG(sess->dialog), GTK_RESPONSE_REJECT, FALSE );
     } else {
@@ -863,19 +982,19 @@ static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar *
   sess->ok = TRUE;
   sess->cmd_args = g_strdup_printf("-D 9 -t -w -%c %s",
       (dir == GPS_DOWN) ? 'i' : 'o', protocols_args[proto]);
-  sess->window_title = (dir == GPS_DOWN) ? "GPS Download" : "GPS Upload";
+  sess->window_title = (dir == GPS_DOWN) ? _("GPS Download") : _("GPS Upload");
 
   sess->dialog = gtk_dialog_new_with_buttons ( "", VIK_GTK_WINDOW_FROM_LAYER(vtl), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL );
   gtk_dialog_set_response_sensitive ( GTK_DIALOG(sess->dialog),
       GTK_RESPONSE_ACCEPT, FALSE );
   gtk_window_set_title ( GTK_WINDOW(sess->dialog), sess->window_title );
 
-  sess->status_label = gtk_label_new ("Status: detecting gpsbabel");
+  sess->status_label = gtk_label_new (_("Status: detecting gpsbabel"));
   gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox),
       sess->status_label, FALSE, FALSE, 5 );
   gtk_widget_show_all(sess->status_label);
 
-  sess->gps_label = gtk_label_new ("GPS device: N/A");
+  sess->gps_label = gtk_label_new (_("GPS device: N/A"));
   sess->ver_label = gtk_label_new ("");
   sess->id_label = gtk_label_new ("");
   sess->wp_label = gtk_label_new ("");
@@ -947,6 +1066,10 @@ static void gps_empty_all_cb( gpointer layer_and_vlp[2] )
   vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_DOWNLOAD]);
 }
 
+#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
+static void rt_gpsd_disconnect(VikGpsLayer *vgl);
+static gboolean rt_gpsd_connect(VikGpsLayer *vgl, gboolean ask_if_failed);
+
 static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp)
 {
   struct LatLon ll;
@@ -1009,11 +1132,20 @@ static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp)
   }
 }
 
-/* lock/unlock realtime_tracking_mutex when call this */
 static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced)
 {
     struct LatLon ll;
     GList *last_tp;
+
+    /* Note that fix.time is a double, but it should not affect the precision
+       for most GPS */
+    time_t cur_timestamp = vgl->realtime_fix.fix.time;
+    time_t last_timestamp = vgl->last_fix.fix.time;
+
+    if (cur_timestamp < last_timestamp) {
+      return;
+    }
+
     if (vgl->realtime_record && vgl->realtime_fix.dirty) {
       gboolean replace = FALSE;
       int heading = (int)floor(vgl->realtime_fix.fix.track);
@@ -1023,22 +1155,28 @@ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced)
       if (((last_tp = g_list_last(vgl->realtime_track->trackpoints)) != NULL) &&
           (vgl->realtime_fix.fix.mode > MODE_2D) &&
           (vgl->last_fix.fix.mode <= MODE_2D) &&
-          (1.0 > vgl->realtime_fix.fix.time - vgl->last_fix.fix.time)) {
+          ((cur_timestamp - last_timestamp) < 2)) {
         g_free(last_tp->data);
         vgl->realtime_track->trackpoints = g_list_delete_link(vgl->realtime_track->trackpoints, last_tp);
         replace = TRUE;
       }
-      if (forced || replace ||
-          ((heading < last_heading) && (heading < (last_heading - 3))) || 
-          ((heading > last_heading) && (heading > (last_heading + 3))) ||
-          ((alt != VIK_DEFAULT_ALTITUDE) && (alt != last_alt))) {
+      if (replace ||
+          ((cur_timestamp != last_timestamp) &&
+          ((forced || 
+            ((heading < last_heading) && (heading < (last_heading - 3))) || 
+            ((heading > last_heading) && (heading > (last_heading + 3))) ||
+            ((alt != VIK_DEFAULT_ALTITUDE) && (alt != last_alt)))))) {
         /* TODO: check for new segments */
         VikTrackpoint *tp = vik_trackpoint_new();
         tp->newsegment = FALSE;
-        // tp->altitude = isnan(vgl->realtime_fix.fix.altitude) ? VIK_DEFAULT_ALTITUDE : vgl->realtime_fix.fix.altitude;
-        tp->altitude = alt;
         tp->has_timestamp = TRUE;
         tp->timestamp = vgl->realtime_fix.fix.time;
+        tp->altitude = alt;
+        /* speed only available for 3D fix. Check for NAN when use this speed */
+        tp->speed = vgl->realtime_fix.fix.speed;  
+        tp->course = vgl->realtime_fix.fix.track;
+        tp->nsats = vgl->realtime_fix.satellites_used;
+        tp->fix_mode = vgl->realtime_fix.fix.mode;
 
         ll.lat = vgl->realtime_fix.fix.latitude;
         ll.lon = vgl->realtime_fix.fix.longitude;
@@ -1047,13 +1185,14 @@ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced)
 
         vgl->realtime_track->trackpoints = g_list_append(vgl->realtime_track->trackpoints, tp);
         vgl->realtime_fix.dirty = FALSE;
+        vgl->realtime_fix.satellites_used = 0;
         vgl->last_fix = vgl->realtime_fix;
       }
     }
 
 }
 
-void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data)
+static void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data)
 {
   gboolean update_all = FALSE;
   VikGpsLayer *vgl = vgpsd->vgl;
@@ -1063,36 +1202,54 @@ void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data)
     return;
   }
 
-#ifdef XXXXXXXXXXXXX
-  if ((time_t)vgl->realtime_fix.fix.time == (time_t)vgpsd->gpsd.fix.time)
-    return;
-#endif /*XXXXXXXXXXXX*/
-
   if ((vgpsd->gpsd.fix.mode >= MODE_2D) &&
       !isnan(vgpsd->gpsd.fix.latitude) &&
       !isnan(vgpsd->gpsd.fix.longitude) &&
       !isnan(vgpsd->gpsd.fix.track)) {
-    g_mutex_lock(vgl->realtime_tracking_mutex);
+
+    VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl));
+    VikViewport *vvp = vik_window_viewport(vw);
     vgl->realtime_fix.fix = vgpsd->gpsd.fix;
+    vgl->realtime_fix.satellites_used = vgpsd->gpsd.satellites_used;
     vgl->realtime_fix.dirty = TRUE;
 
-    if (vgl->realtime_keep_at_center ||
-        (vgl->realtime_jump_to_start && !vgl->realtime_track->trackpoints)) {
-      struct LatLon ll;
-      VikCoord center;
+    struct LatLon ll;
+    VikCoord vehicle_coord;
 
-      ll.lat = vgl->realtime_fix.fix.latitude;
-      ll.lon = vgl->realtime_fix.fix.longitude;
-      vik_coord_load_from_latlon(&center,
-             vik_trw_layer_get_coord_mode(vgl->trw_children[TRW_REALTIME]), &ll);
-      VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl));
-      VikViewport *vvp = vik_window_viewport(vw);
-      vik_viewport_set_center_coord(vvp, &center);
+    ll.lat = vgl->realtime_fix.fix.latitude;
+    ll.lon = vgl->realtime_fix.fix.longitude;
+    vik_coord_load_from_latlon(&vehicle_coord,
+           vik_trw_layer_get_coord_mode(vgl->trw_children[TRW_REALTIME]), &ll);
+
+    if ((vgl->vehicle_position == VEHICLE_POSITION_CENTERED) ||
+        (vgl->realtime_jump_to_start && vgl->first_realtime_trackpoint)) {
+      vik_viewport_set_center_coord(vvp, &vehicle_coord);
+      update_all = TRUE;
+    }
+    else {
+      const int hdiv = 6;
+      const int vdiv = 6;
+      const int px = 20; /* adjust ment in pixels to make sure vehicle is inside the box */
+      gint width = vik_viewport_get_width(vvp);
+      gint height = vik_viewport_get_height(vvp);
+      gint vx, vy;
+
+      vik_viewport_coord_to_screen(vvp, &vehicle_coord, &vx, &vy);
       update_all = TRUE;
+      if (vx < (width/hdiv))
+        vik_viewport_set_center_screen(vvp, vx - width/2 + width/hdiv + px, vy);
+      else if (vx > (width - width/hdiv))
+        vik_viewport_set_center_screen(vvp, vx + width/2 - width/hdiv - px, vy);
+      else if (vy < (height/vdiv))
+        vik_viewport_set_center_screen(vvp, vx, vy - height/2 + height/vdiv + px);
+      else if (vy > (height - height/vdiv))
+        vik_viewport_set_center_screen(vvp, vx, vy + height/2 - height/vdiv - px);
+      else
+        update_all = FALSE;
     }
 
+    vgl->first_realtime_trackpoint = FALSE;
     create_realtime_trackpoint(vgl, FALSE);
-    g_mutex_unlock(vgl->realtime_tracking_mutex);
 
     vik_layer_emit_update ( update_all ? VIK_LAYER(vgl) : VIK_LAYER(vgl->trw_children[TRW_REALTIME]));
   }
@@ -1101,8 +1258,16 @@ void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data)
 static gboolean gpsd_data_available(GIOChannel *source, GIOCondition condition, gpointer data)
 {
   VikGpsLayer *vgl = data;
-  gps_poll(&vgl->vgpsd->gpsd);
-  return TRUE;
+  if (condition == G_IO_IN) {
+    if (!gps_poll(&vgl->vgpsd->gpsd))
+      return TRUE;
+    else {
+      g_warning("Disconnected from gpsd. Trying to reconnect");
+      rt_gpsd_disconnect(vgl);
+      rt_gpsd_connect(vgl, FALSE);
+    }
+  }
+  return FALSE; /* no further calling */
 }
 
 static gchar *make_track_name(VikTrwLayer *vtl)
@@ -1121,57 +1286,121 @@ static gchar *make_track_name(VikTrwLayer *vtl)
 
 }
 
-static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2])
+static gboolean rt_gpsd_try_connect(gpointer *data)
 {
-  VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0];
-  vgl->realtime_tracking = (vgl->realtime_tracking == FALSE);
+  VikGpsLayer *vgl = (VikGpsLayer *)data;
+  struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port);
 
-  if (vgl->realtime_tracking) {
-    struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port);
-    if (gpsd == NULL) {
-      fprintf(stderr, "DEBUG: %s(): gps_open failed\n", __PRETTY_FUNCTION__);
-      vgl->realtime_tracking = FALSE;
-      return;
-    }
-    vgl->vgpsd = g_realloc(gpsd, sizeof(VglGpsd));
-    vgl->vgpsd->vgl = vgl;
-
-    vgl->realtime_fix.dirty = vgl->last_fix.dirty = FALSE;
-    /* track alt/time graph uses VIK_DEFAULT_ALTITUDE (0.0) as invalid */
-    vgl->realtime_fix.fix.altitude = vgl->last_fix.fix.altitude = VIK_DEFAULT_ALTITUDE;
-    vgl->realtime_fix.fix.speed = vgl->last_fix.fix.speed = NAN;
-
-    if (vgl->realtime_record) {
-      VikTrwLayer *vtl = vgl->trw_children[TRW_REALTIME];
-      vgl->realtime_track = vik_track_new();
-      vgl->realtime_track->visible = TRUE;
-      vgl->realtime_track_name = make_track_name(vtl);
-      vik_trw_layer_add_track(vtl, vgl->realtime_track_name, vgl->realtime_track);
-    }
+  if (gpsd == NULL) {
+    g_warning("Failed to connect to gpsd at %s (port %s). Will retry in %d seconds",
+                     vgl->gpsd_host, vgl->gpsd_port, vgl->gpsd_retry_interval);
+    return TRUE;   /* keep timer running */
+  }
 
-    gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook);
-    vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd);
-    vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel,
-                                           G_IO_IN, gpsd_data_available, vgl);
+  vgl->vgpsd = g_realloc(gpsd, sizeof(VglGpsd));
+  vgl->vgpsd->vgl = vgl;
 
-    gps_query(&vgl->vgpsd->gpsd, "w+x");
+  vgl->realtime_fix.dirty = vgl->last_fix.dirty = FALSE;
+  /* track alt/time graph uses VIK_DEFAULT_ALTITUDE (0.0) as invalid */
+  vgl->realtime_fix.fix.altitude = vgl->last_fix.fix.altitude = VIK_DEFAULT_ALTITUDE;
+  vgl->realtime_fix.fix.speed = vgl->last_fix.fix.speed = NAN;
 
+  if (vgl->realtime_record) {
+    VikTrwLayer *vtl = vgl->trw_children[TRW_REALTIME];
+    vgl->realtime_track = vik_track_new();
+    vgl->realtime_track->visible = TRUE;
+    vgl->realtime_track_name = make_track_name(vtl);
+    vik_trw_layer_add_track(vtl, vgl->realtime_track_name, vgl->realtime_track);
   }
-  else {  /* stop realtime tracking */
-    /* TODO: handle race condition here , make sure vgpsd is NULL */
-    g_mutex_lock(vgl->realtime_tracking_mutex);
+
+  gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook);
+  vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd);
+  vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel,
+                    G_IO_IN | G_IO_ERR | G_IO_HUP, gpsd_data_available, vgl);
+  gps_query(&vgl->vgpsd->gpsd, "w+x");
+  return FALSE;  /* no longer called by timeout */
+}
+
+static gboolean rt_ask_retry(VikGpsLayer *vgl)
+{
+  GtkWidget *dialog = gtk_message_dialog_new (VIK_GTK_WINDOW_FROM_LAYER(vgl),
+                          GTK_DIALOG_DESTROY_WITH_PARENT,
+                          GTK_MESSAGE_QUESTION,
+                          GTK_BUTTONS_YES_NO,
+                          "Failed to connect to gpsd at %s (port %s)\n"
+                          "Should Viking keep trying (every %d seconds)?",
+                          vgl->gpsd_host, vgl->gpsd_port,
+                          vgl->gpsd_retry_interval);
+
+  gint res = gtk_dialog_run(GTK_DIALOG(dialog));
+  gtk_widget_destroy(dialog);
+  return (res == GTK_RESPONSE_YES);
+}
+
+static gboolean rt_gpsd_connect(VikGpsLayer *vgl, gboolean ask_if_failed)
+{
+  vgl->realtime_retry_timer = 0;
+  if (rt_gpsd_try_connect((gpointer *)vgl)) {
+    if (vgl->gpsd_retry_interval <= 0) {
+      g_warning("Failed to connect to gpsd but will not retry because retry intervel was set to %d (which is 0 or negative)", vgl->gpsd_retry_interval);
+      return FALSE;
+    }
+    else if (ask_if_failed && !rt_ask_retry(vgl))
+      return FALSE;
+    else
+      vgl->realtime_retry_timer = g_timeout_add_seconds(vgl->gpsd_retry_interval,
+        (GSourceFunc)rt_gpsd_try_connect, (gpointer *)vgl);
+  }
+  return TRUE;
+}
+
+static void rt_gpsd_disconnect(VikGpsLayer *vgl)
+{
+  if (vgl->realtime_io_watch_id) {
+    g_source_remove(vgl->realtime_io_watch_id);
+    vgl->realtime_io_watch_id = 0;
+  }
+  if (vgl->realtime_retry_timer) {
+    g_source_remove(vgl->realtime_retry_timer);
+    vgl->realtime_retry_timer = 0;
+  }
+  if (vgl->realtime_io_channel) {
+    GError *error = NULL;
+    g_io_channel_shutdown (vgl->realtime_io_channel, FALSE, &error);
+    vgl->realtime_io_channel = NULL;
+  }
+  if (vgl->vgpsd) {
     gps_close(&vgl->vgpsd->gpsd);
     vgl->vgpsd = NULL;
-    // g_source_remove(vgl->realtime_timeout);
-    g_source_remove(vgl->realtime_io_watch_id);
-    g_io_channel_unref (vgl->realtime_io_channel);
+  }
+
+  if (vgl->realtime_record && vgl->realtime_track) {
+    create_realtime_trackpoint(vgl, TRUE);
+    if ((vgl->realtime_track->trackpoints == NULL) || (vgl->realtime_track->trackpoints->next == NULL))
+      vik_trw_layer_delete_track(vgl->trw_children[TRW_REALTIME], vgl->realtime_track_name);
+    vgl->realtime_track = NULL;
+  }
+}
+
+static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2])
+{
+  VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0];
+  vgl->realtime_tracking = (vgl->realtime_tracking == FALSE);
+
+  /* Make sure we are still in the boat with libgps */
+  g_assert((VIK_GPS_MODE_2D == MODE_2D) && (VIK_GPS_MODE_3D == MODE_3D));
 
-    if (vgl->realtime_record) {
-      create_realtime_trackpoint(vgl, TRUE);
-      if ((vgl->realtime_track->trackpoints == NULL) || (vgl->realtime_track->trackpoints->next == NULL))
-        vik_trw_layer_delete_track(vgl->trw_children[TRW_REALTIME], vgl->realtime_track_name);
+  if (vgl->realtime_tracking) {
+    vgl->first_realtime_trackpoint = TRUE;
+    if (!rt_gpsd_connect(vgl, TRUE)) {
+      vgl->first_realtime_trackpoint = FALSE;
+      vgl->realtime_tracking = FALSE;
     }
-    g_mutex_unlock(vgl->realtime_tracking_mutex);
+  }
+  else {  /* stop realtime tracking */
+    vgl->first_realtime_trackpoint = FALSE;
+    rt_gpsd_disconnect(vgl);
   }
 }
+#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */