alignment with latest navit version, improvement of build (thanks to jandegr)

4 files changed, 41 insertions, 31 deletions

diff --git a/src/build.sh b/src/build.sh
index 8606ab1..550ab65 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -108,14 +108,14 @@ then
 	echo 'build navit'
 	if [ "$clean" = 1 ]
 	then
-		cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../../navigation/src/navigation/navit/
+		cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -DBUILD_MAPTOOL=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../../navigation/src/navigation/navit/
 	fi
 	make
 else
 	if [ "$clean" = 1 ]
 	then
 		echo 'build navit'
-		cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../../navigation/src/navigation/navit/
+		cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -DBUILD_MAPTOOL=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../../navigation/src/navigation/navit/
 		make
 	fi
 fi
diff --git a/src/clone_and_build.sh b/src/clone_and_build.sh
index a771154..73d0b16 100755
--- a/src/clone_and_build.sh
+++ b/src/clone_and_build.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 build_option=""
-navigation_version='35b1bb42073ccc945e52a0ad783b412e39018f55'
+navigation_version='c0aaaac03e49ba60c8bc5ed9ad87a25d8e84582d'
 positioning_version='f341b4a2cb216d6204136794d33076170ab1bf80'
-navit_version='0a8f85666a3b849d70ed450d74bed3cf85466630'
+navit_version='72a9284980f0ff6b8dd3972c0c15b3945c94559c'
 
 echo "version of navigation is: $navigation_version"
 echo "version of positioning is: $positioning_version"
diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml
index b51a190..8eaed23 100644
--- a/src/hmi/qml/NavigationAppBrowseMap.qml
+++ b/src/hmi/qml/NavigationAppBrowseMap.qml
@@ -643,9 +643,9 @@ HMIMenu {
         var maneuversList=res[5];
         var model=maneuverArea.model;
         for (var i = 0 ; i < maneuversList.length ; i+=2) {
-            var roadNameAfterManeuver=maneuversList[i+1][3];
-            var offsetOfNextManeuver=maneuversList[i+1][9];
-            var items=maneuversList[i+1][11];
+            var roadNameAfterManeuver=maneuversList[i+1][9];
+            var offsetOfNextManeuver=maneuversList[i+1][15];
+            var items=maneuversList[i+1][17];
 
             for (var j = 0 ; j < items.length ; j+=2) {
                 //multiple maneuvers are not managed !
@@ -677,32 +677,41 @@ HMIMenu {
 	{
         if(Genivi.guidance_activated == true)
         {
-            var maneuversList=Genivi.guidance_GetManeuversList(dbusIf,1,0);
-            var numberOfManeuvers=maneuversList[3];
+            var res=Genivi.guidance_GetManeuversList(dbusIf,1,0);
             //only one maneuver is considered
-            var maneuver=maneuversList[5][1];
-            var roadNumberAfterManeuver=maneuver[1];
-            var roadNameAfterManeuver=maneuver[3];
-            var roadPropertyAfterManeuver=maneuver[5];
-            var drivingSide=maneuver[7];
-            var offsetOfNextManeuver=maneuver[9];
-            var items=maneuver[11][1];
-            var offsetOfManeuver=items[1];
-            var travelTime=items[3];
-            var direction=items[5];
-            var maneuverType=items[7];
-            var maneuverData=items[9];
-            if (maneuverData[1] == Genivi.NAVIGATIONCORE_DIRECTION)
+            //var error=res[1]
+            var numberOfManeuvers=res[3];
+            if(numberOfManeuvers > 0)
             {
-                maneuverIcon.source=Genivi.ManeuverDirectionIcon[maneuverData[3][3][1]];
-                //Genivi.ManeuverType[subarray[j+1][7]] contains CROSSROAD and is removed for the moment
-                distancetomaneuverValue.text=Genivi.distance(offsetOfManeuver);
-                roadaftermaneuverValue.text=roadNameAfterManeuver;
+                var maneuversList=res[5][1];
+                //var roadShieldsAfterManeuver=maneuversList[1]
+                //var countryCodeAfterManeuver=maneuversList[3]
+                //var stateCodeAfterManeuver=maneuversList[5]
+                var roadNumberAfterManeuver=maneuversList[7];
+                var roadNameAfterManeuver=maneuversList[9];
+                var roadPropertyAfterManeuver=maneuversList[11];
+                var drivingSide=maneuversList[13];
+                var offsetOfNextManeuver=maneuversList[15];
+                var items=maneuversList[17][1];
+                var offsetOfManeuver=items[1];
+                var travelTime=items[3];
+                var direction=items[5];
+                var maneuverType=items[7];
+                var maneuverData=items[9];
+                if (maneuverData[1] == Genivi.NAVIGATIONCORE_DIRECTION)
+                {
+                    maneuverIcon.source=Genivi.ManeuverDirectionIcon[maneuverData[3][3][1]];
+                    //Genivi.ManeuverType[subarray[j+1][7]] contains CROSSROAD and is removed for the moment
+                    distancetomaneuverValue.text=Genivi.distance(offsetOfManeuver);
+                    roadaftermaneuverValue.text=roadNameAfterManeuver;
+                }
+            } else {
+
             }
 
-            var res=Genivi.guidance_GetDestinationInformation(dbusIf);
-            distancetodestinationValue.text = Genivi.distance(res[1]);
-            timetodestinationValue.text = Genivi.time(res[3]);
+            var res1=Genivi.guidance_GetDestinationInformation(dbusIf);
+            distancetodestinationValue.text = Genivi.distance(res1[1]);
+            timetodestinationValue.text = Genivi.time(res1[3]);
 
             updateAddress();
         }
@@ -1422,7 +1431,7 @@ HMIMenu {
 
     Component.onCompleted: {
         Genivi.mapviewer_handle(dbusIf,menu.width,menu.height,Genivi.MAPVIEWER_MAIN_MAP);
-        if (Genivi.data['display_on_map']==='show_route_handle') {
+        if (Genivi.data['display_on_map']==='show_route') {
             Genivi.mapviewer_DisplayRoute(dbusIf,Genivi.data['show_route_handle'],false);
             var res=Genivi.routing_GetRouteBoundingBox(dbusIf,Genivi.data['zoom_route_handle']);
             if (res[0] == "structure") {
@@ -1435,6 +1444,7 @@ HMIMenu {
         else {
             if (Genivi.data['display_on_map']==='show_current_position') {
                 Genivi.mapviewer_SetFollowCarMode(dbusIf,true);
+                Genivi.mapviewer_DisplayRoute(dbusIf,Genivi.data['show_route_handle'],false);
             } else {
                 if (Genivi.data['display_on_map']==='show_position') {
                     Genivi.mapviewer_SetFollowCarMode(dbusIf,false);
diff --git a/src/hmi/qml/NavigationAppSearch.qml b/src/hmi/qml/NavigationAppSearch.qml
index 19b45bb..419a6c7 100644
--- a/src/hmi/qml/NavigationAppSearch.qml
+++ b/src/hmi/qml/NavigationAppSearch.qml
@@ -812,7 +812,7 @@ NavigationAppHMIMenu {
             onClicked: {
                 disconnectSignals();
                 Genivi.data["mapback"]="NavigationAppSearch";
-                Genivi.data['display_on_map']='show_route_handle';
+                Genivi.data['display_on_map']='show_route';
                 Genivi.data['show_route_handle']=Genivi.routing_handle(dbusIf);
                 Genivi.data['zoom_route_handle']=Genivi.routing_handle(dbusIf);
                 mapMenu();