X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/58a642b6002c2a326b71e4e3b5977bf6cabd0829..80471a6a905e00bf80ad04fa2061f88ea81f15cb:/src/vikgpslayer.c diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c index d07dc419..83e56148 100644 --- a/src/vikgpslayer.c +++ b/src/vikgpslayer.c @@ -26,16 +26,15 @@ #include #include #include "viking.h" -#include "vikgpslayer_pixmap.h" +#include "icons/icons.h" #include "babel.h" #include #include #include -#ifdef HAVE_LIBGPS +#include +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING #include -#else -#define DEFAULT_GPSD_PORT "0" #endif #define DISCONNECT_UPDATE_SIGNAL(vl, val) g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, val) @@ -54,24 +53,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 ); -#ifdef HAVE_LIBGPS -static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp); -#endif - 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 HAVE_LIBGPS +#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; @@ -98,7 +98,7 @@ static void gps_session_delete(GpsSession *sess); static gchar *params_groups[] = { "Data Mode", -#ifdef HAVE_LIBGPS +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING "Realtime Tracking Mode", #endif }; @@ -106,27 +106,27 @@ static gchar *params_groups[] = { enum {GROUP_DATA_MODE, GROUP_REALTIME_MODE}; 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}, - -#ifdef HAVE_LIBGPS - { "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}, -#endif + { "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}, + { "centered_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Keep current position at center"), VIK_LAYER_WIDGET_CHECKBUTTON}, + { "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}, +#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ }; enum { PARAM_PROTOCOL=0, PARAM_PORT, -#ifdef HAVE_LIBGPS +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING PARAM_REALTIME_REC, PARAM_REALTIME_CENTER_START, PARAM_REALTIME_CENTERED, PARAM_GPSD_HOST, PARAM_GPSD_PORT, -#endif +#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ NUM_PARAMS}; VikLayerInterface vik_gps_layer_interface = { "GPS", - &gpslayer_pixbuf, + &vikgpslayer_pixbuf, NULL, 0, @@ -173,37 +173,36 @@ VikLayerInterface vik_gps_layer_interface = { }; enum {TRW_DOWNLOAD=0, TRW_UPLOAD, -#ifdef HAVE_LIBGPS +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING TRW_REALTIME, #endif NUM_TRW}; static gchar * trw_names[] = { - "GPS Download", "GPS Upload", -#ifdef HAVE_LIBGPS - "GPS Realtime Tracking", + N_("GPS Download"), N_("GPS Upload"), +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + N_("GPS Realtime Tracking"), #endif }; -#ifdef HAVE_LIBGPS +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING typedef struct { struct gps_data_t gpsd; VikGpsLayer *vgl; } VglGpsd; -#endif -#ifdef HAVE_LIBGPS typedef struct { struct gps_fix_t fix; + gint satellites_used; gboolean dirty; /* needs to be saved */ } GpsFix; -#endif +#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 HAVE_LIBGPS +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING VglGpsd *vgpsd; gboolean realtime_tracking; GMutex *realtime_tracking_mutex; @@ -222,17 +221,16 @@ struct _VikGpsLayer { GdkGC *realtime_track_pt_gc; GdkGC *realtime_track_pt1_gc; GdkGC *realtime_track_pt2_gc; -#endif /* params */ - guint protocol_id; - guint serial_port_id; - /* TODO: show on diaglog */ gchar *gpsd_host; gchar *gpsd_port; gboolean realtime_record; gboolean realtime_jump_to_start; gboolean realtime_keep_at_center; +#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ + guint protocol_id; + guint serial_port_id; }; GType vik_gps_layer_get_type () @@ -346,15 +344,15 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara 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 HAVE_LIBGPS +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING case PARAM_GPSD_HOST: if (vgl->gpsd_host) g_free(vgl->gpsd_host); @@ -374,7 +372,7 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara case PARAM_REALTIME_CENTERED: vgl->realtime_keep_at_center = data.b; break; -#endif +#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ default: g_warning("gps_layer_set_param(): unknown parameter"); } @@ -394,7 +392,7 @@ static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id ) case PARAM_PORT: rv.u = vgl->serial_port_id; break; -#ifdef HAVE_LIBGPS +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING case PARAM_GPSD_HOST: rv.s = vgl->gpsd_host ? vgl->gpsd_host : ""; break; @@ -410,9 +408,9 @@ static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id ) case PARAM_REALTIME_CENTERED: rv.b = vgl->realtime_keep_at_center; break; -#endif +#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ default: - g_warning("gps_layer_get_param(): unknown parameter"); + g_warning(_("%s: unknown parameter"), __FUNCTION__); } return rv; @@ -429,7 +427,7 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) vgl->children = NULL; vgl->cur_read_child = 0; -#ifdef HAVE_LIBGPS +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING vgl->realtime_tracking_mutex = g_mutex_new(); vgl->realtime_tracking = FALSE; vgl->vgpsd = NULL; @@ -441,16 +439,16 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) vgl->realtime_gpsd_unit = gpsd_units(); // fprintf(stderr, "DEBUG: gpsd_unit = %d\n", vgl->realtime_gpsd_unit); vgl->realtime_track = NULL; -#endif /* 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; +#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ + vgl->protocol_id = 0; + vgl->serial_port_id = 0; return vgl; } @@ -474,7 +472,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 HAVE_LIBGPS +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING if (vgl->realtime_tracking) { if (VIK_LAYER(vgl) == trigger) { if ( vik_viewport_get_half_drawn ( VIK_VIEWPORT(data) ) ) { @@ -487,7 +485,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 +#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ } static void gps_layer_change_coord_mode ( VikGpsLayer *vgl, VikCoordMode mode ) @@ -509,17 +507,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 HAVE_LIBGPS +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING item = gtk_menu_item_new_with_label ( vgl->realtime_tracking ? "Stop realtime tracking" : "Start realtime tracking" ); @@ -530,19 +528,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 +#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 ); @@ -562,7 +560,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 HAVE_LIBGPS +#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) @@ -573,7 +571,7 @@ static void vik_gps_layer_free ( VikGpsLayer *vgl ) g_object_unref(vgl->realtime_track_pt2_gc); if (vgl->realtime_tracking_mutex != NULL) g_mutex_free(vgl->realtime_tracking_mutex); -#endif +#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ } gboolean vik_gps_layer_delete ( VikGpsLayer *vgl, GtkTreeIter *iter ) @@ -601,7 +599,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 ); @@ -673,9 +671,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; @@ -687,15 +699,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 ); } @@ -709,7 +747,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); @@ -878,12 +916,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 { @@ -915,19 +953,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 (""); @@ -999,7 +1037,7 @@ static void gps_empty_all_cb( gpointer layer_and_vlp[2] ) vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_DOWNLOAD]); } -#ifdef HAVE_LIBGPS +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp) { struct LatLon ll; @@ -1100,10 +1138,15 @@ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) /* 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; + tp->extended = TRUE; ll.lat = vgl->realtime_fix.fix.latitude; ll.lon = vgl->realtime_fix.fix.longitude; @@ -1112,6 +1155,7 @@ 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; } } @@ -1128,17 +1172,13 @@ 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); 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 || @@ -1169,7 +1209,6 @@ static gboolean gpsd_data_available(GIOChannel *source, GIOCondition condition, gps_poll(&vgl->vgpsd->gpsd); return TRUE; } -#endif static gchar *make_track_name(VikTrwLayer *vtl) { @@ -1187,12 +1226,14 @@ static gchar *make_track_name(VikTrwLayer *vtl) } -#ifdef HAVE_LIBGPS 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_tracking) { struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port); if (gpsd == NULL) { @@ -1249,5 +1290,5 @@ static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2]) g_mutex_unlock(vgl->realtime_tracking_mutex); } } -#endif +#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */