refine qml app launcher

9 files changed, 45 insertions, 23 deletions

diff --git a/src/build.sh b/src/build.sh
index 4cf01d1..9000332 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -86,9 +86,9 @@ then
 			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
+			rm -f ./build/CMakeCache.txt
+			rm -f ./build/cmake_install.cmake
+			rm -f ./build/Makefile
 		fi
 	fi
 else
diff --git a/src/clone_and_build.sh b/src/clone_and_build.sh
index 147aa03..6b1f306 100755
--- a/src/clone_and_build.sh
+++ b/src/clone_and_build.sh
@@ -3,7 +3,7 @@
 build_option=""
 navigation_version='312fedf2360633e7d76f9a70a17c5d4961964e34'
 positioning_version='9725fe1f553197042d6445997690d452a73490c0'
-navit_version='566e5dfc2cafb2c184bd3cfeddf1b4138f0bc972'
+navit_version='5ca60166243b0671b4a7e62938b13feacd2391e2'
 
 echo "version of navigation is: $navigation_version"
 echo "version of positioning is: $positioning_version"
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapCompass.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapCompass.xcf
index 7ba23af..37a739b 100755
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapCompass.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapCompass.xcf
diff --git a/src/hmi/qml/Core/genivi-capi.js b/src/hmi/qml/Core/genivi-capi.js
index d0dc2d9..22724e6 100644
--- a/src/hmi/qml/Core/genivi-capi.js
+++ b/src/hmi/qml/Core/genivi-capi.js
@@ -1060,6 +1060,14 @@ function mapviewer_ConvertPixelCoordsToGeoCoords(dbusIf,x,y)
     return mapviewercontrol_message(dbusIf, "convertPixelCoordsToGeoCoords",["array",["structure",["uint16",x,"uint16",y]]]);
 }
 
+function initScale(dbusIf)
+{
+    var res=mapviewer_GetScaleList(dbusIf);
+    scaleList=res[1];
+    minZoomId=scaleList[1][1];
+    maxZoomId=scaleList[scaleList.length-1][1];
+}
+
 //---------------- MapViewer messages (handle 2) ----------------
 
 // Create a new map handle or get the current handle
diff --git a/src/hmi/qml/Core/genivi-origin.js b/src/hmi/qml/Core/genivi-origin.js
index 94f0b96..f58a500 100644
--- a/src/hmi/qml/Core/genivi-origin.js
+++ b/src/hmi/qml/Core/genivi-origin.js
@@ -1057,6 +1057,14 @@ function mapviewer_ConvertPixelCoordsToGeoCoords(dbusIf,x,y)
     return mapviewercontrol_message(dbusIf, "ConvertPixelCoordsToGeoCoords",["array",["structure",["uint16",x,"uint16",y]]]);
 }
 
+function initScale(dbusIf)
+{
+    var res=mapviewer_GetScaleList(dbusIf);
+    scaleList=res[1];
+    minZoomId=scaleList[1][1];
+    maxZoomId=scaleList[scaleList.length-1][1];
+}
+
 //---------------- MapViewer messages (handle 2) ----------------
 
 // Create a new map handle or get the current handle
diff --git a/src/hmi/qml/NavigationApp.qml b/src/hmi/qml/NavigationApp.qml
index dac51a9..81c991d 100644
--- a/src/hmi/qml/NavigationApp.qml
+++ b/src/hmi/qml/NavigationApp.qml
@@ -56,14 +56,6 @@ ApplicationWindow {
         id:dbusIf;
     }
 
-    function initScale()
-    {
-        var res=Genivi.mapviewer_GetScaleList(dbusIf);
-        Genivi.scaleList=res[1];
-        Genivi.minZoomId=Genivi.scaleList[1][1];
-        Genivi.maxZoomId=Genivi.scaleList[Genivi.scaleList.length-1][1];
-    }
-
 	Component.onCompleted: {
         //set persistent data
         Genivi.setlang("eng","USA","Latn"); //set to english US
@@ -75,7 +67,7 @@ ApplicationWindow {
 
         //launch the map viewer and init the scale list
         Genivi.mapviewer_handle(dbusIf,width,height,Genivi.MAPVIEWER_MAIN_MAP);
-        initScale();
+        Genivi.initScale(dbusIf);
 
         //set verbose mode on
         Genivi.setVerbose();
diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml
index eb6518a..c9e0c19 100644
--- a/src/hmi/qml/NavigationAppBrowseMap.qml
+++ b/src/hmi/qml/NavigationAppBrowseMap.qml
@@ -1650,7 +1650,6 @@ NavigationAppHMIMenu {
             }
         }
         showZoom();
-        initScale();
         updateDayNight();
 	}
 }
diff --git a/src/hmi/qml/NavigationAppTokyo.qml b/src/hmi/qml/NavigationAppTokyo.qml
index 262e234..4779796 100644
--- a/src/hmi/qml/NavigationAppTokyo.qml
+++ b/src/hmi/qml/NavigationAppTokyo.qml
@@ -56,14 +56,6 @@ ApplicationWindow {
         id:dbusIf;
     }
 
-    function initScale()
-    {
-        var res=Genivi.mapviewer_GetScaleList(dbusIf);
-        Genivi.scaleList=res[1];
-        Genivi.minZoomId=Genivi.scaleList[1][1];
-        Genivi.maxZoomId=Genivi.scaleList[Genivi.scaleList.length-1][1];
-    }
-
 	Component.onCompleted: {
         //set persistent data
         Genivi.setlang("jpn","JPN","Hrkt"); //set to japanese
@@ -75,7 +67,7 @@ ApplicationWindow {
 
         //launch the map viewer and init the scale list
         Genivi.mapviewer_handle(dbusIf,width,height,Genivi.MAPVIEWER_MAIN_MAP);
-        initScale();
+        Genivi.initScale(dbusIf);
 
         //launch the HMI
         load("NavigationAppMain");
diff --git a/src/update_navit.sh b/src/update_navit.sh
new file mode 100755
index 0000000..7e85cad
--- /dev/null
+++ b/src/update_navit.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if [ $# -eq 0 ]
+ then
+  echo "Need navit commit version"
+  exit
+fi
+
+navit_version=$1
+
+
+rm -rf build/navigation/navit
+rm -rf navigation/src/navigation/navit
+
+cd navigation/src/navigation
+git clone https://github.com/navit-gps/navit.git
+cd navit
+git checkout $navit_version
+patch -p0 -i ../patches/search_list_get_unique.diff
+patch -p0 -i ../patches/fsa_issue_padding.diff
+cd ../../../../
+
+