X-Git-Url: http://git.maemo.org/git/?p=googlelatitude;a=blobdiff_plain;f=src%2Fgps.cpp;h=cd87f24d4377246bf8c623575b59870e87e3206e;hp=d8a7f530f52306a8e73ed43987a595c6ed0a741e;hb=b80c04a8938fa73c45b5d8a17a1c2b2aab5eab3b;hpb=ce29090aae7170fd98632deb30f609ef3d1675d6

diff --git a/src/gps.cpp b/src/gps.cpp
index d8a7f53..cd87f24 100644
--- a/src/gps.cpp
+++ b/src/gps.cpp
@@ -1,26 +1,65 @@
 #include "gps.h"
 
-GpsMaemo5::GpsMaemo5(QObject *parent) : QObject(parent) {
-    latitude = 0;
-    longitude = 0;
-    accuracy = 0;
+GpsMaemo5::GpsMaemo5(QObject *parent) :
+        QObject(parent),
+        latitude(0), longitude(0), accuracy(0),
+        interval(1800), wait(30), usegps(false),
+        emitfix(false), stopgps(true) {
 #ifdef Q_WS_MAEMO_5
     control = location_gpsd_control_get_default();
     device = (LocationGPSDevice*) g_object_new(LOCATION_TYPE_GPS_DEVICE, NULL);
-
     g_signal_connect(device, "changed", G_CALLBACK(GpsMaemo5_changed), this);
-    g_object_set(G_OBJECT(control), "preferred-method", LOCATION_METHOD_ACWP, NULL);
-    g_object_set(G_OBJECT(control), "preferred-interval", LOCATION_INTERVAL_120S, NULL);
-
-    location_gpsd_control_start(control);
 #else
     urlloc = QUrl::fromEncoded("http://www.google.com/loc/json");
     worker = new QNetworkAccessManager();
-    connect(worker, SIGNAL(finished(QNetworkReply *)), this, SLOT(finishedreply(QNetworkReply *)));
-    gloc();
+    connect(worker, SIGNAL(finished(QNetworkReply *)), this, SLOT(gloc_reply(QNetworkReply *)));
+#endif // Q_WS_MAEMO_5
+}
+
+void GpsMaemo5::refresh() {
+    if ( stopgps ) return;
+    qDebug() << "GpsMaemo5: refresh";
+
+    QTimer::singleShot(interval*1000, this, SLOT(refresh()));
+    QTimer::singleShot(wait*1000, this, SLOT(stop()));
+
+#ifdef Q_WS_MAEMO_5
+    g_object_set(G_OBJECT(control), "preferred-method", LOCATION_METHOD_ACWP, NULL);
+    if (usegps) {
+        g_object_set(G_OBJECT(control), "preferred-method", LOCATION_METHOD_AGNSS, NULL);
+    }
+    location_gpsd_control_start(control);
+#else
+    worker->post(QNetworkRequest(urlloc), QByteArray("{version:\"1.1.0\"}"));
 #endif // Q_WS_MAEMO_5
 }
 
+void GpsMaemo5::stop() {
+    qDebug() << "GpsMaemo5: stop";
+#ifdef Q_WS_MAEMO_5
+    location_gpsd_control_stop(control);
+#else
+#endif // Q_WS_MAEMO_5
+    if (emitfix) {
+        emitfix = false;
+        emit fix();
+    }
+}
+
+void GpsMaemo5::forcestop() {
+    qDebug() << "GpsMaemo5: forcestop";
+    stopgps = true;
+}
+
+int GpsMaemo5::config(int i, int w, bool g) {
+    qDebug() << "GpsMaemo5: config";
+    stopgps = false;
+    interval = i;
+    wait = w;
+    usegps = g;
+    return 0;
+}
+
 #ifdef Q_WS_MAEMO_5
 void GpsMaemo5_changed(LocationGPSDevice *device, GpsMaemo5 *gps) {
     if (device->fix) {
@@ -29,17 +68,12 @@ void GpsMaemo5_changed(LocationGPSDevice *device, GpsMaemo5 *gps) {
             gps->latitude = gps->device->fix->latitude;
             gps->longitude = gps->device->fix->longitude;
             gps->accuracy = gps->device->fix->eph/100.;
-            emit gps->fix();
+            gps->emitfix = true;
         }
     }
 }
 #else
-void GpsMaemo5::gloc() {
-    worker->post(QNetworkRequest(urlloc), QByteArray("{version:\"1.1.0\"}"));
-    QTimer::singleShot(45*1000, this, SLOT(gloc()));
-}
-
-void GpsMaemo5::finishedreply(QNetworkReply *r) {
+void GpsMaemo5::gloc_reply(QNetworkReply *r) {
     if ( r->url() == urlloc ) {
         QString loc = r->readAll();
         QRegExp regexp ("\\{\"latitude\":(.*),\"longitude\":(.*),\"accuracy\":(.*)\\}");
@@ -48,8 +82,9 @@ void GpsMaemo5::finishedreply(QNetworkReply *r) {
         latitude = regexp.capturedTexts().at(1).toDouble();
         longitude = regexp.capturedTexts().at(2).toDouble();
         accuracy = regexp.capturedTexts().at(3).toDouble();
+        if ( accuracy > 100000 ) accuracy = 100000;
         qDebug() << "GpsIP lat" << latitude << "lon" << longitude << "acc" << accuracy;
-        emit fix();
+        emitfix = true;
     } else {
         qDebug() << "GpsIP Error url" << r->url();
         qDebug() << r->rawHeaderList();