Merge lp:~thomas-voss/qtubuntu-sensors/add-position-plugin-in-preparation-for-dropping-qtlocation-distro-patch into lp:qtubuntu-sensors

[Thomas Voß]

Add the position plugin for QtLocation.

Add the position plugin for QtLocation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-i386-ci/3

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

review: Approve (continuous-integration)

[lp:~thomas-voss/qtubuntu-sensors/add-position-plugin-in-preparation-for-dropping-qtlocation-distro-patch]

52. By Thomas Voß on 2014-01-08

Add Breaks for libqt5location5-plugins.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-i386-ci/5

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

review: Approve (continuous-integration)

[Martin Pitt (pitti)]

> 16 +Breaks: libqt5location5-plugins (<< 5.0~git20130805-0ubuntu4)

This needs a corresponding Replaces: too (with the exact same value), otherwise apt might have trouble upgrading.

review: Needs Fixing

[lp:~thomas-voss/qtubuntu-sensors/add-position-plugin-in-preparation-for-dropping-qtlocation-distro-patch]

53. By Thomas Voß on 2014-01-09

Add missing Replaces in debian/control.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-i386-ci/6

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

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

> > 16 +Breaks: libqt5location5-plugins (<< 5.0~git20130805-0ubuntu4)
>
> This needs a corresponding Replaces: too (with the exact same value),
> otherwise apt might have trouble upgrading.

Fixed.

[Martin Pitt (pitti)]

> Fixed.

Thanks, packaging ack. (I don't feel qualified to review the upstream additions).

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Based on IRC information, packaging ack as well. Need someone to review upstream code ;)

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Excellent, this is worth moving from a patch.

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-10-24 20:13:46 +0000
+++ debian/control	2014-01-09 17:43:06 +0000
@@ -8,6 +8,7 @@
                qt5-default,
                qtbase5-dev,
                qtfeedback5-dev,
+               qtlocation5-dev,
                qtsensors5-dev,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/qtubuntu-sensors
@@ -23,5 +24,7 @@
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+Breaks: libqt5location5-plugins (<< 5.0~git20130805-0ubuntu4)
+Replaces: libqt5location5-plugins (<< 5.0~git20130805-0ubuntu4)
 Description: QtSensors plugins for Android sensors
  QtSensors plugins for the qtubuntu (hybris) sensors backend

=== modified file 'plugins/plugins.pro'
--- plugins/plugins.pro	2014-01-07 10:35:49 +0000
+++ plugins/plugins.pro	2014-01-09 17:43:06 +0000
@@ -2,4 +2,5 @@
 
 SUBDIRS += \
     feedback \
+    position \
     sensors 

=== added directory 'plugins/position'
=== added file 'plugins/position/core_geo_position_info_source.cpp'
--- plugins/position/core_geo_position_info_source.cpp	1970-01-01 00:00:00 +0000
+++ plugins/position/core_geo_position_info_source.cpp	2014-01-09 17:43:06 +0000
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Thomas Voß <[e-mail]>
+ */
+
+#include "core_geo_position_info_source.h"
+
+#include <QtCore>
+
+#include <ubuntu/application/location/service.h>
+#include <ubuntu/application/location/session.h>
+
+#include <ubuntu/application/location/heading_update.h>
+#include <ubuntu/application/location/position_update.h>
+#include <ubuntu/application/location/velocity_update.h>
+
+struct core::GeoPositionInfoSource::Private
+{
+    static const unsigned int empty_creation_flags = 0;
+    
+    static void processPositionUpdate(
+        UALocationPositionUpdate* position,
+        void* context)
+    {
+        if (!position)
+            return;
+
+        Private* thiz = static_cast<Private*>(context);
+
+        if (!thiz)
+            return;
+
+        thiz->handlePositionUpdate(position);
+    }
+
+    static void processHeadingUpdate(
+        UALocationHeadingUpdate* heading,
+        void* context)
+    {
+        if (!heading)
+            return;
+
+        Private* thiz = static_cast<Private*>(context);
+
+        if (!thiz)
+            return;
+
+        thiz->handleHeadingUpdate(heading);
+    }
+
+    static void processVelocityUpdate(
+        UALocationVelocityUpdate* velocity,
+        void* context)
+    {
+        if (!velocity)
+            return;
+
+        Private* thiz = static_cast<Private*>(context);
+
+        if (!thiz)
+            return;
+
+        thiz->handleVelocityUpdate(velocity);
+    }
+
+    void handlePositionUpdate(UALocationPositionUpdate* position)
+    {
+        QGeoCoordinate coord(
+            ua_location_position_update_get_latitude_in_degree(position),
+            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);
+        
+        lastKnownPosition.setCoordinate(coord);
+        lastKnownPosition.setTimestamp(
+            QDateTime::fromMSecsSinceEpoch(
+                ua_location_position_update_get_timestamp(position)/1000));
+
+        QMetaObject::invokeMethod(
+            parent,
+            "positionUpdated",
+            Qt::QueuedConnection,
+            Q_ARG(QGeoPositionInfo, lastKnownPosition));        
+    }
+
+    void handleHeadingUpdate(UALocationHeadingUpdate* heading)
+    {
+        lastKnownPosition.setAttribute(
+            QGeoPositionInfo::Direction,
+            ua_location_heading_update_get_heading_in_degree(heading));
+
+        lastKnownPosition.setTimestamp(
+            QDateTime::fromMSecsSinceEpoch(
+                ua_location_heading_update_get_timestamp(heading)/1000));
+
+        QMetaObject::invokeMethod(
+            parent,
+            "positionUpdated",
+            Qt::QueuedConnection,
+            Q_ARG(QGeoPositionInfo, lastKnownPosition));
+    };
+
+    void handleVelocityUpdate(UALocationVelocityUpdate* velocity)
+    {
+        lastKnownPosition.setAttribute(
+            QGeoPositionInfo::GroundSpeed,
+            ua_location_velocity_update_get_velocity_in_meters_per_second(velocity));
+
+        lastKnownPosition.setTimestamp(
+            QDateTime::fromMSecsSinceEpoch(
+                ua_location_velocity_update_get_timestamp(velocity)/1000));
+
+        QMetaObject::invokeMethod(
+            parent,
+            "positionUpdated",
+            Qt::QueuedConnection,
+            Q_ARG(QGeoPositionInfo, lastKnownPosition));
+    };
+
+    Private(core::GeoPositionInfoSource* parent)
+            : parent(parent),
+              session(ua_location_service_create_session_for_high_accuracy(empty_creation_flags))
+    {
+        qRegisterMetaType<QGeoPositionInfo>("QGeoPositionInfo");
+
+        ua_location_service_session_set_position_updates_handler(
+            session,
+            processPositionUpdate,
+            this);
+
+        ua_location_service_session_set_heading_updates_handler(
+            session,
+            processHeadingUpdate,
+            this);
+
+        ua_location_service_session_set_velocity_updates_handler(
+            session,
+            processVelocityUpdate,
+            this);
+    }
+
+    ~Private()
+    {
+        ua_location_service_session_unref(session);
+    }
+
+    core::GeoPositionInfoSource* parent;
+    UALocationServiceSession* session;
+    QGeoPositionInfo lastKnownPosition;
+    QTimer timer;
+};
+
+core::GeoPositionInfoSource::GeoPositionInfoSource(QObject *parent)
+        : QGeoPositionInfoSource(parent), d(new Private(this))
+{
+    d->timer.setSingleShot(true);
+    QObject::connect(&d->timer, SIGNAL(timeout()), this, SLOT(updateTimeout()));
+}
+
+core::GeoPositionInfoSource::~GeoPositionInfoSource()
+{
+}
+
+void core::GeoPositionInfoSource::setUpdateInterval(int msec)
+{
+    (void) msec;
+}
+
+void core::GeoPositionInfoSource::setPreferredPositioningMethods(PositioningMethods methods)
+{
+    QGeoPositionInfoSource::setPreferredPositioningMethods(methods);
+}
+
+QGeoPositionInfo core::GeoPositionInfoSource::lastKnownPosition(bool fromSatellitePositioningMethodsOnly) const
+{
+    Q_UNUSED(fromSatellitePositioningMethodsOnly);
+    return d->lastKnownPosition;
+}
+
+QGeoPositionInfoSource::PositioningMethods core::GeoPositionInfoSource::supportedPositioningMethods() const
+{
+    return AllPositioningMethods;
+}
+
+void core::GeoPositionInfoSource::startUpdates()
+{
+    ua_location_service_session_start_position_updates(d->session);
+    ua_location_service_session_start_heading_updates(d->session);
+    ua_location_service_session_start_velocity_updates(d->session);
+}
+
+int core::GeoPositionInfoSource::minimumUpdateInterval() const {
+    return 500;
+}
+
+void core::GeoPositionInfoSource::stopUpdates()
+{
+    ua_location_service_session_stop_position_updates(d->session);
+    ua_location_service_session_stop_heading_updates(d->session);
+    ua_location_service_session_stop_velocity_updates(d->session);
+}
+
+void core::GeoPositionInfoSource::requestUpdate(int timeout)
+{
+    if (d->timer.isActive())
+    {
+        return;
+    }
+
+    startUpdates();
+    d->timer.start(timeout);
+}
+
+QGeoPositionInfoSource::Error core::GeoPositionInfoSource::error() const
+{
+    return UnknownSourceError;
+}

=== added file 'plugins/position/core_geo_position_info_source.h'
--- plugins/position/core_geo_position_info_source.h	1970-01-01 00:00:00 +0000
+++ plugins/position/core_geo_position_info_source.h	2014-01-09 17:43:06 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Thomas Voß <[e-mail]>
+ */
+
+#ifndef CORE_GEO_POSITION_INFO_SOURCE_H
+#define CORE_GEO_POSITION_INFO_SOURCE_H
+
+#include <qgeopositioninfosource.h>
+
+namespace core
+{
+class GeoPositionInfoSource : public QGeoPositionInfoSource
+{
+    Q_OBJECT
+public:
+    GeoPositionInfoSource(QObject *parent = 0);
+    ~GeoPositionInfoSource();
+
+    // From QGeoPositionInfoSource
+    void setUpdateInterval(int msec);
+    QGeoPositionInfo lastKnownPosition(bool fromSatellitePositioningMethodsOnly = false) const;
+    PositioningMethods supportedPositioningMethods() const;
+    void setPreferredPositioningMethods(PositioningMethods methods);
+    int minimumUpdateInterval() const;
+    Error error() const;
+
+public slots:
+    virtual void startUpdates();
+    virtual void stopUpdates();
+    virtual void requestUpdate(int timeout = 5000);
+
+private:
+    struct Private;
+    QScopedPointer<Private> d;
+};
+}
+
+#endif // CORE_GEO_POSITION_INFO_SOURCE_H

=== added file 'plugins/position/core_geo_position_info_source_factory.cpp'
--- plugins/position/core_geo_position_info_source_factory.cpp	1970-01-01 00:00:00 +0000
+++ plugins/position/core_geo_position_info_source_factory.cpp	2014-01-09 17:43:06 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Thomas Voß <[e-mail]>
+ */
+
+#include "core_geo_position_info_source_factory.h"
+#include "core_geo_position_info_source.h"
+
+QGeoPositionInfoSource *core::GeoPositionInfoSourceFactory::positionInfoSource(QObject *parent)
+{
+    core::GeoPositionInfoSource *src = new core::GeoPositionInfoSource(parent);
+    return src;
+}
+
+QGeoSatelliteInfoSource *core::GeoPositionInfoSourceFactory::satelliteInfoSource(QObject *parent)
+{
+    Q_UNUSED(parent);
+    return 0;
+}

=== added file 'plugins/position/core_geo_position_info_source_factory.h'
--- plugins/position/core_geo_position_info_source_factory.h	1970-01-01 00:00:00 +0000
+++ plugins/position/core_geo_position_info_source_factory.h	2014-01-09 17:43:06 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Thomas Voß <[e-mail]>
+ */
+
+#ifndef CORE_GEO_POSITION_INFO_SOURCE_FACTORY_H
+#define CORE_GEO_POSITION_INFO_SOURCE_FACTORY_H
+
+#include <QObject>
+#include "qgeopositioninfosource.h"
+#include "qgeopositioninfosourcefactory.h"
+
+namespace core
+{
+class GeoPositionInfoSourceFactory
+        : public QObject,
+          public QGeoPositionInfoSourceFactory
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.qt.position.sourcefactory/5.0"
+                      FILE "plugin.json")
+    Q_INTERFACES(QGeoPositionInfoSourceFactory)
+
+public:
+    QGeoPositionInfoSource *positionInfoSource(QObject *parent);
+    QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent);
+};
+}
+
+#endif // CORE_GEO_POSITION_INFO_SOURCE_FACTORY_H

=== added file 'plugins/position/plugin.json'
--- plugins/position/plugin.json	1970-01-01 00:00:00 +0000
+++ plugins/position/plugin.json	2014-01-09 17:43:06 +0000
@@ -0,0 +1,7 @@
+{
+    "Keys": ["ubuntu"],
+    "Provider": "ubuntu",
+    "Position": true,
+    "Satellite": false,
+    "Priority": 2000
+}

=== added file 'plugins/position/position.pro'
--- plugins/position/position.pro	1970-01-01 00:00:00 +0000
+++ plugins/position/position.pro	2014-01-09 17:43:06 +0000
@@ -0,0 +1,26 @@
+QT += location core
+
+TEMPLATE = lib
+CONFIG += link_pkgconfig plugin
+TARGET = $$qtLibraryTarget(qtposition_ubuntu)
+PLUGIN_TYPE = position
+
+QT = location core
+
+HEADERS += \
+    core_geo_position_info_source.h \
+    core_geo_position_info_source_factory.h
+
+SOURCES += \
+    core_geo_position_info_source.cpp \
+    core_geo_position_info_source_factory.cpp
+
+INCLUDEPATH += $$PWD/
+
+PKGCONFIG += ubuntu-platform-api
+LIBS += -lubuntu_application_api
+
+target.path += $$[QT_INSTALL_PLUGINS]/position
+INSTALLS += target
+
+OTHER_FILES += plugin.json