summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2017-11-21 16:35:17 -0800
committerMatt Ranostay <matt.ranostay@konsulko.com>2017-11-21 23:12:08 -0800
commitdd12df5cffa9f2f8b674ce963d4e404e3f6fa824 (patch)
treef4af7cc6cd0e09f32aa34ebbc644a14f9b94cfa3
parent31a4cd81829e4a95b76d6cbebd9e069ae16943f8 (diff)
navigation: geoclue: use geoclue data to get initial location
Get initial data from geoclue binding in case GPS doesn't have lock currently. This is useful for starting within a parking garage or underground Change-Id: I56143d01734bbd8c1cc286950200d2b84bbb5d2c Bug-AGL: SPEC-1068 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
-rw-r--r--app/api/GeoClue.qml82
-rw-r--r--app/mapviewer.qml5
-rw-r--r--app/mapviewer.qrc1
3 files changed, 88 insertions, 0 deletions
diff --git a/app/api/GeoClue.qml b/app/api/GeoClue.qml
new file mode 100644
index 0000000..6c8b2f1
--- /dev/null
+++ b/app/api/GeoClue.qml
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2016 The Qt Company Ltd.
+ * Copyright (C) 2017 Konsulko Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import QtQuick 2.6
+import QtPositioning 5.5
+import QtWebSockets 1.0
+
+WebSocket {
+ id: root
+ active: true
+ url: bindingAddress
+
+ property string statusString: "waiting..."
+ property string apiString: "geoclue"
+ property string payloadLength: "9999"
+
+ property bool loop_state: false
+ property bool running: false
+
+ readonly property var msgid: {
+ "call": 2,
+ "retok": 3,
+ "reterr": 4,
+ "event": 5
+ }
+
+ onTextMessageReceived: {
+ var json = JSON.parse(message)
+ console.debug("Raw response: " + message)
+ var request = json[2].request
+ var response = json[2].response
+ console.debug("response: " + JSON.stringify(response))
+ switch (json[0]) {
+ case msgid.call:
+ break
+ case msgid.retok:
+ var latitude = response.latitude
+ var longitude = response.longitude
+ map.location = QtPositioning.coordinate(latitude, longitude)
+ map.center = map.location
+ break
+ case msgid.reterr:
+ root.statusString = "Bad return value, binding probably not installed"
+ break
+ case msgid.event:
+ break
+ }
+ }
+
+ onStatusChanged: {
+ switch (status) {
+ case WebSocket.Open:
+ console.debug("onStatusChanged: Open")
+ sendSocketMessage("location", 'None')
+ break
+ case WebSocket.Error:
+ root.statusString = "WebSocket error: " + root.errorString
+ break
+ }
+ }
+
+ function sendSocketMessage(verb, parameter) {
+ var requestJson = [ msgid.call, payloadLength, apiString + '/'
+ + verb, parameter ]
+ console.debug("sendSocketMessage: " + JSON.stringify(requestJson))
+ sendTextMessage(JSON.stringify(requestJson))
+ }
+}
diff --git a/app/mapviewer.qml b/app/mapviewer.qml
index cada08b..079b240 100644
--- a/app/mapviewer.qml
+++ b/app/mapviewer.qml
@@ -66,6 +66,11 @@ ApplicationWindow {
url: bindingAddress
}
+ API.GeoClue {
+ id: geoclue
+ url: bindingAddress
+ }
+
function createMap(provider)
{
var plugin
diff --git a/app/mapviewer.qrc b/app/mapviewer.qrc
index 4745075..b039234 100644
--- a/app/mapviewer.qrc
+++ b/app/mapviewer.qrc
@@ -2,6 +2,7 @@
<qresource prefix="/">
<file>mapviewer.qml</file>
<file>api/GPS.qml</file>
+ <file>api/GeoClue.qml</file>
<file>map/MapComponent.qml</file>
<file>map/Marker.qml</file>
<file>map/PolylineItem.qml</file>