Add direction and vertical speed properties to QML Position type.

The QML and C++ position types now provide the same functionality.

Position attributes are always set/reset on every position update. This
ensures that old values of speed, accuracy, direction, and vertical
speed are not indefinitely reported in QML. Values are set to NaN and if
appropriate the associated is valid property is set.

[ChangeLog][QtPositioning][Position] Added direction and vertical speed
properities.

Change-Id: Ia02da8a5bc1cd68489eb58180986df512c24aa2f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

1 files changed, 23 insertions, 5 deletions

diff --git a/src/imports/positioning/qdeclarativeposition_p.h b/src/imports/positioning/qdeclarativeposition_p.h
index 99c2d8fc..f109b7a7 100644
--- a/src/imports/positioning/qdeclarativeposition_p.h
+++ b/src/imports/positioning/qdeclarativeposition_p.h
@@ -42,12 +42,10 @@
 #ifndef QDECLARATIVEPOSITION_H
 #define QDECLARATIVEPOSITION_H
 
-#include <QtCore>
-#include <QDateTime>
-#include <qgeopositioninfosource.h>
-#include <qgeopositioninfo.h>
-#include "qdeclarativecoordinate_p.h"
+#include <QtCore/QObject>
+#include <QtCore/QDateTime>
 #include <QtQml/qqml.h>
+#include <QtPositioning/QGeoPositionInfo>
 
 // Define this to get qDebug messages
 // #define QDECLARATIVE_POSITION_DEBUG
@@ -73,6 +71,11 @@ class QDeclarativePosition : public QObject
     Q_PROPERTY(bool horizontalAccuracyValid READ isHorizontalAccuracyValid NOTIFY horizontalAccuracyValidChanged)
     Q_PROPERTY(bool verticalAccuracyValid READ isVerticalAccuracyValid NOTIFY verticalAccuracyValidChanged)
 
+    Q_PROPERTY(bool directionValid READ isDirectionValid NOTIFY directionValidChanged REVISION 1)
+    Q_PROPERTY(double direction READ direction NOTIFY directionChanged REVISION 1)
+    Q_PROPERTY(bool verticalSpeedValid READ isVerticalSpeedValid NOTIFY verticalSpeedValidChanged REVISION 1)
+    Q_PROPERTY(double verticalSpeed READ verticalSpeed NOTIFY verticalSpeedChanged REVISION 1)
+
 public:
 
     explicit QDeclarativePosition(QObject *parent = 0);
@@ -94,6 +97,14 @@ public:
     qreal verticalAccuracy() const;
     void setVerticalAccuracy(qreal verticalAccuracy);
 
+    bool isDirectionValid() const;
+    double direction() const;
+    void setDirection(double direction);
+
+    bool isVerticalSpeedValid() const;
+    double verticalSpeed() const;
+    void setVerticalSpeed(double speed);
+
     // C++
     void setCoordinate(const QGeoCoordinate &coordinate);
     void invalidate();
@@ -111,6 +122,11 @@ Q_SIGNALS:
     void verticalAccuracyChanged();
     void verticalAccuracyValidChanged();
 
+    Q_REVISION(1) void directionValidChanged();
+    Q_REVISION(1) void directionChanged();
+    Q_REVISION(1) void verticalSpeedValidChanged();
+    Q_REVISION(1) void verticalSpeedChanged();
+
 private:
     bool m_latitudeValid;
     bool m_longitudeValid;
@@ -118,6 +134,8 @@ private:
     QDateTime m_timestamp;
     double m_speed;
     bool m_speedValid;
+    double m_direction;
+    double m_verticalSpeed;
     bool m_horizontalAccuracyValid;
     bool m_verticalAccuracyValid;
     qreal m_horizontalAccuracy;