From 3c804a94a22289ab766243629c41ba96ac989bd7 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Sun, 20 Oct 2019 11:50:59 -0400
Subject: Fixes to improve interoperation with tbtnavi

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: Ib32bcc50a495538362c5ca77c9de3941d81c17bf
---
 app/navigation.qml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'app/navigation.qml')

diff --git a/app/navigation.qml b/app/navigation.qml
index b1b5d9f..c23d1d5 100644
--- 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)
-- 
cgit 1.2.3-korg