From 27c26952a5d1905f11ea4d8fe3d303fee82efd56 Mon Sep 17 00:00:00 2001
From: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Date: Fri, 31 May 2019 12:44:40 +0900
Subject: change dbus to websocket

---
 app/file_operation.cpp | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

(limited to 'app/file_operation.cpp')

diff --git a/app/file_operation.cpp b/app/file_operation.cpp
index a191c76..b51477e 100644
--- a/app/file_operation.cpp
+++ b/app/file_operation.cpp
@@ -12,9 +12,9 @@ void File_Operation::initFileOperation(){
 
     m_mapAccessToken = "";
     m_car_speed = 60; // set default Km/h
-    m_update_interval = 100; // set default millisecond
-    m_start_latitude = 35.692396; // set default coordinate Tokyo Hilton
-    m_start_longitute = 139.691102;
+    m_start_latitude = 36.136261; // set default coordinate Tokyo Hilton
+    m_start_longitute = -115.151254;
+    m_mapStyleUrls = "mapbox://styles/mapbox/streets-v10"; // set default map style
 
     QFile file(NAVI_CONFIG_FILEPATH);
     if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
@@ -32,12 +32,6 @@ void File_Operation::initFileOperation(){
         fprintf(stderr,"Failed to find mapAccessToken data \"%s\": %m", qPrintable(NAVI_CONFIG_FILEPATH));
         return;
     }
-    if(jsonObj.contains("mapStyle")){
-        m_mapStyle = jsonObj["mapStyle"].toString();
-    }else{
-        fprintf(stderr,"Failed to find mapStyle data \"%s\": %m", qPrintable(NAVI_CONFIG_FILEPATH));
-        return;
-    }
 
     if(jsonObj.contains("speed")){
         m_car_speed = jsonObj["speed"].toDouble();
@@ -46,13 +40,6 @@ void File_Operation::initFileOperation(){
         return;
     }
 
-    if(jsonObj.contains("interval")){
-        m_update_interval = jsonObj["interval"].toInt();
-    }else{
-        fprintf(stderr,"Failed to find interval data \"%s\": %m", qPrintable(NAVI_CONFIG_FILEPATH));
-        return;
-    }
-
     if(jsonObj.contains("latitude")){
         m_start_latitude = jsonObj["latitude"].toDouble();
     }else{
@@ -67,6 +54,13 @@ void File_Operation::initFileOperation(){
         return;
     }
 
+    if(jsonObj.contains("mapStyleUrls")){
+        m_mapStyleUrls = jsonObj["mapStyleUrls"].toString();
+    }else{
+        fprintf(stderr,"Failed to find mapStyleUrls data \"%s\": %m", qPrintable(NAVI_CONFIG_FILEPATH));
+        return;
+    }
+
     file.close();
 
     return;
@@ -75,18 +69,15 @@ void File_Operation::initFileOperation(){
 QString File_Operation::getMapAccessToken() {
     return m_mapAccessToken;
 }
-QString File_Operation::getMapStyle() {
-    return m_mapStyle;
-}
 double File_Operation::getCarSpeed(){
     return m_car_speed;
 }
-int File_Operation::getUpdateInterval(){
-    return m_update_interval;
-}
 double File_Operation::getStartLatitude(){
     return m_start_latitude;
 }
 double File_Operation::getStartLongitute(){
     return m_start_longitute;
 }
+QString File_Operation::getMapStyleUrls() {
+    return m_mapStyleUrls;
+}
-- 
cgit 1.2.3-korg