Merge lp:~thomas-voss/platform-api/expose_accuracy_and_service_status_to_platform into lp:platform-api

[Thomas Voß]

Account for changes in the location service interface.
Wire up controller to talk to the service for enabling/disabling positioning and gps status.

Account for changes in the location service interface.
Wire up controller to talk to the service for enabling/disabling positioning and gps status.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:184
http://jenkins.qa.ubuntu.com/job/platform-api-ci/191/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-amd64-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-i386-ci/25/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/191/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/platform-api/expose_accuracy_and_service_status_to_platform]

185. By Thomas Voß on 2014-01-25

Add missing build dependencies on libproperties-cpp-dev and libdbus-cpp-dev.

186. By Thomas Voß on 2014-01-26

[ Martin Pitt ]
* Add backend for simulated sensor data.
[ Albert Astals ]
* Build fixes and typos.
[ Ricardo Mendoza ]
* Build fixes and typos.
[ Ubuntu daily release ]
* Automatic snapshot from revision 183

187. By Thomas Voß on 2014-01-29

Add versioned dep on libubuntu-location-service-dev.

188. By Thomas Voß on 2014-01-30

debian/rules: Fix setting of compiler version to work around regression in recent cmake [Martin Pitt]

189. By Thomas Voß on 2014-01-30

Fix whitespace.

190. By Thomas Voß on 2014-01-30

Merge with lp:~xnox/platform-api/compilers.

191. By Thomas Voß on 2014-01-30

Fix i386 build.

Unmerged revisions

191. By Thomas Voß on 2014-01-30

Fix i386 build.

190. By Thomas Voß on 2014-01-30

Merge with lp:~xnox/platform-api/compilers.

189. By Thomas Voß on 2014-01-30

Fix whitespace.

188. By Thomas Voß on 2014-01-30

debian/rules: Fix setting of compiler version to work around regression in recent cmake [Martin Pitt]

187. By Thomas Voß on 2014-01-29

Add versioned dep on libubuntu-location-service-dev.

186. By Thomas Voß on 2014-01-26

[ Martin Pitt ]
* Add backend for simulated sensor data.
[ Albert Astals ]
* Build fixes and typos.
[ Ricardo Mendoza ]
* Build fixes and typos.
[ Ubuntu daily release ]
* Automatic snapshot from revision 183

185. By Thomas Voß on 2014-01-25

Add missing build dependencies on libproperties-cpp-dev and libdbus-cpp-dev.

184. By Thomas Voß on 2014-01-14

Account for changes in the location service interface.
Wire up controller to talk to the service for enabling/disabling positioning and gps status.

=== modified file 'debian/rules' (properties changed: -x to +x)
=== modified file 'doc/Doxyfile.in'
--- doc/Doxyfile.in	2013-07-05 09:13:31 +0000
+++ doc/Doxyfile.in	2014-01-16 05:55:43 +0000
@@ -1684,7 +1684,7 @@
 # explicitly to a value larger than 0 to get control over the balance
 # between CPU load and processing speed.
 
-DOT_NUM_THREADS        = 0
+DOT_NUM_THREADS        = 1 
 
 # By default doxygen will use the Helvetica font for all dot files that
 # doxygen generates. When you want a differently looking font you can specify

=== modified file 'include/ubuntu/application/location/controller.h'
--- include/ubuntu/application/location/controller.h	2013-08-23 10:55:16 +0000
+++ include/ubuntu/application/location/controller.h	2014-01-16 05:55:43 +0000
@@ -34,9 +34,7 @@
     typedef enum
     {
         UA_LOCATION_SERVICE_ENABLED = 1 << 0, /**< The service is enabled. */
-        UA_LOCATION_SERVICE_DISABLED = 1 << 1, /**< The service is disabled. */
-        UA_LOCATION_SERVICE_GPS_ENABLED = 1 << 2, /**< GPS providers are enabled. */
-        UA_LOCATION_SERVICE_GPS_DISABLED = 1 << 3, /**< GPS providers are disabled. */
+        UA_LOCATION_SERVICE_GPS_ENABLED = 1 << 1 /**< GPS providers are enabled. */
     } UbuntuApplicationLocationServiceStatus;
 
     typedef UbuntuApplicationLocationServiceStatus UALocationServiceStatus;

=== modified file 'include/ubuntu/application/location/position_update.h'
--- include/ubuntu/application/location/position_update.h	2013-08-22 07:03:49 +0000
+++ include/ubuntu/application/location/position_update.h	2014-01-16 05:55:43 +0000
@@ -84,6 +84,16 @@
         UALocationPositionUpdate *update);
 
     /**
+     * \brief Queries the horizontal accuracy of the position update.
+     * \ingroup location_service
+     * \returns The horizontal accuracy of the position update in [m].
+     * \param[in] update The position update instance to be queried.
+     */
+    UBUNTU_DLL_PUBLIC double
+    ua_location_position_update_get_horizontal_accuracy_in_meter(
+        UALocationPositionUpdate *update);
+
+    /**
      * \brief Checks if the position update contains an altitude.
      * \ingroup location_service
      * \returns TRUE if the update contains an altitude, else FALSE.
@@ -103,6 +113,26 @@
     ua_location_position_update_get_altitude_in_meter(
         UALocationPositionUpdate *update);
 
+    /**
+     * \brief Checks if the position update contains a vertical accuracy estimate.
+     * \ingroup location_service
+     * \returns TRUE if the update contains a vertical accuracy estimate, else FALSE.
+     * \param[in] update The position update instance to be queried.
+     */
+    UBUNTU_DLL_PUBLIC bool
+    ua_location_position_update_has_vertical_accuracy(
+        UALocationPositionUpdate *update);
+
+    /**
+     * \brief Queries the vertical accuracy of the position update.
+     * \ingroup location_service
+     * \returns The vertical accuracy of the position update in [m].
+     * \param[in] update The position update instance to be queried.
+     */
+    UBUNTU_DLL_PUBLIC double
+    ua_location_position_update_get_vertical_accuracy_in_meter(
+        UALocationPositionUpdate *update);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'src/ubuntu/application/location/CMakeLists.txt'
--- src/ubuntu/application/location/CMakeLists.txt	2013-08-23 10:39:34 +0000
+++ src/ubuntu/application/location/CMakeLists.txt	2014-01-16 05:55:43 +0000
@@ -4,12 +4,14 @@
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
 
-pkg_check_modules(DBUS_CPP REQUIRED dbus-cpp)
+pkg_check_modules(DBUS_CPP dbus-cpp REQUIRED)
 pkg_check_modules(LOCATION_SERVICE REQUIRED ubuntu-location-service)
 
+message(STATUS ${DBUS_CPP_LIBRARIES})
+
 include_directories(
   ${Boost_INCLUDE_DIRS}
-  ${DBUS_CPP_INCLUDE_DIRS}/dbus
+  ${DBUS_CPP_INCLUDE_DIRS}
   ${LOCATION_SERVICE_INCLUDE_DIRS}
 )
 
@@ -30,6 +32,8 @@
 
   ubuntu-location-service
   dbus-1
+
+  ${DBUS_CPP_LDFLAGS}
   ${LOCATION_SERVICE_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}

=== modified file 'src/ubuntu/application/location/controller.cpp'
--- src/ubuntu/application/location/controller.cpp	2013-08-23 10:55:16 +0000
+++ src/ubuntu/application/location/controller.cpp	2014-01-16 05:55:43 +0000
@@ -40,9 +40,29 @@
     UALocationServiceStatusChangedHandler handler,
     void *context)
 {
-    (void) controller;
-    (void) handler;
-    (void) context;
+    controller->service->is_online().changed().connect([controller, handler, context](bool value)
+    {
+        if (value)
+        {
+            controller->current_status |= UA_LOCATION_SERVICE_ENABLED;
+        } else
+        {
+            controller->current_status &= ~UA_LOCATION_SERVICE_ENABLED;
+        }
+        handler(controller->current_status, context);
+    });
+
+    controller->service->does_satellite_based_positioning().changed().connect([controller, handler, context](bool value)
+    {
+        if (value)
+        {
+            controller->current_status |= UA_LOCATION_SERVICE_GPS_ENABLED;
+        } else
+        {
+            controller->current_status &= ~UA_LOCATION_SERVICE_GPS_ENABLED;
+        }
+        handler(controller->current_status, context);
+    });
 }
 
 UStatus
@@ -50,8 +70,19 @@
     UALocationServiceController *controller,
     UALocationServiceStatusFlags *out_flags)
 {
-    (void) controller;
-    (void) out_flags;
+    *out_flags = 0;
+
+    if (controller->service->is_online().get())
+        *out_flags |= UA_LOCATION_SERVICE_ENABLED;
+    else
+        *out_flags &= ~UA_LOCATION_SERVICE_ENABLED;
+
+    if (controller->service->does_satellite_based_positioning().get())
+        *out_flags |= UA_LOCATION_SERVICE_GPS_ENABLED;
+    else
+        *out_flags &= ~UA_LOCATION_SERVICE_GPS_ENABLED;
+
+    controller->current_status = *out_flags;
 
     return U_STATUS_SUCCESS;
 }
@@ -60,8 +91,7 @@
 ua_location_service_controller_enable_service(
     UALocationServiceController *controller)
 {
-    (void) controller;
-
+    controller->service->is_online() = true;
     return U_STATUS_SUCCESS;
 }
 
@@ -69,8 +99,7 @@
 ua_location_service_controller_disable_service(
     UALocationServiceController *controller)
 {
-    (void) controller;
-    
+    controller->service->is_online() = false;
     return U_STATUS_SUCCESS;
 }
 
@@ -78,8 +107,7 @@
 ua_location_service_controller_enable_gps(
     UALocationServiceController *controller)
 {
-    (void) controller;
-
+    controller->service->does_satellite_based_positioning() = true;
     return U_STATUS_SUCCESS;
 }
 
@@ -87,7 +115,6 @@
 ua_location_service_controller_disable_gps(
     UALocationServiceController *controller)
 {
-    (void) controller;
-
+    controller->service->does_satellite_based_positioning() = false;
     return U_STATUS_SUCCESS;
 }

=== modified file 'src/ubuntu/application/location/controller_p.h'
--- src/ubuntu/application/location/controller_p.h	2013-08-21 14:59:45 +0000
+++ src/ubuntu/application/location/controller_p.h	2014-01-16 05:55:43 +0000
@@ -21,10 +21,23 @@
 
 #include "ubuntu/application/location/controller.h"
 
+#include <com/ubuntu/location/service/stub.h>
+
 #include "ref_counted.h"
 
+namespace dbus = core::dbus;
+namespace culs = com::ubuntu::location::service;
+
 struct UbuntuApplicationLocationServiceController : public detail::RefCounted
 {
+    UbuntuApplicationLocationServiceController(const culs::Interface::Ptr& service)
+        : current_status(0),
+          service(service)
+    {
+    }
+
+    UALocationServiceStatusFlags current_status;
+    culs::Interface::Ptr service;
 };
 
 #endif // CONTROLLER_PRIVATE_H_

=== modified file 'src/ubuntu/application/location/heading_update.cpp'
--- src/ubuntu/application/location/heading_update.cpp	2013-08-19 06:46:47 +0000
+++ src/ubuntu/application/location/heading_update.cpp	2014-01-16 05:55:43 +0000
@@ -51,5 +51,5 @@
 ua_location_heading_update_get_heading_in_degree(
     UALocationHeadingUpdate *update)
 {
-    return update->update.value.value.value();
+    return update->update.value.value();
 }

=== modified file 'src/ubuntu/application/location/position_update.cpp'
--- src/ubuntu/application/location/position_update.cpp	2013-08-19 06:46:47 +0000
+++ src/ubuntu/application/location/position_update.cpp	2014-01-16 05:55:43 +0000
@@ -51,26 +51,47 @@
 ua_location_position_update_get_latitude_in_degree(
     UALocationPositionUpdate *update)
 {
-    return update->update.value.latitude().value.value();
+    return update->update.value.latitude.value.value();
 }
 
 double
 ua_location_position_update_get_longitude_in_degree(
     UALocationPositionUpdate *update)
 {
-    return update->update.value.longitude().value.value();
+    return update->update.value.longitude.value.value();
+}
+
+double
+ua_location_position_update_get_horizontal_accuracy_in_meter(
+    UALocationPositionUpdate *update)
+{
+    return update->update.value.accuracy.horizontal->value();
 }
 
 bool
 ua_location_position_update_has_altitude(
     UALocationPositionUpdate *update)
 {
-    return update->update.value.has_altitude();
+    return static_cast<bool>(update->update.value.altitude);
 }
 
 double
 ua_location_position_update_get_altitude_in_meter(
     UALocationPositionUpdate *update)
 {
-    return update->update.value.altitude().value.value();
+    return update->update.value.altitude->value.value();
+}
+
+bool
+ua_location_position_update_has_vertical_accuracy(
+    UALocationPositionUpdate *update)
+{
+    return update->update.value.accuracy.vertical;
+}
+
+double
+ua_location_position_update_get_vertical_accuracy_in_meter(
+    UALocationPositionUpdate *update)
+{
+    return update->update.value.accuracy.vertical->value();
 }

=== modified file 'src/ubuntu/application/location/service.cpp'
--- src/ubuntu/application/location/service.cpp	2013-08-25 06:27:23 +0000
+++ src/ubuntu/application/location/service.cpp	2014-01-16 05:55:43 +0000
@@ -22,10 +22,11 @@
 #include "session_p.h"
 
 #include <com/ubuntu/location/service/stub.h>
-#include <org/freedesktop/dbus/resolver.h>
-#include <org/freedesktop/dbus/asio/executor.h>
-
-namespace dbus = org::freedesktop::dbus;
+
+#include <core/dbus/resolver.h>
+#include <core/dbus/asio/executor.h>
+
+namespace dbus = core::dbus;
 namespace cul = com::ubuntu::location;
 namespace culs = com::ubuntu::location::service;
 
@@ -47,7 +48,7 @@
 
   private:
     Instance() : bus(std::make_shared<dbus::Bus>(dbus::WellKnownBus::system)),
-                 executor(std::make_shared<dbus::asio::Executor>(bus)),
+                 executor(dbus::asio::make_executor(bus)),
                  service(dbus::resolve_service_on_bus<culs::Interface, culs::Stub>(bus))
     {
         bus->install_executor(executor);
@@ -87,5 +88,5 @@
 UALocationServiceController*
 ua_location_service_create_controller()
 {
-    return new UbuntuApplicationLocationServiceController{};
+    return new UbuntuApplicationLocationServiceController{Instance::instance().get_service()};
 }

=== modified file 'src/ubuntu/application/location/session.cpp'
--- src/ubuntu/application/location/session.cpp	2013-08-19 06:46:47 +0000
+++ src/ubuntu/application/location/session.cpp	2014-01-16 05:55:43 +0000
@@ -24,6 +24,8 @@
 #include "position_update_p.h"
 #include "velocity_update_p.h"
 
+namespace location = com::ubuntu::location;
+
 void
 ua_location_service_session_ref(
     UALocationServiceSession *session)
@@ -47,12 +49,12 @@
     void *context)
 {
     auto s = static_cast<UbuntuApplicationLocationServiceSession*>(session);
-    s->session->install_position_updates_handler(
-        [handler, context](const com::ubuntu::location::Update<com::ubuntu::location::Position>& new_position)
-        {
-            UbuntuApplicationLocationPositionUpdate pu{new_position};
-            handler(std::addressof(pu), context);
-        });
+    s->session->updates().position.changed().connect([handler, context](
+                                                   const location::Update<location::Position>& new_position)
+    {
+        UbuntuApplicationLocationPositionUpdate pu{new_position};
+        handler(std::addressof(pu), context);
+    });
 }
 
 void
@@ -62,8 +64,8 @@
     void *context)
 {
     auto s = static_cast<UbuntuApplicationLocationServiceSession*>(session);
-    s->session->install_heading_updates_handler(
-        [handler, context](const com::ubuntu::location::Update<com::ubuntu::location::Heading>& new_heading) 
+    s->session->updates().heading.changed().connect(
+        [handler, context](const location::Update<location::Heading>& new_heading)
         {
             UbuntuApplicationLocationHeadingUpdate hu{new_heading};
             handler(std::addressof(hu), context);
@@ -77,8 +79,8 @@
     void *context)
 {
     auto s = static_cast<UbuntuApplicationLocationServiceSession*>(session);
-    s->session->install_velocity_updates_handler(
-        [handler, context](const com::ubuntu::location::Update<com::ubuntu::location::Velocity>& new_velocity) 
+    s->session->updates().velocity.changed().connect(
+        [handler, context](const location::Update<location::Velocity>& new_velocity)
         {
             UbuntuApplicationLocationVelocityUpdate vu{new_velocity};
             handler(std::addressof(vu), context);
@@ -95,7 +97,8 @@
 
     try
     {
-        s->session->start_position_updates();
+        s->session->updates().position_status
+                = location::service::session::Interface::Updates::Status::enabled;
     } catch(...)
     {
         return U_STATUS_ERROR;
@@ -114,7 +117,8 @@
 
     try
     {
-        s->session->stop_position_updates();
+        s->session->updates().position_status
+                = location::service::session::Interface::Updates::Status::disabled;
     } catch(...)
     {
     }    
@@ -130,7 +134,7 @@
 
     try
     {
-        s->session->start_heading_updates();
+        s->session->updates().heading_status = location::service::session::Interface::Updates::Status::enabled;
     } catch(...)
     {
         return U_STATUS_ERROR;
@@ -149,7 +153,7 @@
 
     try
     {
-        s->session->stop_heading_updates();
+        s->session->updates().heading_status = location::service::session::Interface::Updates::Status::disabled;
     } catch(...)
     {
     }
@@ -165,7 +169,7 @@
 
     try
     {
-        s->session->start_velocity_updates();
+        s->session->updates().velocity_status = location::service::session::Interface::Updates::Status::enabled;
     } catch(...)
     {
         return U_STATUS_ERROR;
@@ -184,7 +188,7 @@
 
     try
     {
-        s->session->stop_velocity_updates();
+        s->session->updates().velocity_status = location::service::session::Interface::Updates::Status::disabled;
     } catch(...)
     {
     }

=== modified file 'src/ubuntu/application/location/velocity_update.cpp'
--- src/ubuntu/application/location/velocity_update.cpp	2013-08-19 06:46:47 +0000
+++ src/ubuntu/application/location/velocity_update.cpp	2014-01-16 05:55:43 +0000
@@ -51,5 +51,5 @@
 ua_location_velocity_update_get_velocity_in_meters_per_second(
     UALocationVelocityUpdate *update)
 {
-    return update->update.value.value.value();
+    return update->update.value.value();
 }

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-12-06 13:47:56 +0000
+++ tests/CMakeLists.txt	2014-01-16 05:55:43 +0000
@@ -17,6 +17,7 @@
     ubuntu_application_api
     gtest
     gtest_main
+
     ${PROCESS_CPP_LIBRARIES}
 )