Merge lp:~thomas-voss/qtubuntu-sensors/add-accuracy into lp:qtubuntu-sensors

[Thomas Voß]

Add interpretation of horizontal and vertical accuracy fields.
Add mutex to guard lastKnownPosition during updates.

Add interpretation of horizontal and vertical accuracy fields.
Add mutex to guard lastKnownPosition during updates.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/51/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-utopic-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-utopic-armhf-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-utopic-i386-ci/13/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-sensors-ci/51/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/qtubuntu-sensors/add-accuracy]

67. By Thomas Voß on 2014-06-26

[ Ricardo Mendoza ]
Migrate to Platform API based vibrator

68. By Thomas Voß on 2014-06-26

Make sure that cbs are nulled on destruction.

=== modified file 'plugins/position/core_geo_position_info_source.cpp'
--- plugins/position/core_geo_position_info_source.cpp	2014-01-07 17:49:57 +0000
+++ plugins/position/core_geo_position_info_source.cpp	2014-06-26 19:46:56 +0000
@@ -83,20 +83,37 @@
             ua_location_position_update_get_longitude_in_degree(position),
             ua_location_position_update_has_altitude(position) ? ua_location_position_update_get_altitude_in_meter(position) : 0);
         
+        QMutexLocker lock(&lastKnownPositionGuard);
+
         lastKnownPosition.setCoordinate(coord);
+
+        if (ua_location_position_update_has_horizontal_accuracy(position))
+            lastKnownPosition.setAttribute(
+                        QGeoPositionInfo::HorizontalAccuracy,
+                        ua_location_position_update_get_horizontal_accuracy_in_meter(position));
+
+        if (ua_location_position_update_has_vertical_accuracy(position))
+            lastKnownPosition.setAttribute(
+                        QGeoPositionInfo::HorizontalAccuracy,
+                        ua_location_position_update_get_vertical_accuracy_in_meter(position));
+
         lastKnownPosition.setTimestamp(
             QDateTime::fromMSecsSinceEpoch(
                 ua_location_position_update_get_timestamp(position)/1000));
 
+        QGeoPositionInfo info{lastKnownPosition};
+
         QMetaObject::invokeMethod(
             parent,
             "positionUpdated",
             Qt::QueuedConnection,
-            Q_ARG(QGeoPositionInfo, lastKnownPosition));        
+            Q_ARG(QGeoPositionInfo, info));
     }
 
     void handleHeadingUpdate(UALocationHeadingUpdate* heading)
     {
+        QMutexLocker lock(&lastKnownPositionGuard);
+
         lastKnownPosition.setAttribute(
             QGeoPositionInfo::Direction,
             ua_location_heading_update_get_heading_in_degree(heading));
@@ -105,15 +122,19 @@
             QDateTime::fromMSecsSinceEpoch(
                 ua_location_heading_update_get_timestamp(heading)/1000));
 
+        QGeoPositionInfo info{lastKnownPosition};
+
         QMetaObject::invokeMethod(
             parent,
             "positionUpdated",
             Qt::QueuedConnection,
-            Q_ARG(QGeoPositionInfo, lastKnownPosition));
+            Q_ARG(QGeoPositionInfo, info));
     };
 
     void handleVelocityUpdate(UALocationVelocityUpdate* velocity)
     {
+        QMutexLocker lock(&lastKnownPositionGuard);
+
         lastKnownPosition.setAttribute(
             QGeoPositionInfo::GroundSpeed,
             ua_location_velocity_update_get_velocity_in_meters_per_second(velocity));
@@ -122,11 +143,13 @@
             QDateTime::fromMSecsSinceEpoch(
                 ua_location_velocity_update_get_timestamp(velocity)/1000));
 
+        QGeoPositionInfo info{lastKnownPosition};
+
         QMetaObject::invokeMethod(
             parent,
             "positionUpdated",
             Qt::QueuedConnection,
-            Q_ARG(QGeoPositionInfo, lastKnownPosition));
+            Q_ARG(QGeoPositionInfo, info));
     };
 
     Private(core::GeoPositionInfoSource* parent)
@@ -153,11 +176,27 @@
 
     ~Private()
     {
+        ua_location_service_session_set_position_updates_handler(
+            session,
+            nullptr,
+            nullptr);
+
+        ua_location_service_session_set_heading_updates_handler(
+            session,
+            nullptr,
+            nullptr);
+
+        ua_location_service_session_set_velocity_updates_handler(
+            session,
+            nullptr,
+            nullptr);
+
         ua_location_service_session_unref(session);
     }
 
     core::GeoPositionInfoSource* parent;
     UALocationServiceSession* session;
+    QMutex lastKnownPositionGuard;
     QGeoPositionInfo lastKnownPosition;
     QTimer timer;
 };
@@ -166,7 +205,7 @@
         : QGeoPositionInfoSource(parent), d(new Private(this))
 {
     d->timer.setSingleShot(true);
-    QObject::connect(&d->timer, SIGNAL(timeout()), this, SLOT(updateTimeout()));
+    QObject::connect(&d->timer, SIGNAL(timeout()), this, SIGNAL(updateTimeout()));
 }
 
 core::GeoPositionInfoSource::~GeoPositionInfoSource()
@@ -186,7 +225,8 @@
 QGeoPositionInfo core::GeoPositionInfoSource::lastKnownPosition(bool fromSatellitePositioningMethodsOnly) const
 {
     Q_UNUSED(fromSatellitePositioningMethodsOnly);
-    return d->lastKnownPosition;
+    QMutexLocker lock(&d->lastKnownPositionGuard);
+    return QGeoPositionInfo(d->lastKnownPosition);
 }
 
 QGeoPositionInfoSource::PositioningMethods core::GeoPositionInfoSource::supportedPositioningMethods() const