fix pb of duplicate enum in guidance

7 files changed, 16 insertions, 7 deletions

diff --git a/src/build.sh b/src/build.sh
index b8c381e..0bf6c63 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -74,10 +74,18 @@ fi
 
 if [ "$clean" = 1 ]
 then
-	echo 'clean up the build folder and regenerate all the stuff'
 	if [ -d "./build" ]
 	then
-		find ./build ! -name '*.cbp' -type f -exec rm -f {} +
+		if [ "$navit" = 1 ]
+		then
+			echo 'clean up the build folder and regenerate all the stuff'
+			find ./build ! -name '*.cbp' -type f -exec rm -f {} +
+		else
+			echo 'clean up the build folder and regenerate all the stuff except navit '
+			rm ./build/CMakeCache.txt
+			rm ./build/cmake_install.cmake
+			rm ./build/Makefile
+		fi
 	fi
 else
 	echo 'just build without generation of the hmi'
diff --git a/src/clone_and_build.sh b/src/clone_and_build.sh
index 503a22b..ba4b574 100755
--- a/src/clone_and_build.sh
+++ b/src/clone_and_build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 build_option=""
-navigation_version='3e116799398eda2f61c64059b34cbb01c505a1e4'
+navigation_version='35f7d96f2343a230d4844b9fb6d3a0e503d451f1'
 positioning_version='f341b4a2cb216d6204136794d33076170ab1bf80'
 navit_version='c1b0faace0e241f743a1421e8826d84aacb2d153'
 
diff --git a/src/hmi/qml/Core/genivi-capi.js b/src/hmi/qml/Core/genivi-capi.js
index bc6059f..c9c8984 100644
--- a/src/hmi/qml/Core/genivi-capi.js
+++ b/src/hmi/qml/Core/genivi-capi.js
@@ -90,7 +90,7 @@ ManeuverType[NAVIGATIONCORE_WAYPOINT]="WAYPOINT";
 
 var ManeuverDirection = new Object;
 ManeuverDirection[NAVIGATIONCORE_INVALID]="INVALID";
-ManeuverDirection[NAVIGATIONCORE_STRAIGHT_ON]="STRAIGHT_ON";
+ManeuverDirection[NAVIGATIONCORE_STRAIGHT]="STRAIGHT";
 ManeuverDirection[NAVIGATIONCORE_LEFT]="LEFT";
 ManeuverDirection[NAVIGATIONCORE_SLIGHT_LEFT]="SLIGHT_LEFT";
 ManeuverDirection[NAVIGATIONCORE_HARD_LEFT]="HARD_LEFT";
diff --git a/src/hmi/qml/Core/genivi-origin.js b/src/hmi/qml/Core/genivi-origin.js
index 707604f..59d7f45 100644
--- a/src/hmi/qml/Core/genivi-origin.js
+++ b/src/hmi/qml/Core/genivi-origin.js
@@ -90,7 +90,7 @@ ManeuverType[NAVIGATIONCORE_WAYPOINT]="WAYPOINT";
 
 var ManeuverDirection = new Object;
 ManeuverDirection[NAVIGATIONCORE_INVALID]="INVALID";
-ManeuverDirection[NAVIGATIONCORE_STRAIGHT_ON]="STRAIGHT_ON";
+ManeuverDirection[NAVIGATIONCORE_STRAIGHT]="STRAIGHT";
 ManeuverDirection[NAVIGATIONCORE_LEFT]="LEFT";
 ManeuverDirection[NAVIGATIONCORE_SLIGHT_LEFT]="SLIGHT_LEFT";
 ManeuverDirection[NAVIGATIONCORE_HARD_LEFT]="HARD_LEFT";
diff --git a/src/hmi/qml/Core/resource.js.in b/src/hmi/qml/Core/resource.js.in
index a2e3046..aba2bc0 100644
--- a/src/hmi/qml/Core/resource.js.in
+++ b/src/hmi/qml/Core/resource.js.in
@@ -42,7 +42,7 @@ ManeuverTypeIcon[NAVIGATIONCORE_WAYPOINT]=IconPath+"unknown_64_64.png";
 
 var ManeuverDirectionIcon = new Object;
 ManeuverDirectionIcon[NAVIGATIONCORE_INVALID]=IconPath+"nav_straight_wh.png";
-ManeuverDirectionIcon[NAVIGATIONCORE_STRAIGHT_ON]=IconPath+"nav_straight_bk.png";
+ManeuverDirectionIcon[NAVIGATIONCORE_STRAIGHT]=IconPath+"nav_straight_bk.png";
 ManeuverDirectionIcon[NAVIGATIONCORE_LEFT]=IconPath+"nav_left_1_bk.png";
 ManeuverDirectionIcon[NAVIGATIONCORE_SLIGHT_LEFT]=IconPath+"nav_left_2_bk.png";
 ManeuverDirectionIcon[NAVIGATIONCORE_HARD_LEFT]=IconPath+"nav_left_3_bk.png";
diff --git a/src/hmi/qml/NavigationBrowseMap.qml b/src/hmi/qml/NavigationBrowseMap.qml
index 05682ba..2cbba4c 100644
--- a/src/hmi/qml/NavigationBrowseMap.qml
+++ b/src/hmi/qml/NavigationBrowseMap.qml
@@ -380,6 +380,7 @@ HMIMenu {
         {
             guidanceStatus.setState("ON");
             Genivi.guidance_activated = true;
+            console.log(maneuverData[3][3][1]);
             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);
diff --git a/src/run-capi b/src/run-capi
index 001f089..61ea6a9 100755
--- a/src/run-capi
+++ b/src/run-capi
@@ -238,7 +238,7 @@ sleep 1
 # start the poi server
 run "POI service" $POI_SERVER_BIN_DIR/$POI_SERVER -f $SCRIPT_DIR/empty.db
 
-sleep 1 # need a sleep here (to be improved)
+sleep 2 # need a sleep here (to be improved)
 
 if [ "$enhpos" = 1 ]
 then # start the  enhanced position service