Fix data format error in Set/Get MapViewPan

4 files changed, 16 insertions, 16 deletions

diff --git a/src/hmi/qml/Core/genivi.js b/src/hmi/qml/Core/genivi.js
index 37931f7..26517fc 100644
--- a/src/hmi/qml/Core/genivi.js
+++ b/src/hmi/qml/Core/genivi.js
@@ -304,7 +304,7 @@ function navigationcore_configuration_GetUnitsOfMeasurement(dbusIf)
 
 function navigationcore_configuration_SetUnitsOfMeasurementLength(dbusIf,unit)
 {
-    navigationcore_configuration_message(dbusIf,"SetUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"structure",["uint8",0,"variant",["uint16",unit]]]]);
+    navigationcore_configuration_message(dbusIf,"SetUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]);
 }
 
 //----------------- LocationInput messages -----------------
@@ -737,7 +737,7 @@ function mapviewer_configuration_GetUnitsOfMeasurement(dbusIf)
 
 function mapviewer_configuration_SetUnitsOfMeasurementLength(dbusIf,unit)
 {
-    mapviewer_configuration_message(dbusIf,"SetUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"structure",["uint8",0,"variant",["uint16",unit]]]]);
+    mapviewer_configuration_message(dbusIf,"SetUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]);
 }
 
 // -------------------- POISearch dbus messages --------------------
diff --git a/src/hmi/qml/NavigationBrowseMap.qml b/src/hmi/qml/NavigationBrowseMap.qml
index 333882e..4fd824f 100644
--- a/src/hmi/qml/NavigationBrowseMap.qml
+++ b/src/hmi/qml/NavigationBrowseMap.qml
@@ -710,29 +710,29 @@ HMIMenu {
                 StdButton {
                     source:StyleSheetScroll.scrollup[Constants.SOURCE]; x:StyleSheetScroll.scrollup[Constants.X]; y:StyleSheetScroll.scrollup[Constants.Y]; width:StyleSheetScroll.scrollup[Constants.WIDTH]; height:StyleSheetScroll.scrollup[Constants.HEIGHT];
                     id:scrollup; explode:false; next:scrollleft; prev:scrolldown;
-                    onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);}
-                    onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2,"uint16",map.height/2 + scroll.panY]]]);}
+                    onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);}
+                    onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2,"uint16",map.height/2 + scroll.panY]]]);}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.scrollleft[Constants.SOURCE]; x:StyleSheetScroll.scrollleft[Constants.X]; y:StyleSheetScroll.scrollleft[Constants.Y]; width:StyleSheetScroll.scrollleft[Constants.WIDTH]; height:StyleSheetScroll.scrollleft[Constants.HEIGHT];
                     id:scrollleft; explode:false; next:scrollright; prev:scrollup;
-                    onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);}
-                    onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2 + scroll.panX,"uint16",map.height/2]]]);}
+                    onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);}
+                    onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2 + scroll.panX,"uint16",map.height/2]]]);}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.scrollright[Constants.SOURCE]; x:StyleSheetScroll.scrollright[Constants.X]; y:StyleSheetScroll.scrollright[Constants.Y]; width:StyleSheetScroll.scrollright[Constants.WIDTH]; height:StyleSheetScroll.scrollright[Constants.HEIGHT];
                     id:scrollright; explode:false; next:scrolldown; prev:scrollleft;
-                    onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);}
-                    onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2 - scroll.panX,"uint16",map.height/2]]]);}
+                    onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);}
+                    onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2 - scroll.panX,"uint16",map.height/2]]]);}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.scrolldown[Constants.SOURCE]; x:StyleSheetScroll.scrolldown[Constants.X]; y:StyleSheetScroll.scrolldown[Constants.Y]; width:StyleSheetScroll.scrolldown[Constants.WIDTH]; height:StyleSheetScroll.scrolldown[Constants.HEIGHT];
                     id:scrolldown; explode:false; next:scrollup; prev:scrollright;
-                    onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);}
-                    onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2,"uint16",map.height/2 - scroll.panY]]]);}
+                    onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);}
+                    onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2,"uint16",map.height/2 - scroll.panY]]]);}
                 }
             }
         }
diff --git a/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml b/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml
index 8c0540b..8b61d73 100644
--- a/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml
+++ b/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml
@@ -102,17 +102,17 @@ HMIMenu {
             }
 		}
 
-        Genivi.dump("lang_nav",lang_nav);
+        Genivi.setlang(current_lang_nav);
 
 		var units1,units2;
         var res=Genivi.navigationcore_configuration_GetUnitsOfMeasurement(dbusIf);
 
         if (res[1][1] == Genivi.NAVIGATIONCORE_LENGTH) {
-            units1=res[1][3][3][1];
+            units1=res[1][3];
         }
         var res1=Genivi.mapviewer_configuration_GetUnitsOfMeasurement(dbusIf);
         if (res1[1][1] == Genivi.MAPVIEWER_LENGTH) {
-            units2=res1[1][3][3][1];
+            units2=res1[1][3];
         }
 		unit_km.disabled=false;
 		unit_mile.disabled=false;
diff --git a/src/reload.sh b/src/reload.sh
index 740dd76..461067c 100755
--- a/src/reload.sh
+++ b/src/reload.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-navigation_version='5240ff33da9c821d6b36afb30f0d3e3897b0ad76'
-positioning_version='48451e36a8c21afb00575227d27e10417c27878c'
-navit_version='162a3e43d14531a7053872903674351a3142eea2'
+navigation_version='368cc50e9579d7ce7751c1a24c48072b9027592f'
+positioning_version='f4f6b041f66fe7a02bd36f8f90918f9838292bed'
+navit_version='42f9d3484516c88c7cdf647817a6d6a2acac53c2'
 
 echo "version of navigation is: $navigation_version"
 echo "version of positioning is: $positioning_version"