diff options
| -rw-r--r-- | app/api/GPS.qml | 89 | ||||
| -rw-r--r-- | app/map/MapComponent.qml | 28 | ||||
| -rw-r--r-- | app/mapviewer.qml | 6 | ||||
| -rw-r--r-- | app/mapviewer.qrc | 1 |
4 files changed, 110 insertions, 14 deletions
diff --git a/app/api/GPS.qml b/app/api/GPS.qml new file mode 100644 index 0000000..8a2ebb9 --- /dev/null +++ b/app/api/GPS.qml @@ -0,0 +1,89 @@ +/* + * 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: "gps" + 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: + break + case msgid.reterr: + root.statusString = "Bad return value, binding probably not installed" + break + case msgid.event: + var payload = JSON.parse(JSON.stringify(json[2])) + var event = payload.event + if (event == "gps/location") { + var latitude = json[2].data.latitude + var longitude = json[2].data.longitude + var location = QtPositioning.coordinate(latitude, longitude) + if (map.followme || !map.location) { + map.center = location + } + map.location = location + } + break + } + } + + onStatusChanged: { + switch (status) { + case WebSocket.Open: + console.debug("onStatusChanged: Open") + sendSocketMessage("subscribe", { value: "location" }) + 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/map/MapComponent.qml b/app/map/MapComponent.qml index b4bb330..ce669ff 100644 --- a/app/map/MapComponent.qml +++ b/app/map/MapComponent.qml @@ -38,7 +38,9 @@ ** ****************************************************************************/ import QtQuick 2.5 +import QtQuick.Layouts 1.3 import QtQuick.Controls 1.4 +import QtQuick.Extras 1.4 import QtLocation 5.6 import QtPositioning 5.5 import "../helper.js" as Helper @@ -267,20 +269,17 @@ Map { // Enable pan, flick, and pinch gestures to zoom in and out gesture.acceptedGestures: MapGestureArea.PanGesture | MapGestureArea.FlickGesture | MapGestureArea.PinchGesture gesture.flickDeceleration: 3000 - gesture.enabled: true + gesture.enabled: !map.followme //! [mapnavigation] focus: true onCopyrightLinkActivated: Qt.openUrlExternally(link) onCenterChanged:{ scaleTimer.restart() - if (map.followme) - if (map.center != positionSource.position.coordinate) map.followme = false } onZoomLevelChanged:{ scaleTimer.restart() - if (map.followme) map.center = positionSource.position.coordinate } onWidthChanged:{ @@ -324,19 +323,9 @@ Map { Binding { target: map property: 'center' - value: positionSource.position.coordinate when: followme }*/ - PositionSource{ - id: positionSource - active: followme - - onPositionChanged: { - map.center = positionSource.position.coordinate - } - } - MapQuickItem { id: locationPoint sourceItem: Rectangle { width: 14; height: 14; color: "#e41e25"; border.width: 2; border.color: "white"; smooth: true; radius: 7 } @@ -368,6 +357,17 @@ Map { width: 300 height: 300 + ToggleButton { + id: followme + text: "GeoLocation Pan" + checked: map.followme + Layout.fillWidth: true + Layout.fillHeight: true + onClicked: { + map.followme = !map.followme + } + } + Button { text: "Lookup Route" Layout.fillWidth: true diff --git a/app/mapviewer.qml b/app/mapviewer.qml index a2d5c36..cada08b 100644 --- a/app/mapviewer.qml +++ b/app/mapviewer.qml @@ -48,6 +48,7 @@ import AGL.Demo.Controls 1.0 import "map" import "menus" import "helper.js" as Helper +import "api" as API ApplicationWindow { id: appWindow @@ -60,6 +61,11 @@ ApplicationWindow { property variant toCoordinate: QtPositioning.coordinate(59.9645, 10.671) //! [routecoordinate] + API.GPS { + id: gps + url: bindingAddress + } + function createMap(provider) { var plugin diff --git a/app/mapviewer.qrc b/app/mapviewer.qrc index a85289e..4745075 100644 --- a/app/mapviewer.qrc +++ b/app/mapviewer.qrc @@ -1,6 +1,7 @@ <RCC> <qresource prefix="/"> <file>mapviewer.qml</file> + <file>api/GPS.qml</file> <file>map/MapComponent.qml</file> <file>map/Marker.qml</file> <file>map/PolylineItem.qml</file> |