X-Git-Url: http://git.maemo.org/git/?p=googlelatitude;a=blobdiff_plain;f=src%2Fgps.cpp;h=7c9eeadefb308b864717fb2e8c40c569abdd82d9;hp=39c0627d7147ea5cea3ac09219a830e9eb367dcd;hb=e98468d19d7c7f3b2e068e3bebcc5ff47dd61d9b;hpb=189b6505f9453649b3c12a61928aa344d9a9bc5b

diff --git a/src/gps.cpp b/src/gps.cpp
index 39c0627..7c9eead 100644
--- a/src/gps.cpp
+++ b/src/gps.cpp
@@ -1,58 +1,55 @@
 #include "gps.h"
 
-#ifdef Q_WS_MAEMO_5
-
 GpsMaemo5::GpsMaemo5(QObject *parent) : QObject(parent) {
     latitude = 0;
     longitude = 0;
     accuracy = 0;
-    usegps = -1;
-
+#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);
-}
 
-void GpsMaemo5::get_acwp() {
+    g_signal_connect(device, "changed", G_CALLBACK(GpsMaemo5_changed), this);
     g_object_set(G_OBJECT(control), "preferred-method", LOCATION_METHOD_ACWP, NULL);
-    usegps = 0;
-    restart();
-}
-
-void GpsMaemo5::get_agnss() {
-    g_object_set(G_OBJECT(control), "preferred-method", LOCATION_METHOD_AGNSS, NULL);
-    usegps = 1;
-    restart();
-}
-
-void GpsMaemo5::stop() {
-    location_gpsd_control_stop(control);
-}
+    g_object_set(G_OBJECT(control), "preferred-interval", LOCATION_INTERVAL_120S, NULL);
 
-void GpsMaemo5::restart() {
-    location_gpsd_control_stop(control);
     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 *)));
+
+    worker->post(QNetworkRequest(urlloc), QByteArray("{version:\"1.1.0\"}"));
+#endif // Q_WS_MAEMO_5
 }
 
+#ifdef Q_WS_MAEMO_5
 void GpsMaemo5_changed(LocationGPSDevice *device, GpsMaemo5 *gps) {
     if (device->fix) {
-        if (device->fix->fields & LOCATION_GPS_DEVICE_LATLONG_SET) {
-            g_print("lat = %f, long = %f, eph = %f\n", device->fix->latitude, device->fix->longitude, device->fix->eph/100.);
-            gps->latitude = device->fix->latitude;
-            gps->longitude = device->fix->longitude;
-            gps->accuracy = device->fix->eph/100.;
-
-            if ( gps->usegps == 0) {
-                emit gps->getOK_acwp();
-            } else if ( gps->usegps == 1 ) {
-                if ( gps->device->satellites_in_use > 0 ) {
-                    emit gps->getOK_agnss();
-                }
-            } else {
-                emit gps->getOK();
-            }
+        if (device->fix->fields) {
+            g_print("GpsMaemo5 lat = %f, long = %f, eph = %f\n", gps->device->fix->latitude, gps->device->fix->longitude, gps->device->fix->eph/100.);
+            gps->latitude = gps->device->fix->latitude;
+            gps->longitude = gps->device->fix->longitude;
+            gps->accuracy = gps->device->fix->eph/100.;
+            emit gps->fix();
         }
     }
 }
-
-#endif
+#else
+void GpsMaemo5::finishedreply(QNetworkReply *r) {
+    if ( r->url() == urlloc ) {
+        QString loc = r->readAll();
+        QRegExp regexp ("\\{\"latitude\":(.*),\"longitude\":(.*),\"accuracy\":(.*)\\}");
+        regexp.setMinimal(1);
+        regexp.indexIn(loc, 1);
+        latitude = regexp.capturedTexts().at(1).toDouble();
+        longitude = regexp.capturedTexts().at(2).toDouble();
+        accuracy = regexp.capturedTexts().at(3).toDouble();
+        qDebug() << "GpsMaemo5 lat = " << latitude << " long = " << longitude << " acc = " << accuracy;
+        emit fix();
+    } else {
+        qDebug() << "GpsMaemo5 Error url:" << r->url();
+        qDebug() << r->rawHeaderList();
+        qDebug() << r->readAll();
+    }
+}
+#endif // Q_WS_MAEMO_5