1 files changed, 344 insertions, 346 deletions

diff --git a/navit/vehicle/gpsd/vehicle_gpsd.c b/navit/vehicle/gpsd/vehicle_gpsd.c
index a8c29cd97..99a4b4ffc 100644
--- a/navit/vehicle/gpsd/vehicle_gpsd.c
+++ b/navit/vehicle/gpsd/vehicle_gpsd.c
@@ -1,4 +1,4 @@
-/**
+/*
  * Navit, a modular navigation system.
  * Copyright (C) 2005-2008 Navit Team
  *
@@ -35,32 +35,40 @@
 #include "event.h"
 #include "types.h"
 
+/**
+ * @defgroup vehicle-gpsd Vehicle Gpsd
+ * @ingroup vehicle-plugins
+ * @brief The Vehicle to gain position data from the gpsd service
+ *
+ * @{
+ */
+
 static struct vehicle_priv {
-	char *source;
-	char *gpsd_query;
-	struct callback_list *cbl;
-	struct callback *cb, *cbt;
-	struct event_watch *evwatch;
-	guint retry_interval;
-	struct gps_data_t *gps;
-	struct coord_geo geo;
-	double speed;
-	double direction;
-	double height;
-	double hdop;
-	int status;
-	int fix_type;
-	time_t fix_time;
-	int sats;
-	int sats_signal;
-	int sats_used;
-	char *nmea_data;
-	char *nmea_data_buf;
-	struct event_timeout *retry_timer2;
-	struct attr ** attrs;
-	char fixiso8601[128];
+    char *source;
+    char *gpsd_query;
+    struct callback_list *cbl;
+    struct callback *cb, *cbt;
+    struct event_watch *evwatch;
+    guint retry_interval;
+    struct gps_data_t *gps;
+    struct coord_geo geo;
+    double speed;
+    double direction;
+    double height;
+    double hdop;
+    int status;
+    int fix_type;
+    time_t fix_time;
+    int sats;
+    int sats_signal;
+    int sats_used;
+    char *nmea_data;
+    char *nmea_data_buf;
+    struct event_timeout *retry_timer2;
+    struct attr ** attrs;
+    char fixiso8601[128];
 #ifdef HAVE_GPSBT
-	gpsbt_t context;
+    gpsbt_t context;
 #endif
 } *vehicle_last;
 
@@ -74,124 +82,127 @@ static void
 vehicle_gpsd_callback(struct gps_data_t *data, const char *buf, size_t len)
 #else
 vehicle_gpsd_callback(struct gps_data_t *data, const char *buf, size_t len,
-		      int level)
+                      int level)
 #endif
 {
-	char *pos,*nmea_data_buf;
-        int i=0,sats_signal=0;
-       
-	struct vehicle_priv *priv = vehicle_last;
-	if( len > 0 && buf[0] == '$' ) {
-		char buffer[len+2];
-		buffer[len+1]='\0';
-		memcpy(buffer, buf, len);
-		pos=strchr(buffer,'\n');
-		if(!pos) {
-			pos=strchr(buffer,'\r');
-		}
-		if (pos) {
-			*pos  ='\n';
-			*++pos='\0';
-			if (!priv->nmea_data_buf || strlen(priv->nmea_data_buf) < 65536) {
-				nmea_data_buf=g_strconcat(priv->nmea_data_buf ? priv->nmea_data_buf : "", buffer, NULL);
-				g_free(priv->nmea_data_buf);
-				priv->nmea_data_buf=nmea_data_buf;
-			} else {
-				dbg(lvl_error, "nmea buffer overflow, discarding '%s'\n", buffer);
-			}
-		}
-	}	
-	dbg(lvl_debug,"data->set="LONGLONG_HEX_FMT"\n", (unsigned long long)data->set);
-	if (data->set & SPEED_SET) {
-		priv->speed = data->fix.speed * 3.6;
-		if(!isnan(data->fix.speed))
-			callback_list_call_attr_0(priv->cbl, attr_position_speed);
-		data->set &= ~SPEED_SET;
-	}
-	if (data->set & TRACK_SET) {
-		priv->direction = data->fix.track;
-		data->set &= ~TRACK_SET;
-	}
-	if (data->set & ALTITUDE_SET) {
-		priv->height = data->fix.altitude;
-		data->set &= ~ALTITUDE_SET;
-	}
-	if (data->set & SATELLITE_SET) {
+    char *pos,*nmea_data_buf;
+    int i=0,sats_signal=0;
+
+    struct vehicle_priv *priv = vehicle_last;
+    if( len > 0 && buf[0] == '$' ) {
+        char buffer[len+2];
+        buffer[len+1]='\0';
+        memcpy(buffer, buf, len);
+        pos=strchr(buffer,'\n');
+        if(!pos) {
+            pos=strchr(buffer,'\r');
+        }
+        if (pos) {
+            *pos  ='\n';
+            *++pos='\0';
+            if (!priv->nmea_data_buf || strlen(priv->nmea_data_buf) < 65536) {
+                nmea_data_buf=g_strconcat(priv->nmea_data_buf ? priv->nmea_data_buf : "", buffer, NULL);
+                g_free(priv->nmea_data_buf);
+                priv->nmea_data_buf=nmea_data_buf;
+            } else {
+                dbg(lvl_error, "nmea buffer overflow, discarding '%s'", buffer);
+            }
+        }
+    }
+
+    dbg(lvl_debug,"data->set="LONGLONG_HEX_FMT"", (unsigned long long)data->set);
+    if (data->set & SPEED_SET) {
+        priv->speed = data->fix.speed * MPS_TO_KPH;
+        if(!isnan(data->fix.speed))
+            callback_list_call_attr_0(priv->cbl, attr_position_speed);
+        data->set &= ~SPEED_SET;
+    }
+
+    if (data->set & TRACK_SET) {
+        priv->direction = data->fix.track;
+        data->set &= ~TRACK_SET;
+    }
+    if (data->set & ALTITUDE_SET) {
+        priv->height = data->fix.altitude;
+        data->set &= ~ALTITUDE_SET;
+    }
+    if (data->set & SATELLITE_SET) {
 // We cannot rely on GPSD_API_MAJOR_VERSION here because it was not
 // incremented for this change :-(.
 #ifdef HAVE_LIBGPS19
-                if(data->satellites_visible > 0) {
+        if(data->satellites_visible > 0) {
 #else
-                if(data->satellites > 0) {
+        if(data->satellites > 0) {
 #endif
-                        sats_signal=0;
+            sats_signal=0;
 #ifdef HAVE_LIBGPS19
-                        for( i=0;i<data->satellites_visible;i++) {
+            for( i=0; i<data->satellites_visible; i++) {
 #else
-                        for( i=0;i<data->satellites;i++) {
+            for( i=0; i<data->satellites; i++) {
 #endif
 #if GPSD_API_MAJOR_VERSION >= 6
-                               if (data->skyview[i].ss > 0)
+                if (data->skyview[i].ss > 0)
 #else
-                               if (data->ss[i] > 0)
+                if (data->ss[i] > 0)
 #endif
-                                        sats_signal++;
-                        }
-                }
+                    sats_signal++;
+            }
+        }
 #ifdef HAVE_LIBGPS19
-		if (priv->sats_used != data->satellites_used || priv->sats != data->satellites_visible || priv->sats_signal != sats_signal ) {
+        if (priv->sats_used != data->satellites_used || priv->sats != data->satellites_visible
+                || priv->sats_signal != sats_signal ) {
 #else
-		if (priv->sats_used != data->satellites_used || priv->sats != data->satellites || priv->sats_signal != sats_signal ) {
+        if (priv->sats_used != data->satellites_used || priv->sats != data->satellites || priv->sats_signal != sats_signal ) {
 #endif
-			priv->sats_used = data->satellites_used;
+            priv->sats_used = data->satellites_used;
 #ifdef HAVE_LIBGPS19
-			priv->sats = data->satellites_visible;
+            priv->sats = data->satellites_visible;
 #else
-			priv->sats = data->satellites;
+            priv->sats = data->satellites;
 #endif
-                        priv->sats_signal = sats_signal;
-			callback_list_call_attr_0(priv->cbl, attr_position_sats);
-		}
-		data->set &= ~SATELLITE_SET;
-	}
-	if (data->set & STATUS_SET) {
-		priv->status = data->status;
-		data->set &= ~STATUS_SET;
-	}
-	if (data->set & MODE_SET) {
-		priv->fix_type = data->fix.mode - 1;
-		data->set &= ~MODE_SET;
-	}
-	if (data->set & TIME_SET) {
-		priv->fix_time = data->fix.time;
-		data->set &= ~TIME_SET;
-	}
+            priv->sats_signal = sats_signal;
+            callback_list_call_attr_0(priv->cbl, attr_position_sats);
+        }
+        data->set &= ~SATELLITE_SET;
+    }
+    if (data->set & STATUS_SET) {
+        priv->status = data->status;
+        data->set &= ~STATUS_SET;
+    }
+    if (data->set & MODE_SET) {
+        priv->fix_type = data->fix.mode - 1;
+        data->set &= ~MODE_SET;
+    }
+    if (data->set & TIME_SET) {
+        priv->fix_time = data->fix.time;
+        data->set &= ~TIME_SET;
+    }
 #ifdef HAVE_LIBGPS19
-	if (data->set & DOP_SET) {
-		dbg(lvl_debug, "pdop : %g\n", data->dop.pdop);
-		priv->hdop = data->dop.pdop;
-		data->set &= ~DOP_SET;
+    if (data->set & DOP_SET) {
+        dbg(lvl_debug, "pdop : %g", data->dop.pdop);
+        priv->hdop = data->dop.pdop;
+        data->set &= ~DOP_SET;
 #else
-	if (data->set & PDOP_SET) {
-		dbg(lvl_debug, "pdop : %g\n", data->pdop);
-		priv->hdop = data->hdop;
-		data->set &= ~PDOP_SET;
+    if (data->set & PDOP_SET) {
+        dbg(lvl_debug, "pdop : %g", data->pdop);
+        priv->hdop = data->hdop;
+        data->set &= ~PDOP_SET;
 #endif
-	}
-	if (data->set & LATLON_SET) {
-		priv->geo.lat = data->fix.latitude;
-		priv->geo.lng = data->fix.longitude;
-		dbg(lvl_debug,"lat=%f lng=%f\n", priv->geo.lat, priv->geo.lng);
-		g_free(priv->nmea_data);
-		priv->nmea_data=priv->nmea_data_buf;
-		priv->nmea_data_buf=NULL;
-		data->set &= ~LATLON_SET;
-	}
-	// If data->fix.speed is NAN, then the drawing gets jumpy.
-	if (! isnan(data->fix.speed) && priv->fix_type > 0) {
-		callback_list_call_attr_0(priv->cbl, attr_position_coord_geo);
-	}
-	dbg(lvl_info,"speed ok\n");
+    }
+    if (data->set & LATLON_SET) {
+        priv->geo.lat = data->fix.latitude;
+        priv->geo.lng = data->fix.longitude;
+        dbg(lvl_debug,"lat=%f lng=%f", priv->geo.lat, priv->geo.lng);
+        g_free(priv->nmea_data);
+        priv->nmea_data=priv->nmea_data_buf;
+        priv->nmea_data_buf=NULL;
+        data->set &= ~LATLON_SET;
+    }
+    // If data->fix.speed is NAN, then the drawing gets jumpy.
+    if (! isnan(data->fix.speed) && priv->fix_type > 0) {
+        callback_list_call_attr_0(priv->cbl, attr_position_coord_geo);
+    }
+    dbg(lvl_info,"speed ok");
 }
 
 /**
@@ -199,277 +210,264 @@ vehicle_gpsd_callback(struct gps_data_t *data, const char *buf, size_t len,
  * Return FALSE if retry not required
  * Return TRUE to try again
  */
-static int
-vehicle_gpsd_try_open(struct vehicle_priv *priv)
-{
-	char *source = g_strdup(priv->source);
-	char *colon = index(source + 7, ':');
-	char *port=NULL;
-	if (colon) {
-		*colon = '\0';
-		port=colon+1;
-	}
-	dbg(lvl_debug,"Trying to connect to %s:%s\n",source+7,port?port:"default");
+static int vehicle_gpsd_try_open(struct vehicle_priv *priv) {
+    char *source = g_strdup(priv->source);
+    char *colon = index(source + 7, ':');
+    char *port=NULL;
+    if (colon) {
+        *colon = '\0';
+        port=colon+1;
+    }
+    dbg(lvl_debug,"Trying to connect to %s:%s",source+7,port?port:"default");
 
 #if GPSD_API_MAJOR_VERSION >= 5
-        /* gps_open returns 0 on success */
-	if (gps_open(source + 7, port, priv->gps)) {
+    /* gps_open returns 0 on success */
+    if (gps_open(source + 7, port, priv->gps)) {
 #else
-	priv->gps = gps_open(source + 7, port);
-	if(!priv->gps) {
+    priv->gps = gps_open(source + 7, port);
+    if(!priv->gps) {
 #endif
-		dbg(lvl_error,"gps_open failed for '%s'. Retrying in %d seconds. Have you started gpsd?\n", priv->source, priv->retry_interval);
-                g_free(source);
-		return TRUE;
-	}
-	g_free(source);
+        dbg(lvl_error,"gps_open failed for '%s'. Retrying in %d seconds. Have you started gpsd?", priv->source,
+            priv->retry_interval);
+        g_free(source);
+        return TRUE;
+    }
+    g_free(source);
 
 #ifdef HAVE_LIBGPS19
-	if (strchr(priv->gpsd_query,'r'))
-		gps_stream(priv->gps, WATCH_ENABLE|WATCH_NMEA|WATCH_JSON, NULL);
-	else
-		gps_stream(priv->gps, WATCH_ENABLE|WATCH_JSON, NULL);
+    if (strchr(priv->gpsd_query,'r'))
+        gps_stream(priv->gps, WATCH_ENABLE|WATCH_NMEA|WATCH_JSON, NULL);
+    else
+        gps_stream(priv->gps, WATCH_ENABLE|WATCH_JSON, NULL);
 #else
-	gps_query(priv->gps, priv->gpsd_query);
+    gps_query(priv->gps, priv->gpsd_query);
 #endif
 
 #if GPSD_API_MAJOR_VERSION < 5
-	gps_set_raw_hook(priv->gps, vehicle_gpsd_callback);
+    gps_set_raw_hook(priv->gps, vehicle_gpsd_callback);
 #endif
-	priv->cb = callback_new_1(callback_cast(vehicle_gpsd_io), priv);
-	priv->cbt = callback_new_1(callback_cast(vehicle_gpsd_try_open), priv);
-	priv->evwatch = event_add_watch(priv->gps->gps_fd, event_watch_cond_read, priv->cb);
-	if (!priv->gps->gps_fd) {
-		dbg(lvl_error,"Warning: gps_fd is 0, most likely you have used a gps.h incompatible to libgps");
-	}
-	dbg(lvl_debug,"Connected to gpsd fd=%d evwatch=%p\n", priv->gps->gps_fd, priv->evwatch);
-	event_remove_timeout(priv->retry_timer2);
-	priv->retry_timer2=NULL;
-	return FALSE;
+    priv->cb = callback_new_1(callback_cast(vehicle_gpsd_io), priv);
+    priv->cbt = callback_new_1(callback_cast(vehicle_gpsd_try_open), priv);
+    priv->evwatch = event_add_watch(priv->gps->gps_fd, event_watch_cond_read, priv->cb);
+    if (!priv->gps->gps_fd) {
+        dbg(lvl_error,"Warning: gps_fd is 0, most likely you have used a gps.h incompatible to libgps");
+    }
+    dbg(lvl_debug,"Connected to gpsd fd=%d evwatch=%p", priv->gps->gps_fd, priv->evwatch);
+    event_remove_timeout(priv->retry_timer2);
+    priv->retry_timer2=NULL;
+    return FALSE;
 }
 
 /**
  * Open a connection to gpsd. Will re-try the connection if it fails
  */
-static void
-vehicle_gpsd_open(struct vehicle_priv *priv)
-{
+static void vehicle_gpsd_open(struct vehicle_priv *priv) {
 #ifdef HAVE_GPSBT
-	char errstr[256] = "";
-	/* We need to start gpsd (via gpsbt) first. */
-	errno = 0;
-	memset(&priv->context, 0, sizeof(gpsbt_t));
-	if(gpsbt_start(NULL, 0, 0, 0, errstr, sizeof(errstr),
-		0, &priv->context) < 0) {
-	       dbg(lvl_error,"Error connecting to GPS with gpsbt: (%d) %s (%s)\n",
-		  errno, strerror(errno), errstr);
-	}
-	sleep(1);       /* give gpsd time to start */
-	dbg(lvl_debug,"gpsbt_start: completed\n");
+    char errstr[256] = "";
+    /* We need to start gpsd (via gpsbt) first. */
+    errno = 0;
+    memset(&priv->context, 0, sizeof(gpsbt_t));
+    if(gpsbt_start(NULL, 0, 0, 0, errstr, sizeof(errstr),
+                   0, &priv->context) < 0) {
+        dbg(lvl_error,"Error connecting to GPS with gpsbt: (%d) %s (%s)",
+            errno, strerror(errno), errstr);
+    }
+    sleep(1);       /* give gpsd time to start */
+    dbg(lvl_debug,"gpsbt_start: completed");
 #endif
-	priv->retry_timer2=NULL;
-	if (vehicle_gpsd_try_open(priv)) 
-		priv->retry_timer2=event_add_timeout(priv->retry_interval*1000, 1, priv->cbt);
+    priv->retry_timer2=NULL;
+    if (vehicle_gpsd_try_open(priv))
+        priv->retry_timer2=event_add_timeout(priv->retry_interval*1000, 1, priv->cbt);
 }
 
-static void
-vehicle_gpsd_close(struct vehicle_priv *priv)
-{
+static void vehicle_gpsd_close(struct vehicle_priv *priv) {
 #ifdef HAVE_GPSBT
-	int err;
+    int err;
 #endif
 
-	if (priv->retry_timer2) {
-		event_remove_timeout(priv->retry_timer2);
-		priv->retry_timer2=NULL;
-	}
-	if (priv->evwatch) {
-		event_remove_watch(priv->evwatch);
-		priv->evwatch = NULL;
-	}
-	if (priv->cb) {
-		callback_destroy(priv->cb);
-		priv->cb = NULL;
-	}
-	if (priv->cbt) {
-		callback_destroy(priv->cbt);
-		priv->cbt = NULL;
-	}
-	if (priv->gps) {
-		gps_close(priv->gps);
+    if (priv->retry_timer2) {
+        event_remove_timeout(priv->retry_timer2);
+        priv->retry_timer2=NULL;
+    }
+    if (priv->evwatch) {
+        event_remove_watch(priv->evwatch);
+        priv->evwatch = NULL;
+    }
+    if (priv->cb) {
+        callback_destroy(priv->cb);
+        priv->cb = NULL;
+    }
+    if (priv->cbt) {
+        callback_destroy(priv->cbt);
+        priv->cbt = NULL;
+    }
+    if (priv->gps) {
+        gps_close(priv->gps);
 #if GPSD_API_MAJOR_VERSION >= 5
-                g_free(priv->gps);
+        g_free(priv->gps);
 #endif
-		priv->gps = NULL;
-	}
+        priv->gps = NULL;
+    }
 #ifdef HAVE_GPSBT
-	err = gpsbt_stop(&priv->context);
-	if (err < 0) {
-		dbg(lvl_error,"Error %d while gpsbt_stop", err);
-	}
-	dbg(lvl_debug,"gpsbt_stop: completed, (%d)",err);
+    err = gpsbt_stop(&priv->context);
+    if (err < 0) {
+        dbg(lvl_error,"Error %d while gpsbt_stop", err);
+    }
+    dbg(lvl_debug,"gpsbt_stop: completed, (%d)",err);
 #endif
 }
 
-static void
-vehicle_gpsd_io(struct vehicle_priv *priv)
-{
-	dbg(lvl_debug, "enter\n");
-	if (priv->gps) {
-	 	vehicle_last = priv;
+static void vehicle_gpsd_io(struct vehicle_priv *priv) {
+    dbg(lvl_debug, "enter");
+    if (priv->gps) {
+        vehicle_last = priv;
 #if GPSD_API_MAJOR_VERSION >= 5
-		int read_result;
-		/* Read until EOF, in case we are lagging behind.
-		 * No point in processing old GPS reports. */
-		while((read_result=gps_read(priv->gps))>0);
-		if(read_result==-1) {
-                  dbg(lvl_error,"gps_poll failed\n");
-                  vehicle_gpsd_close(priv);
-                  vehicle_gpsd_open(priv);
-                }
-                else {
-                  const char *buf;
-                  buf = gps_data(priv->gps);
-  	          vehicle_gpsd_callback(priv->gps,buf,strlen(buf));
-                }
+        int read_result;
+        /* Read until EOF, in case we are lagging behind.
+         * No point in processing old GPS reports. */
+#if GPSD_API_MAJOR_VERSION >= 7
+        while((read_result=gps_read(priv->gps, NULL, 0))>0);
+#else
+        while((read_result=gps_read(priv->gps))>0);
+#endif
+        if(read_result==-1) {
+            dbg(lvl_error,"gps_poll failed");
+            vehicle_gpsd_close(priv);
+            vehicle_gpsd_open(priv);
+        } else {
+            const char *buf;
+            buf = gps_data(priv->gps);
+            vehicle_gpsd_callback(priv->gps,buf,strlen(buf));
+        }
 #else
-                if (gps_poll(priv->gps)) {
-			dbg(lvl_error,"gps_poll failed\n");
-			vehicle_gpsd_close(priv);
-			vehicle_gpsd_open(priv);
-                }
+        if (gps_poll(priv->gps)) {
+            dbg(lvl_error,"gps_poll failed");
+            vehicle_gpsd_close(priv);
+            vehicle_gpsd_open(priv);
+        }
 #endif
-	}
+    }
 }
 
-static void
-vehicle_gpsd_destroy(struct vehicle_priv *priv)
-{
-	vehicle_gpsd_close(priv);
-	if (priv->source)
-		g_free(priv->source);
-	if (priv->gpsd_query)
-		g_free(priv->gpsd_query);
+static void vehicle_gpsd_destroy(struct vehicle_priv *priv) {
+    vehicle_gpsd_close(priv);
+    if (priv->source)
+        g_free(priv->source);
+    if (priv->gpsd_query)
+        g_free(priv->gpsd_query);
 #if GPSD_API_MAJOR_VERSION >= 5
-        g_free(priv->gps);
+    g_free(priv->gps);
 #endif
-	g_free(priv);
+    g_free(priv);
 }
 
-static int
-vehicle_gpsd_position_attr_get(struct vehicle_priv *priv,
-			       enum attr_type type, struct attr *attr)
-{
-	struct attr * active=NULL;
-	switch (type) {
-	case attr_position_fix_type:
-		attr->u.num = priv->fix_type;
-		break;
-	case attr_position_height:
-		attr->u.numd = &priv->height;
-		break;
-	case attr_position_speed:
-		attr->u.numd = &priv->speed;
-		break;
-	case attr_position_direction:
-		attr->u.numd = &priv->direction;
-		break;
-	case attr_position_hdop:
-		attr->u.numd = &priv->hdop;
-		break;
-	case attr_position_qual:
-		attr->u.num = priv->sats;
-		break;
-	case attr_position_sats_signal:
-		attr->u.num = priv->sats_signal;
-		break;
-	case attr_position_sats_used:
-		attr->u.num = priv->sats_used;
-		break;
-	case attr_position_coord_geo:
-		attr->u.coord_geo = &priv->geo;
-		break;
-	case attr_position_nmea:
-		attr->u.str=priv->nmea_data;
-		if (! attr->u.str)
-			return 0;
-		break;
-	case attr_position_time_iso8601:
-		{
-		struct tm tm;
-		if (!priv->fix_time)
-			return 0;
-		if (gmtime_r(&priv->fix_time, &tm)) {
-			strftime(priv->fixiso8601, sizeof(priv->fixiso8601),
-				"%Y-%m-%dT%TZ", &tm);
-			attr->u.str=priv->fixiso8601;
-		} else
-			return 0;
-		}
-		break;
-	case attr_active:
-	  active = attr_search(priv->attrs,NULL,attr_active);
-	  if(active != NULL) {
-		attr->u.num=active->u.num;
-	    return 1;
-	  } else
-	    return 0;
-	       break;
-	default:
-		return 0;
-	}
-	attr->type = type;
-	return 1;
+static int vehicle_gpsd_position_attr_get(struct vehicle_priv *priv,
+        enum attr_type type, struct attr *attr) {
+    struct attr * active=NULL;
+    switch (type) {
+    case attr_position_fix_type:
+        attr->u.num = priv->fix_type;
+        break;
+    case attr_position_height:
+        attr->u.numd = &priv->height;
+        break;
+    case attr_position_speed:
+        attr->u.numd = &priv->speed;
+        break;
+    case attr_position_direction:
+        attr->u.numd = &priv->direction;
+        break;
+    case attr_position_hdop:
+        attr->u.numd = &priv->hdop;
+        break;
+    case attr_position_qual:
+        attr->u.num = priv->sats;
+        break;
+    case attr_position_sats_signal:
+        attr->u.num = priv->sats_signal;
+        break;
+    case attr_position_sats_used:
+        attr->u.num = priv->sats_used;
+        break;
+    case attr_position_coord_geo:
+        attr->u.coord_geo = &priv->geo;
+        break;
+    case attr_position_nmea:
+        attr->u.str=priv->nmea_data;
+        if (! attr->u.str)
+            return 0;
+        break;
+    case attr_position_time_iso8601: {
+        struct tm tm;
+        if (!priv->fix_time)
+            return 0;
+        if (gmtime_r(&priv->fix_time, &tm)) {
+            strftime(priv->fixiso8601, sizeof(priv->fixiso8601),
+                     "%Y-%m-%dT%TZ", &tm);
+            attr->u.str=priv->fixiso8601;
+        } else
+            return 0;
+    }
+    break;
+    case attr_active:
+        active = attr_search(priv->attrs,NULL,attr_active);
+        if(active != NULL) {
+            attr->u.num=active->u.num;
+            return 1;
+        } else
+            return 0;
+        break;
+    default:
+        return 0;
+    }
+    attr->type = type;
+    return 1;
 }
 
 static struct vehicle_methods vehicle_gpsd_methods = {
-	vehicle_gpsd_destroy,
-	vehicle_gpsd_position_attr_get,
+    vehicle_gpsd_destroy,
+    vehicle_gpsd_position_attr_get,
 };
 
-static struct vehicle_priv *
-vehicle_gpsd_new_gpsd(struct vehicle_methods
-		      *meth, struct callback_list
-		      *cbl, struct attr **attrs)
-{
-	struct vehicle_priv *ret;
-	struct attr *source, *query, *retry_int;
+static struct vehicle_priv *vehicle_gpsd_new_gpsd(struct vehicle_methods
+        *meth, struct callback_list
+        *cbl, struct attr **attrs) {
+    struct vehicle_priv *ret;
+    struct attr *source, *query, *retry_int;
 
-	dbg(lvl_debug, "enter\n");
-	source = attr_search(attrs, NULL, attr_source);
-	ret = g_new0(struct vehicle_priv, 1);
+    dbg(lvl_debug, "enter");
+    source = attr_search(attrs, NULL, attr_source);
+    ret = g_new0(struct vehicle_priv, 1);
 #if GPSD_API_MAJOR_VERSION >= 5
-	ret->gps = g_new0(struct gps_data_t, 1);
+    ret->gps = g_new0(struct gps_data_t, 1);
 #endif
-	ret->source = g_strdup(source->u.str);
-	query = attr_search(attrs, NULL, attr_gpsd_query);
-	if (query) {
-		ret->gpsd_query = g_strconcat(query->u.str, "\n", NULL);
-	} else {
-		ret->gpsd_query = g_strdup("w+x\n");
-	}
-	dbg(lvl_debug,"Format string for gpsd_query: %s\n",ret->gpsd_query);
-	retry_int = attr_search(attrs, NULL, attr_retry_interval);
-	if (retry_int) {
-		ret->retry_interval = retry_int->u.num;
-		if (ret->retry_interval < MIN_RETRY_INTERVAL) {
-			dbg(lvl_error, "Retry interval %d too small, setting to %d\n", ret->retry_interval, MIN_RETRY_INTERVAL);
-			ret->retry_interval = MIN_RETRY_INTERVAL;
-		}
-	} else {
-		dbg(lvl_debug, "Retry interval not defined, setting to %d\n", DEFAULT_RETRY_INTERVAL);
-		ret->retry_interval = DEFAULT_RETRY_INTERVAL;
-	}
-	ret->cbl = cbl;
-	*meth = vehicle_gpsd_methods;
-	ret->attrs = attrs;
-	vehicle_gpsd_open(ret);
-	return ret;
+    ret->source = g_strdup(source->u.str);
+    query = attr_search(attrs, NULL, attr_gpsd_query);
+    if (query) {
+        ret->gpsd_query = g_strconcat(query->u.str, "\n", NULL);
+    } else {
+        ret->gpsd_query = g_strdup("w+x\n");
+    }
+    dbg(lvl_debug,"Format string for gpsd_query: %s",ret->gpsd_query);
+    retry_int = attr_search(attrs, NULL, attr_retry_interval);
+    if (retry_int) {
+        ret->retry_interval = retry_int->u.num;
+        if (ret->retry_interval < MIN_RETRY_INTERVAL) {
+            dbg(lvl_error, "Retry interval %d too small, setting to %d", ret->retry_interval, MIN_RETRY_INTERVAL);
+            ret->retry_interval = MIN_RETRY_INTERVAL;
+        }
+    } else {
+        dbg(lvl_debug, "Retry interval not defined, setting to %d", DEFAULT_RETRY_INTERVAL);
+        ret->retry_interval = DEFAULT_RETRY_INTERVAL;
+    }
+    ret->cbl = cbl;
+    *meth = vehicle_gpsd_methods;
+    ret->attrs = attrs;
+    vehicle_gpsd_open(ret);
+    return ret;
 }
 
-void
-plugin_init(void)
-{
-	dbg(lvl_debug, "enter\n");
-	plugin_register_category_vehicle("gpsd", vehicle_gpsd_new_gpsd);
+void plugin_init(void) {
+    dbg(lvl_debug, "enter");
+    plugin_register_category_vehicle("gpsd", vehicle_gpsd_new_gpsd);
 }