Merge lp:~unity-api-team/unity-scopes-shell/fix-location-caching-vivid into lp:unity-scopes-shell

[Pete Woods]

Remove distance-based filtering and refresh GeoIP data every minute

Remove distance-based filtering and refresh GeoIP data every minute

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:186
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/271/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/13/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/13/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/271/rebuild

review: Needs Fixing (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good!

review: Approve

=== modified file 'src/Unity/ubuntulocationservice.cpp'
--- src/Unity/ubuntulocationservice.cpp	2014-11-18 17:08:43 +0000
+++ src/Unity/ubuntulocationservice.cpp	2015-01-20 09:03:36 +0000
@@ -51,6 +51,11 @@
      */
     static const int DEACTIVATE_INTERVAL = 5000;
 
+    /**
+     * Re-do the GeoIP call every 60 seconds
+     */
+    static const int GEOIP_INTERVAL = 60000;
+
     class DBusThread : public QThread
     {
 
@@ -92,7 +97,11 @@
         m_deactivateTimer.setSingleShot(true);
         m_deactivateTimer.setTimerType(Qt::VeryCoarseTimer);
 
-        m_geoIp->start();
+        m_geoipTimer.moveToThread(thread());
+        m_geoipTimer.setInterval(GEOIP_INTERVAL);
+        m_geoipTimer.setTimerType(Qt::CoarseTimer);
+
+        QMetaObject::invokeMethod(m_geoIp.data(), "start", Qt::QueuedConnection);
 
         try
         {
@@ -115,6 +124,9 @@
 
         // Wire up the network request finished timer
         connect(m_geoIp.data(), &GeoIp::finished, this, &Priv::requestFinished, Qt::QueuedConnection);
+
+        // Wire up the GeoIP repeat timer
+        connect(&m_geoipTimer, &QTimer::timeout, m_geoIp.data(), &GeoIp::start, Qt::QueuedConnection);
     }
 
     ~Priv()
@@ -166,6 +178,7 @@
             {
                 m_session->updates().position_status =
                         culss::Interface::Updates::Status::enabled;
+                m_geoipTimer.start();
             }
             else if (m_activationCount == 0
                     && m_session->updates().position_status
@@ -173,6 +186,7 @@
             {
                 m_session->updates().position_status =
                         culss::Interface::Updates::Status::disabled;
+                m_geoipTimer.stop();
             }
         }
         catch (exception& e)
@@ -185,19 +199,6 @@
     {
         QMutexLocker lock(&m_lastLocationMutex);
 
-        if (m_locationUpdatedAtLeastOnce)
-        {
-            culu::Quantity<culu::Length> distance = cul::haversine_distance(
-                    m_lastLocation, newPosition.value);
-            culu::Quantity<culu::Length> threshold(50.0 * culu::Meters);
-
-            // Ignore the update if we haven't moved significantly
-            if (distance <= threshold)
-            {
-                return;
-            }
-        }
-
         m_locationUpdatedAtLeastOnce = true;
         m_lastLocation = newPosition.value;
         Q_EMIT locationChanged();
@@ -243,6 +244,8 @@
 
     int m_activationCount = 0;
 
+    QTimer m_geoipTimer;
+
     QTimer m_deactivateTimer;
 
     GeoIp::Ptr m_geoIp;