fix some minor bugs

5 files changed, 29 insertions, 32 deletions

diff --git a/src/fuel-stop-advisor/fuel-stop-advisor.cpp b/src/fuel-stop-advisor/fuel-stop-advisor.cpp
index 605711b..a687b7b 100644
--- a/src/fuel-stop-advisor/fuel-stop-advisor.cpp
+++ b/src/fuel-stop-advisor/fuel-stop-advisor.cpp
@@ -197,7 +197,7 @@ class FuelStopAdvisor
 		advisorMode=false;
 		distanceThreshold=0;
         destinationCantBeReached=false;
-		routeHandle=0;
+        m_routeHandle=0;
         initFlag=true;
         }
 
@@ -244,10 +244,10 @@ class FuelStopAdvisor
                 if (iter->first == CTripComputer::TRIPCOMPUTER_TANK_DISTANCE)
                 { //tank distance is valid, so it means that fuel level is valid too
                     ret[GENIVI_FUELSTOPADVISOR_TANK_DISTANCE]=variant_uint16(boost::get<uint16_t>(iter->second));
-                    ret[GENIVI_FUELSTOPADVISOR_FUEL_LEVEL]=variant_uint16(fuelLevel);
-                    if (this->routeHandle != 0)
+                    ret[GENIVI_FUELSTOPADVISOR_FUEL_LEVEL]=variant_uint16(m_fuelLevel);
+                    if (this->m_routeHandle != 0)
                     { // a route is valid so it makes sense to calculate enhanced tank distance
-                        ret[GENIVI_FUELSTOPADVISOR_ENHANCED_TANK_DISTANCE]=variant_uint16(enhancedDistance(fuelLevel,remaining)+0.5);
+                        ret[GENIVI_FUELSTOPADVISOR_ENHANCED_TANK_DISTANCE]=variant_uint16(enhancedDistance(m_fuelLevel,remaining)+0.5);
                     }
                 }
             }
@@ -317,15 +317,15 @@ class FuelStopAdvisor
 	double enhancedDistance(double level, double &remaining)
 	{
 		double distance=0;
-        LOG_INFO(gCtx,"routeHandle %d",routeHandle);
-        if (routeHandle) {
+        LOG_INFO(gCtx,"routeHandle %d",m_routeHandle);
+        if (m_routeHandle) {
             std::vector< std::map< int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > > RouteShape;
             std::vector< int32_t > valuesToReturn;
 			uint32_t totalNumberOfSegments;
 			valuesToReturn.push_back(GENIVI_NAVIGATIONCORE_DISTANCE);
 			valuesToReturn.push_back(GENIVI_NAVIGATIONCORE_SPEED);
 
-            routing->GetRouteSegments(routeHandle, 1, valuesToReturn, 0xffffffff, 0, totalNumberOfSegments, RouteShape);
+            routing->GetRouteSegments(m_routeHandle, 1, valuesToReturn, 0xffffffff, 0, totalNumberOfSegments, RouteShape);
 			for (int i=0 ; i < RouteShape.size(); i++) {
 				double seg_distance;
 				uint16_t seg_speed;
@@ -426,7 +426,7 @@ class FuelStopAdvisor
 
         mp_tripComputer->RefreshTripComputerInput(tripComputerInput);
 
-        fuelLevel = level; //to avoid re-ask it to amb
+        m_fuelLevel = level; //to avoid re-ask it to amb
 
         TripDataUpdated(0); //arg is for future use
 	}
@@ -435,10 +435,9 @@ class FuelStopAdvisor
     {
         double remaining;
         if (advisorMode) {
-            enhancedDistance(fuelLevel, remaining);
-            LOG_INFO(gCtx,"Advisor %f vs %d",remaining, distanceThreshold);
+            enhancedDistance(m_fuelLevel, remaining);
+            LOG_INFO(gCtx,"Advisor remaining: %f vs distanceThreshold: %d",remaining, distanceThreshold);
             if (remaining < distanceThreshold) {
-                LOG_INFO(gCtx,"Warning %f < %d",remaining, distanceThreshold);
                 destinationCantBeReached = true;
             }
             else
@@ -468,13 +467,13 @@ class FuelStopAdvisor
 
 	void SetRouteHandle(const uint32_t& routeHandle)
 	{
-        this->routeHandle=routeHandle;
+        this->m_routeHandle=routeHandle;
         updateEnhancedDistance();
 	}
 
     void ReleaseRouteHandle(const uint32_t& routeHandle)
     {
-        this->routeHandle=0;
+        this->m_routeHandle=0;
         updateEnhancedDistance();
     }
 
@@ -493,13 +492,13 @@ class FuelStopAdvisor
 	bool advisorMode;
 	uint8_t distanceThreshold;
     bool destinationCantBeReached;
-	uint32_t routeHandle;
+    uint32_t m_routeHandle;
     bool initFlag;
     double lastTime;
     uint16_t timeCounter;
     uint32_t lastOdometer;
     uint16_t distanceCounter;
-    uint16_t fuelLevel;
+    uint16_t m_fuelLevel;
 };
 
 static gboolean
diff --git a/src/hmi/qml/NavigationApp.qml b/src/hmi/qml/NavigationApp.qml
index 6dd2cd9..4ed7d34 100644
--- a/src/hmi/qml/NavigationApp.qml
+++ b/src/hmi/qml/NavigationApp.qml
@@ -90,6 +90,11 @@ ApplicationWindow {
         Genivi.radius=Settings.getValue("Settings/radius");
         Genivi.maxResultListSize=Settings.getValue("Settings/maxResultListSize");
         Genivi.default_category_name=Settings.getValue("Settings/defaultCategoryName")
+        if(Settings.getValue("Log/dlt")==="true")
+            Genivi.dlt=true;
+        else
+            Genivi.dlt=false;
+
         if(Settings.getValue("Settings/simulationMode")==="true")
             Genivi.simulationMode=true;
         else
@@ -110,10 +115,12 @@ ApplicationWindow {
         else
             Genivi.verbose=false;
 
-        if(Settings.getValue("Log/dlt")==="true")
-            Genivi.dlt=true;
-        else
-            Genivi.dlt=false;
+        //default settings
+        Genivi.setGuidanceActivated(dltIf,false);
+        Genivi.setRouteCalculated(dltIf,false);
+        Genivi.setRerouteRequested(dltIf,false);
+        Genivi.setVehicleLocated(dltIf,false);
+        Genivi.setDestinationDefined(dltIf,false);
 
         //configure the middleware
         Genivi.navigationcore_configuration_SetLocale(dbusIf,dltIf,Genivi.g_language,Genivi.g_country,Genivi.g_script);
@@ -131,13 +138,6 @@ ApplicationWindow {
         var res3=Genivi.navigationcore_session_CreateSession(dbusIf,dltIf);
         Genivi.g_nav_session_handle[1]=res3[3];
 
-        //default settings
-        Genivi.setGuidanceActivated(dltIf,false);
-        Genivi.setRouteCalculated(dltIf,false);
-        Genivi.setRerouteRequested(dltIf,false);
-        Genivi.setVehicleLocated(dltIf,false);
-        Genivi.setDestinationDefined(dltIf,false);
-
         //launch the HMI
         Genivi.hookMessage(dltIf,"Menu level",Genivi.entrybackheapsize);
         load("NavigationAppBrowseMap");
diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml
index 86080e6..787b5d4 100644
--- a/src/hmi/qml/NavigationAppBrowseMap.qml
+++ b/src/hmi/qml/NavigationAppBrowseMap.qml
@@ -110,7 +110,6 @@ NavigationAppHMIMenu {
             Genivi.setGuidanceActivated(dltIf,true);
             Genivi.data['display_on_map']='show_current_position';
             Genivi.data['show_route_handle']=Genivi.routing_handle();
-            Genivi.data['zoom_route_handle']=Genivi.routing_handle();
             rootMenu(dltIf,pagefile); //reload the whole menu to init the guidance
         } else {
             Genivi.setGuidanceActivated(dltIf,false);
@@ -1686,10 +1685,10 @@ NavigationAppHMIMenu {
 
         if (Genivi.data['display_on_map']==='show_route') {
             //display the route when it has been calculated
-            var res=Genivi.routing_GetRouteBoundingBox(dbusIf,dltIf,Genivi.data['zoom_route_handle']);
+            Genivi.mapviewer_SetFollowCarMode(dbusIf,dltIf,false);
+            var res=Genivi.routing_GetRouteBoundingBox(dbusIf,dltIf,Genivi.data['show_route_handle']);
             Genivi.mapviewer_SetMapViewBoundingBox(dbusIf,dltIf,res);
-            Genivi.mapviewer_DisplayRoute(dbusIf,dltIf,Genivi.g_routing_handle,false);
-            Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,dltIf,1,50); //activate advisor mode
+            Genivi.mapviewer_DisplayRoute(dbusIf,dltIf,Genivi.g_routing_handle,true);
             hideGuidancePanel();
             hideRoutePanel();
             hideSimulationPanel();
diff --git a/src/hmi/qml/NavigationAppSearch.qml b/src/hmi/qml/NavigationAppSearch.qml
index 162a9c3..9bb2458 100644
--- a/src/hmi/qml/NavigationAppSearch.qml
+++ b/src/hmi/qml/NavigationAppSearch.qml
@@ -1081,7 +1081,6 @@ NavigationAppHMIMenu {
                     Genivi.data['display_on_map']='show_route';
                     Genivi.hookMessage(dltIf,'display_on_map',Genivi.data['display_on_map']);
                     Genivi.data['show_route_handle']=Genivi.routing_handle();
-                    Genivi.data['zoom_route_handle']=Genivi.routing_handle();
                 }
                 entryMenu(dltIf,"NavigationAppBrowseMap",menu);
             }
diff --git a/src/update_third_party.sh b/src/update_third_party.sh
index 570b0d6..dacb8c4 100755
--- a/src/update_third_party.sh
+++ b/src/update_third_party.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-navigation_version='e31de24c6f882a41ed13086712e97539cbf7b1a2'
+navigation_version='1580c63e57e4de61a8f24d2bed2c44e3316a3641'
 positioning_version='9725fe1f553197042d6445997690d452a73490c0'
 navit_version='f5abdd317e10d56226300d001469595658a605e4'