From 7316e5a15401fbf6a912a288a2c8074490bc3ad2 Mon Sep 17 00:00:00 2001
From: Adam Boggs <boggs-git@aircrafter.org>
Date: Sun, 29 Jan 2012 18:12:25 -0700
Subject: [PATCH] Added support for new icon marker interface.  Added car.png
 icon.

---
 car.png                  | Bin 0 -> 1845 bytes
 src/plugins/gps-plugin.c |  30 ++++++++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 car.png

diff --git a/car.png b/car.png
new file mode 100644
index 0000000000000000000000000000000000000000..af3f0f8b567e681d1f9a26ca72ae77433a6872f1
GIT binary patch
literal 1845
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

literal 0
HcmV?d00001

diff --git a/src/plugins/gps-plugin.c b/src/plugins/gps-plugin.c
index d783c37..e98cb7f 100644
--- a/src/plugins/gps-plugin.c
+++ b/src/plugins/gps-plugin.c
@@ -15,6 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+ /* TODO:
+  *    If gpsd connection fails, try to connect again periodically.
+  *    If gps stops sending data there should be an indication that it's stale.
+  */
+
 #define _XOPEN_SOURCE
 #include <stdio.h>
 #include <fcntl.h>
@@ -505,8 +510,8 @@ gboolean gps_redraw_all(gpointer data)
     /* update position labels */
     update_gps_status(gps_state);
 
+    /* Update track and marker position */
     if (gps_data_is_valid(gps_data)) {
-	/* Update track and marker position */
         g_debug("Updating track at lat = %f, long = %f, track = %f",
                         gps_data->fix.latitude,
                         gps_data->fix.longitude,
@@ -515,11 +520,11 @@ gboolean gps_redraw_all(gpointer data)
 	if (gps_state->marker) {
 	    grits_viewer_remove(gps_state->viewer,
 		    GRITS_OBJECT(gps_state->marker));
-	    g_object_unref(gps_state->viewer);
 	    gps_state->marker = NULL;
 	}
 
-        gps_state->marker = grits_marker_new("gps");
+	gps_state->marker = grits_marker_icon_new("GPS", "car.png",
+		gps_data->fix.track, TRUE);
 		
         GRITS_OBJECT(gps_state->marker)->center.lat  = gps_data->fix.latitude;
         GRITS_OBJECT(gps_state->marker)->center.lon  = gps_data->fix.longitude;
@@ -527,7 +532,7 @@ gboolean gps_redraw_all(gpointer data)
         GRITS_OBJECT(gps_state->marker)->lod         = EARTH_R;
 
         grits_viewer_add(gps_state->viewer, GRITS_OBJECT(gps_state->marker),
-			GRITS_LEVEL_OVERLAY, FALSE);
+			GRITS_LEVEL_OVERLAY, TRUE);
 	grits_viewer_refresh(gps_state->viewer);
     }
 
@@ -542,7 +547,7 @@ gboolean gps_redraw_all(gpointer data)
 	grits_viewer_get_location(gps_state->viewer, &lat, &lon, &elev);
 	grits_viewer_set_location(gps_state->viewer, gps_data->fix.latitude,
 					  gps_data->fix.longitude, elev);
-	grits_viewer_set_rotation(gps_state->viewer, 0, 0, 0);
+	//grits_viewer_set_rotation(gps_state->viewer, 0, 0, 0);
     }
 
     /* reschedule */
@@ -750,16 +755,29 @@ static void grits_plugin_gps_init(GritsPluginGPS *self)
 
 static void grits_plugin_gps_dispose(GObject *gobject)
 {
+	GritsPluginGPS *self = GRITS_PLUGIN_GPS(gobject);
+
 	g_debug("GritsPluginGPS: dispose");
 
+        if (self->viewer) {
+		if (self->marker) {
+		    grits_viewer_remove(self->viewer,
+		    			GRITS_OBJECT(self->marker));
+		}
+                g_object_unref(self->viewer);
+                self->viewer = NULL;
+        }
+
 	/* Drop references */
 	G_OBJECT_CLASS(grits_plugin_gps_parent_class)->dispose(gobject);
 }
 
 static void grits_plugin_gps_finalize(GObject *gobject)
 {
-	g_debug("GritsPluginGPS: finalize");
 	GritsPluginGPS *self = GRITS_PLUGIN_GPS(gobject);
+
+	g_debug("GritsPluginGPS: finalize");
+
 	/* Free data */
 	gtk_widget_destroy(self->config);
 	G_OBJECT_CLASS(grits_plugin_gps_parent_class)->finalize(gobject);
-- 
2.43.2