QGeoAreaMonitor becomes loadable via plugins.

The polling-based default implementation is separated out into its own
plugin.

Task-number: QTBUG-31960
Change-Id: Ife25f6a83dd51f32fcd9ee3bfde1ca51291c78e4
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

6 files changed, 363 insertions, 0 deletions

diff --git a/src/plugins/position/positionpoll/plugin.json b/src/plugins/position/positionpoll/plugin.json
new file mode 100644
index 00000000..a5b2f602
--- /dev/null
+++ b/src/plugins/position/positionpoll/plugin.json
@@ -0,0 +1,8 @@
+{
+    "Keys": ["positionpoll"],
+    "Provider": "positionpoll",
+    "Position": false,
+    "Satellite": false,
+    "Monitor": true,
+    "Priority": 1000
+}
diff --git a/src/plugins/position/positionpoll/positionpoll.pro b/src/plugins/position/positionpoll/positionpoll.pro
new file mode 100644
index 00000000..8c871947
--- /dev/null
+++ b/src/plugins/position/positionpoll/positionpoll.pro
@@ -0,0 +1,18 @@
+TARGET = qtposition_positionpoll
+QT += location gui
+
+PLUGIN_TYPE = position
+load(qt_plugin)
+
+SOURCES += \
+    qgeoareamonitor_polling.cpp \
+    positionpollfactory.cpp
+
+HEADERS += \
+    qgeoareamonitor_polling.h \
+    positionpollfactory.h
+
+INCLUDEPATH += $$QT.location.includes
+
+OTHER_FILES += \
+    plugin.json
diff --git a/src/plugins/position/positionpoll/positionpollfactory.cpp b/src/plugins/position/positionpoll/positionpollfactory.cpp
new file mode 100644
index 00000000..a35b6c1e
--- /dev/null
+++ b/src/plugins/position/positionpoll/positionpollfactory.cpp
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtLocation module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "positionpollfactory.h"
+#include "qgeoareamonitor_polling.h"
+
+QGeoPositionInfoSource *PositionPollFactory::positionInfoSource(QObject *parent)
+{
+    Q_UNUSED(parent);
+    return 0;
+}
+
+QGeoSatelliteInfoSource *PositionPollFactory::satelliteInfoSource(QObject *parent)
+{
+    Q_UNUSED(parent);
+    return 0;
+}
+
+QGeoAreaMonitor *PositionPollFactory::areaMonitor(QObject *parent)
+{
+    QGeoAreaMonitorPolling *ret = 0;
+    ret = new QGeoAreaMonitorPolling(parent);
+    if (ret && ret->isValid())
+        return ret;
+    delete ret;
+    return 0;
+}
diff --git a/src/plugins/position/positionpoll/positionpollfactory.h b/src/plugins/position/positionpoll/positionpollfactory.h
new file mode 100644
index 00000000..50658eb7
--- /dev/null
+++ b/src/plugins/position/positionpoll/positionpollfactory.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtLocation module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef POSITIONPOLLFACTORY_H
+#define POSITIONPOLLFACTORY_H
+
+#include <QObject>
+#include <QGeoPositionInfoSourceFactory>
+
+class PositionPollFactory : 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);
+    QGeoAreaMonitor *areaMonitor(QObject *parent);
+};
+
+#endif // POSITIONPOLLFACTORY_H
diff --git a/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp b/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp
new file mode 100644
index 00000000..5fc4794b
--- /dev/null
+++ b/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp
@@ -0,0 +1,134 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtLocation module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qgeoareamonitor_polling.h"
+#include <qgeocoordinate.h>
+
+#include <QtCore/qmetaobject.h>
+
+#define UPDATE_INTERVAL_5S  5000
+
+QGeoAreaMonitorPolling::QGeoAreaMonitorPolling(QObject *parent) : QGeoAreaMonitor(parent)
+{
+    insideArea = false;
+    location = QGeoPositionInfoSource::createDefaultSource(this);
+    if (location) {
+        location->setUpdateInterval(UPDATE_INTERVAL_5S);
+        connect(location, SIGNAL(positionUpdated(QGeoPositionInfo)),
+                this, SLOT(positionUpdated(QGeoPositionInfo)));
+    }
+}
+
+QGeoAreaMonitorPolling::~QGeoAreaMonitorPolling()
+{
+    if (location)
+        location->stopUpdates();
+}
+
+void QGeoAreaMonitorPolling::setCenter(const QGeoCoordinate &coordinate)
+{
+    if (coordinate.isValid()) {
+        QGeoAreaMonitor::setCenter(coordinate);
+        checkStartStop();
+    }
+}
+
+void QGeoAreaMonitorPolling::setRadius(qreal radius)
+{
+    QGeoAreaMonitor::setRadius(radius);
+    checkStartStop();
+}
+
+static QMetaMethod areaEnteredSignal()
+{
+    static QMetaMethod signal = QMetaMethod::fromSignal(&QGeoAreaMonitorPolling::areaEntered);
+    return signal;
+}
+
+static QMetaMethod areaExitedSignal()
+{
+    static QMetaMethod signal = QMetaMethod::fromSignal(&QGeoAreaMonitorPolling::areaExited);
+    return signal;
+}
+
+void QGeoAreaMonitorPolling::connectNotify(const QMetaMethod &signal)
+{
+    if (signal == areaEnteredSignal() ||
+            signal == areaExitedSignal())
+        checkStartStop();
+}
+
+void QGeoAreaMonitorPolling::disconnectNotify(const QMetaMethod &signal)
+{
+    if (signal == areaEnteredSignal() ||
+            signal == areaExitedSignal())
+        checkStartStop();
+}
+
+void QGeoAreaMonitorPolling::checkStartStop()
+{
+    if (!location) return;
+
+    if ((isSignalConnected(areaEnteredSignal()) ||
+            isSignalConnected(areaExitedSignal())) &&
+            QGeoAreaMonitor::center().isValid() &&
+            QGeoAreaMonitor::radius() > qreal(0.0)) {
+        location->startUpdates();
+    } else {
+        location->stopUpdates();
+    }
+}
+
+void QGeoAreaMonitorPolling::positionUpdated(const QGeoPositionInfo &info)
+{
+    double distance = info.coordinate().distanceTo(QGeoAreaMonitor::center());
+
+    if (distance <= QGeoAreaMonitor::radius()) {
+        if (!insideArea)
+            emit areaEntered(info);
+        insideArea = true;
+    } else if (insideArea) {
+        emit areaExited(info);
+        insideArea = false;
+    }
+}
+
+#include "moc_qgeoareamonitor_polling.cpp"
diff --git a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
new file mode 100644
index 00000000..d798c2bf
--- /dev/null
+++ b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtLocation module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGEOAREAMONITORPOLLING_H
+#define QGEOAREAMONITORPOLLING_H
+
+#include "qgeoareamonitor.h"
+#include "qgeopositioninfosource.h"
+
+
+/**
+ *  QGeoAreaMonitorPolling
+ *
+ */
+class QGeoAreaMonitorPolling : public QGeoAreaMonitor
+{
+    Q_OBJECT
+
+public :
+    explicit QGeoAreaMonitorPolling(QObject *parent = 0);
+    ~QGeoAreaMonitorPolling();
+    void setCenter(const QGeoCoordinate &coordinate);
+    void setRadius(qreal radius);
+
+    inline bool isValid() { return location; }
+
+private Q_SLOTS:
+    void positionUpdated(const QGeoPositionInfo &info);
+
+private:
+    bool insideArea;
+    QGeoPositionInfoSource *location;
+
+    void connectNotify(const QMetaMethod &signal);
+    void disconnectNotify(const QMetaMethod &signal);
+
+    void checkStartStop();
+};
+
+#endif // QGEOAREAMONITORPOLLING_H