Handle lack of positioning data better

Closes #6.
otsaloma · Jan 3, 2016 · d2848ed · d2848ed
1 parent bb48be5
commit d2848ed
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 10 deletions.
diff --git a/TODO.md b/TODO.md
@@ -9,8 +9,7 @@ Poor Maps 0.22
 * [x] Add begin, pause and clear navigation buttons to the maneuver list page
 * [x] Have begin navigation turn on auto-rotate
 * [x] Bump font sizes of the scalebar and meters
-* [ ] Handle lack of positioning data better (#6)
-    - Navigate, Nearby venues, Share current position
+* [x] Handle lack of positioning data better (#6)
 * [x] Update Sputnik tile source definition and add Sputnik @2x tiles
 
 Poor Maps 1.0

diff --git a/qml/MenuPage.qml b/qml/MenuPage.qml
@@ -119,12 +119,23 @@ Page {
                     height: Theme.itemSizeSmall
                     text: "Share current position"
                 }
-                onClicked: app.pageStack.push("SharePage.qml", {
-                    "coordinate": QtPositioning.coordinate(
-                        gps.position.coordinate.latitude,
-                        gps.position.coordinate.longitude),
-                    "title": "Share Current Position"
-                });
+                BusyIndicator {
+                    anchors.right: parent.right
+                    anchors.rightMargin: Theme.paddingLarge
+                    anchors.verticalCenter: parent.verticalCenter
+                    running: !gps.ready
+                    size: BusyIndicatorSize.Small
+                    z: parent.z + 1
+                }
+                onClicked: {
+                    if (!gps.ready) return;
+                    app.pageStack.push("SharePage.qml", {
+                        "coordinate": QtPositioning.coordinate(
+                            gps.position.coordinate.latitude,
+                            gps.position.coordinate.longitude),
+                        "title": "Share Current Position"
+                    });
+                }
             }
             ListItem {
                 id: findCurrentPositionItem

diff --git a/qml/NearbyPage.qml b/qml/NearbyPage.qml
@@ -23,7 +23,9 @@ import "."
 Page {
     id: page
     allowedOrientations: app.defaultAllowedOrientations
-    canNavigateForward: page.near && page.query.length > 0
+    canNavigateForward: page.near &&
+        (page.nearText !== "Current position" || gps.ready) &&
+        page.query.length > 0
     property var near: null
     property string nearText: ""
     property string query: ""
@@ -59,6 +61,14 @@ Page {
                 value: page.nearText
                 // Avoid putting label and value on different lines.
                 width: 3*parent.width
+                BusyIndicator {
+                    anchors.right: parent.right
+                    anchors.rightMargin: Theme.paddingLarge + (parent.width - page.width)
+                    anchors.verticalCenter: parent.verticalCenter
+                    running: page.nearText === "Current position" && !gps.ready
+                    size: BusyIndicatorSize.Small
+                    z: parent.z + 1
+                }
                 onClicked: {
                     var dialog = app.pageStack.push("RoutePointPage.qml");
                     dialog.accepted.connect(function() {

diff --git a/qml/PositionSource.qml b/qml/PositionSource.qml
@@ -30,6 +30,7 @@ PositionSource {
     property var coordHistory: []
     property var direction: undefined
     property var directionHistory: []
+    property var ready: false
     property var timeActivate: Date.now()
     property var timeDirection: Date.now()
     property var timePosition: Date.now()
@@ -41,6 +42,10 @@ PositionSource {
         // Calculate direction as a median of individual direction values
         // calculated after significant changes in position. This should be
         // more stable than any direct value and usable with map.autoRotate.
+        gps.ready = gps.position.latitudeValid &&
+            gps.position.longitudeValid &&
+            gps.position.coordinate.latitude &&
+            gps.position.coordinate.longitude;
         gps.timePosition = Date.now();
         var threshold = gps.position.horizontalAccuracy || 15;
         if (threshold < 0 || threshold > 40) return;

diff --git a/qml/RoutePage.qml b/qml/RoutePage.qml
@@ -23,7 +23,9 @@ import "."
 Page {
     id: page
     allowedOrientations: app.defaultAllowedOrientations
-    canNavigateForward: page.from && page.to
+    canNavigateForward: page.from && page.to &&
+        (page.fromText !== "Current position" || gps.ready) &&
+        (page.toText !== "Current position" || gps.ready)
     property var from: null
     property string fromText: ""
     property var params: {}
@@ -59,6 +61,14 @@ Page {
                 value: page.fromText
                 // Avoid putting label and value on different lines.
                 width: 3*parent.width
+                BusyIndicator {
+                    anchors.right: parent.right
+                    anchors.rightMargin: Theme.paddingLarge + (parent.width - page.width)
+                    anchors.verticalCenter: parent.verticalCenter
+                    running: page.fromText === "Current position" && !gps.ready
+                    size: BusyIndicatorSize.Small
+                    z: parent.z + 1
+                }
                 onClicked: {
                     var dialog = app.pageStack.push("RoutePointPage.qml");
                     dialog.accepted.connect(function() {
@@ -80,6 +90,14 @@ Page {
                 value: page.toText
                 // Avoid putting label and value on different lines.
                 width: 3*parent.width
+                BusyIndicator {
+                    anchors.right: parent.right
+                    anchors.rightMargin: Theme.paddingLarge + (parent.width - page.width)
+                    anchors.verticalCenter: parent.verticalCenter
+                    running: page.toText === "Current position" && !gps.ready
+                    size: BusyIndicatorSize.Small
+                    z: parent.z + 1
+                }
                 onClicked: {
                     var dialog = app.pageStack.push("RoutePointPage.qml");
                     dialog.accepted.connect(function() {