summaryrefslogtreecommitdiffstats
path: root/app/navigation.qml
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-10-20 11:50:59 -0400
committerScott Murray <scott.murray@konsulko.com>2019-10-20 14:33:21 -0400
commitfe954c9dd641e45e429b423714c22ef1da5beb16 (patch)
treee489c776c62d3ef015596bbedce7b01349c3fcef /app/navigation.qml
parent15b51bbb886dd0870521fa1bcc6f5d2493271438 (diff)
Fixes to improve interoperation with tbtnavihalibut_8.0.3halibut/8.0.38.0.3
Changes include: - Add support for actually sending stopDemo and Arrived DBus signals. - Fix typo in Arrived signal name in org.agl.naviapi.xml and dbus_server.cpp. - Change some qDebug messages in dbus_server.cpp to qWarning as it seems more appropriate. - Actually use Mapbox style URL from naviconfig.ini. Bug-AGL: SPEC-2916 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ibc4c77ffa1bf74787cf02ad4e64a87b48d2e30fe
Diffstat (limited to 'app/navigation.qml')
-rwxr-xr-xapp/navigation.qml9
1 files changed, 7 insertions, 2 deletions
diff --git a/app/navigation.qml b/app/navigation.qml
index b1b5d9f..c23d1d5 100755
--- a/app/navigation.qml
+++ b/app/navigation.qml
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2016 The Qt Company Ltd.
+ * Copyright (C) 2019 Konsulko Group
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -46,6 +47,10 @@ ApplicationWindow {
name: "mapbox.access_token";
value: fileOperation.getMapAccessToken()
}
+ PluginParameter {
+ name: "mapbox.mapping.additional_style_urls"
+ value: fileOperation.getMapStyleUrls()
+ }
}
Plugin {
id: osm
@@ -72,7 +77,7 @@ ApplicationWindow {
signal qmlSignalRouteInfo(double srt_lat,double srt_lon,double end_lat,double end_lon);
signal qmlSignalPosInfo(double lat,double lon,double drc,double dst);
signal qmlSignalStopDemo();
- signal qmlSignalArrvied();
+ signal qmlSignalArrived();
signal qmlCheckDirection(double cur_dir,double next_dir,double is_rot);
width: parent.width
@@ -542,7 +547,7 @@ ApplicationWindow {
{
// Arrive at your destination
btn_guidance.sts_guide = 0
- map.qmlSignalArrvied()
+ map.qmlSignalArrived()
}
}else{
setNextCoordinate(map.currentpostion.latitude, map.currentpostion.longitude,next_direction,root.car_moving_distance)