OSX: Fix QGeoPositionInfo attribute values with corelocation plug-inv5.3.25.3.2

Fix corelocation plugin to return "nan" values for the QGeoPositionInfo
attributes which aren't available.

Task-number: QTBUG-38300
Change-Id: Id4c6eb69ef65fccfd7de32ec476d3afa3c4bbf98
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
index 65848f7d..8ebe7018 100644
--- a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
+++ b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
@@ -78,10 +78,14 @@
                                              newLocation.coordinate.longitude,
                                              newLocation.altitude),
                                              timeStamp);
-    location.setAttribute(QGeoPositionInfo::HorizontalAccuracy, newLocation.horizontalAccuracy);
-    location.setAttribute(QGeoPositionInfo::VerticalAccuracy, newLocation.verticalAccuracy);
-    location.setAttribute(QGeoPositionInfo::Direction, newLocation.course);
-    location.setAttribute(QGeoPositionInfo::GroundSpeed, newLocation.speed);
+    if (newLocation.horizontalAccuracy >= 0)
+        location.setAttribute(QGeoPositionInfo::HorizontalAccuracy, newLocation.horizontalAccuracy);
+    if (newLocation.verticalAccuracy >= 0)
+        location.setAttribute(QGeoPositionInfo::VerticalAccuracy, newLocation.verticalAccuracy);
+    if (newLocation.course >= 0)
+        location.setAttribute(QGeoPositionInfo::Direction, newLocation.course);
+    if (newLocation.speed >= 0)
+        location.setAttribute(QGeoPositionInfo::GroundSpeed, newLocation.speed);
 
     m_positionInfoSource->locationDataAvailable(location);
 }