improve text search

18 files changed, 206 insertions, 119 deletions

diff --git a/src/hmi/config/fsa_london.conf b/src/hmi/config/fsa_london.conf
index 74376a6..dcfec98 100644
--- a/src/hmi/config/fsa_london.conf
+++ b/src/hmi/config/fsa_london.conf
@@ -15,6 +15,9 @@ number=1
 simulationMode=true
 showroom=true
 autoguidance=false
+radius=5000
+maxResultListSize=10
+defaultCategoryName=fuel
 [Log]
 verbose=true
 dlt=false
diff --git a/src/hmi/config/fsa_paris.conf b/src/hmi/config/fsa_paris.conf
index befe073..0fc1bd1 100644
--- a/src/hmi/config/fsa_paris.conf
+++ b/src/hmi/config/fsa_paris.conf
@@ -15,6 +15,9 @@ number=13
 simulationMode=false
 showroom=false
 autoguidance=false
+radius=5000
+maxResultListSize=10
+defaultCategoryName=fuel
 [Log]
 verbose=true
 dlt=false
diff --git a/src/hmi/config/fsa_switzerland.conf b/src/hmi/config/fsa_switzerland.conf
index 6e6e616..ffcdc9f 100644
--- a/src/hmi/config/fsa_switzerland.conf
+++ b/src/hmi/config/fsa_switzerland.conf
@@ -15,6 +15,9 @@ number=8
 simulationMode=true
 showroom=true
 autoguidance=false
+radius=5000
+maxResultListSize=10
+defaultCategoryName=fuel
 [Log]
 verbose=true
 dlt=true
diff --git a/src/hmi/config/fsa_tokyo.conf b/src/hmi/config/fsa_tokyo.conf
index 30cf121..498306a 100644
--- a/src/hmi/config/fsa_tokyo.conf
+++ b/src/hmi/config/fsa_tokyo.conf
@@ -15,5 +15,8 @@ number=17
 simulationMode=true
 showroom=true
 autoguidance=false
+radius=5000
+maxResultListSize=10
+defaultCategoryName=fuel
 [Log]
 verbose=true
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf
index b7ce165..74a299b 100644
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
index 03a2ad4..d830b38 100644
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapScroll.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapScroll.xcf
index a593b3a..10c042b 100755
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapScroll.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapScroll.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
index 7be59a8..2278a6b 100755
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapZoom.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapZoom.xcf
index 129ba20..d181235 100755
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapZoom.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapZoom.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppPOI.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppPOI.xcf
index e0a2eaa..9b1267a 100644
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppPOI.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppPOI.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppSearch.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppSearch.xcf
index 7d6d9a6..a8bb9bd 100644
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppSearch.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppSearch.xcf
diff --git a/src/hmi/qml/Core/NavigationAppKeyboard.qml b/src/hmi/qml/Core/NavigationAppKeyboard.qml
index eac1bc2..7533b1f 100644
--- a/src/hmi/qml/Core/NavigationAppKeyboard.qml
+++ b/src/hmi/qml/Core/NavigationAppKeyboard.qml
@@ -64,13 +64,13 @@ Item {
 		if (secondLayout && !destination.text.length) {
 			shift(secondLayout);
 		}
-		keypress(what);
 		if (what == '\b') {
 			backspace();
 		} else {
 			destination.text+=what;
 		}
-	}
+        keypress(what);
+    }
 
 	function backspace() {
 		if (destination.text.length) {
diff --git a/src/hmi/qml/Core/genivi-capi.js b/src/hmi/qml/Core/genivi-capi.js
index e674fba..03bc63d 100644
--- a/src/hmi/qml/Core/genivi-capi.js
+++ b/src/hmi/qml/Core/genivi-capi.js
@@ -38,7 +38,6 @@ var g_mapviewer_session=["uint32",0];
 var g_mapviewer_handle=["uint32",0];
 var g_poisearch_handle=["uint32",0];
 var g_language,g_country,g_script; //initialized by conf file
-var g_default_category_name='fuel'
 
 var data=new Array;
 data['destination']=new Array; //the destination
@@ -54,11 +53,15 @@ var categoriesIdNameList;
 
 var translations=new Array;
 
-var simulationMode; //initialized by conf file
-var showroom; //initialized by conf file
-var autoguidance; //initialized by conf file
-var verbose; //initialized by conf file
-var dlt; //initialized by conf file
+//initialized by conf file
+var simulationMode;
+var showroom;
+var autoguidance;
+var verbose;
+var dlt;
+var radius; //radius in m around the vehicle to search for the refill stations
+var maxResultListSize; //max size of elements to return as a result
+var g_default_category_name;
 
 var guidance_activated=false;
 var route_calculated=false;
@@ -162,9 +165,7 @@ var historyOfLastEnteredLat = new Array; //dirty but need to know how to do it i
 var historyOfLastEnteredLon = new Array; //dirty but need to know how to do it in qml
 var historyOfLastEnteredLocationIn=0; //next input
 var historyOfLastEnteredLocationOut=0; //first ouput
-var radius=5000; //radius in m around the vehicle to search for the refill stations
 var offset=0; //offset of the start record to get on the list of pois
-var maxResultListSize=50; //max size of elements to return as a result
 var fuelCategoryId; //unique id of fuel category
 var zoom_guidance=2; //zoom level when a guidance starts
 
diff --git a/src/hmi/qml/Core/genivi-origin.js b/src/hmi/qml/Core/genivi-origin.js
index c469efc..e50551c 100644
--- a/src/hmi/qml/Core/genivi-origin.js
+++ b/src/hmi/qml/Core/genivi-origin.js
@@ -38,7 +38,6 @@ var g_mapviewer_session=["uint32",0];
 var g_mapviewer_handle=["uint32",0];
 var g_poisearch_handle=["uint32",0];
 var g_language,g_country,g_script; //initialized by conf file
-var g_default_category_name='fuel'
 
 var data=new Array;
 data['destination']=new Array; //the destination
@@ -54,11 +53,15 @@ var categoriesIdNameList;
 
 var translations=new Array;
 
-var simulationMode; //initialized by conf file
-var showroom; //initialized by conf file
-var autoguidance; //initialized by conf file
-var verbose; //initialized by conf file
-var dlt; //initialized by conf file
+//initialized by conf file
+var simulationMode;
+var showroom;
+var autoguidance;
+var verbose;
+var dlt;
+var radius=5000; //radius in m around the vehicle to search for the refill stations
+var maxResultListSize=50; //max size of elements to return as a result
+var default_category_name;
 
 var guidance_activated=false;
 var route_calculated=false;
@@ -162,9 +165,7 @@ var historyOfLastEnteredLat = new Array; //dirty but need to know how to do it i
 var historyOfLastEnteredLon = new Array; //dirty but need to know how to do it in qml
 var historyOfLastEnteredLocationIn=0; //next input
 var historyOfLastEnteredLocationOut=0; //first ouput
-var radius=5000; //radius in m around the vehicle to search for the refill stations
 var offset=0; //offset of the start record to get on the list of pois
-var maxResultListSize=50; //max size of elements to return as a result
 var fuelCategoryId; //unique id of fuel category
 var zoom_guidance=2; //zoom level when a guidance starts
 
diff --git a/src/hmi/qml/NavigationApp.qml b/src/hmi/qml/NavigationApp.qml
index 58be1a4..dbb976b 100644
--- a/src/hmi/qml/NavigationApp.qml
+++ b/src/hmi/qml/NavigationApp.qml
@@ -85,7 +85,9 @@ ApplicationWindow {
         Genivi.setlang(Settings.getValue("Locale/language"),Settings.getValue("Locale/country"),Settings.getValue("Locale/script"));
         Genivi.setDefaultPosition(Settings.getValue("DefaultPosition/latitude"),Settings.getValue("DefaultPosition/longitude"),Settings.getValue("DefaultPosition/altitude"));
         Genivi.setDefaultAddress(Settings.getValue("DefaultAddress/country"),Settings.getValue("DefaultAddress/city"),Settings.getValue("DefaultAddress/street"),Settings.getValue("DefaultAddress/number"));
-
+        Genivi.radius=Settings.getValue("Settings/radius");
+        Genivi.maxResultListSize=Settings.getValue("Settings/maxResultListSize");
+        Genivi.default_category_name=Settings.getValue("Settings/defaultCategoryName")
         if(Settings.getValue("Settings/simulationMode")==="true")
             Genivi.simulationMode=true;
         else
diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml
index 3c171a6..6ef681b 100644
--- a/src/hmi/qml/NavigationAppBrowseMap.qml
+++ b/src/hmi/qml/NavigationAppBrowseMap.qml
@@ -327,26 +327,6 @@ NavigationAppHMIMenu {
     // Map settings
     //------------------------------------------//
     Timer {
-        id:move_timer
-        repeat:true
-        triggeredOnStart:false
-        property real lat;
-        property real lon;
-        property bool active;
-        onTriggered: {
-            if (active) {
-                var res=Genivi.mapviewer_GetTargetPoint(dbusIf,dltIf);
-                var latitude=res[1][1]+lat;
-                var longitude=res[1][3]+lon;
-                var altitude=res[1][5];
-                Genivi.mapviewer_SetTargetPoint(dbusIf,dltIf,latitude,longitude,altitude);
-                interval=50;
-                restart();
-            }
-        }
-    }
-
-    Timer {
         id:camera_timer
         repeat:true
         triggeredOnStart:false
@@ -374,21 +354,6 @@ NavigationAppHMIMenu {
         }
     }
 
-    function move_start(lat, lon)
-    {
-        Genivi.mapviewer_SetFollowCarMode(dbusIf,dltIf, false);
-        move_timer.lat=lat/10000;
-        move_timer.lon=lon/10000;
-        move_timer.active=true;
-        move_timer.triggered();
-    }
-
-    function move_stop()
-    {
-        move_timer.active=false;
-        move_timer.stop();
-    }
-
     function camera_start(camera_value, step)
     {
         camera_timer.camera_value=camera_value;
@@ -416,16 +381,6 @@ NavigationAppHMIMenu {
         Genivi.mapviewer_SetMapViewRotation(dbusIf,dltIf,angle);
     }
 
-    function updateMapViewer()
-    {
-        var res=Genivi.mapviewer_GetMapViewPerspective(dbusIf,dltIf);
-        if (res[1] == Genivi.MAPVIEWER_2D) {
-            perspective.text=Genivi.gettext("CameraPerspective3d");
-        } else {
-            perspective.text=Genivi.gettext("CameraPerspective2d");
-        }
-    }
-
     function toggleDayNight()
     {
         var res=Genivi.mapviewer_GetMapViewTheme(dbusIf,dltIf);
@@ -448,16 +403,6 @@ NavigationAppHMIMenu {
         }
     }
 
-    function togglePerspective()
-    {
-        if (perspective.text == Genivi.gettext("CameraPerspective2d")) {
-            Genivi.mapviewer_SetMapViewPerspective(dbusIf,dltIf,Genivi.MAPVIEWER_2D);
-        } else {
-            Genivi.mapviewer_SetMapViewPerspective(dbusIf,dltIf,Genivi.MAPVIEWER_3D);
-        }
-        updateMapViewer();
-    }
-
     function showMapSettings()
     {
         mapSettings.visible=true;
@@ -486,8 +431,6 @@ NavigationAppHMIMenu {
         west.disabled=false;
         exitSettings.visible=true;
         exitSettings.disabled=false;
-        perspective.visible=true;
-        perspective.disabled=false;
         daynight.visible=true;
         daynight.disabled=false;
     }
@@ -520,8 +463,6 @@ NavigationAppHMIMenu {
         west.disabled=true;
         exitSettings.visible=false;
         exitSettings.disabled=true;
-        perspective.visible=false;
-        perspective.disabled=true;
         daynight.visible=false;
         daynight.disabled=true;
     }
@@ -691,6 +632,32 @@ NavigationAppHMIMenu {
 		}
 	}
 
+    function toggleExploration()
+    { //C->E
+        if (exploration.status==0) {
+            Genivi.mapviewer_SetFollowCarMode(dbusIf,dltIf, false);
+            showScroll();
+            showSettings();
+            exploration.setState("E");
+        } else {
+            if (exploration.status==1) {
+                Genivi.mapviewer_SetFollowCarMode(dbusIf,dltIf, true);
+                Genivi.mapviewer_SetMapViewScale(dbusIf,dltIf,Genivi.zoom_guidance);
+                if (Genivi.data['display_on_map']==='show_current_position') {
+                    Genivi.mapviewer_SetTargetPoint(dbusIf,dltIf,Genivi.data['current_position']['lat'],Genivi.data['current_position']['lon'],Genivi.data['current_position']['alt']);
+                } else {
+                    if (Genivi.data['display_on_map']==='show_position') {
+                        Genivi.mapviewer_SetTargetPoint(dbusIf,dltIf,Genivi.data['position']['lat'],Genivi.data['position']['lon'],Genivi.data['position']['alt']);
+                    }
+                }
+                hideScroll();
+                hideSettings();
+                hideMapSettings(); //in case of this panel has been launched by the user
+                exploration.setState("C");
+            }
+        }
+    }
+
 	function updateGuidance()
 	{
         var res=Genivi.guidance_GetManeuversList(dbusIf,dltIf,1,0);
@@ -860,6 +827,50 @@ NavigationAppHMIMenu {
         roadaftermaneuverValue.visible=false;
     }
 
+    function showScroll()
+    {
+        scrollup.visible=true;
+        scrollup.disabled=false;
+        scrollleft.visible=true;
+        scrollleft.disabled=false;
+        scrollright.visible=true;
+        scrollright.disabled=false;
+        scrolldown.visible=true;
+        scrolldown.disabled=false;
+        rotateClockwize.visible=true;
+        rotateClockwize.disabled=false;
+        rotateAntiClockwize.visible=true;
+        rotateAntiClockwize.disabled=false;
+    }
+
+    function hideScroll()
+    {
+        scrollup.visible=false;
+        scrollup.disabled=true;
+        scrollleft.visible=false;
+        scrollleft.disabled=true;
+        scrollright.visible=false;
+        scrollright.disabled=true;
+        scrolldown.visible=false;
+        scrolldown.disabled=true;
+        rotateClockwize.visible=false;
+        rotateClockwize.disabled=true;
+        rotateAntiClockwize.visible=false;
+        rotateAntiClockwize.disabled=true;
+    }
+
+    function showSettings()
+    {
+        settings.visible=true;
+        settings.disabled=false;
+    }
+
+    function hideSettings()
+    {
+        settings.visible=false;
+        settings.disabled=true;
+    }
+
     //------------------------------------------//
     // Menu elements
     //------------------------------------------//
@@ -968,15 +979,38 @@ NavigationAppHMIMenu {
                     id:calculate_curr;
                     onClicked: {
                         //todo something here
-                        Genivi.mapviewer_SetFollowCarMode(dbusIf,dltIf,true);
-                        Genivi.mapviewer_SetMapViewScale(dbusIf,dltIf,Genivi.zoom_guidance);
-
                     }
                     disabled:!(Genivi.route_calculated && !Genivi.guidance_activated);
                     visible:(Genivi.route_calculated && !Genivi.guidance_activated);
                     next:menub; prev:settings
                 }
 
+                StdButton {
+                    x:StyleSheetBottom.mapExploration[Constants.X]; y:StyleSheetBottom.mapExploration[Constants.Y]; width:StyleSheetBottom.mapExploration[Constants.WIDTH]; height:StyleSheetBottom.mapExploration[Constants.HEIGHT];
+                    id:exploration; next:zoomin; prev:menub;  disabled:false;
+                    source:StyleSheetBottom.gobackCurrent[Constants.SOURCE]; //todo call get status
+                    property int status: 0;
+                    function setState(name)
+                    { //the icon displayed is the one of the next state
+                        if (name=="E")
+                        {
+                            status=1;
+                            source=StyleSheetBottom.gobackCurrent[Constants.SOURCE];
+                        }
+                        else
+                        {
+                            if (name=="C")
+                            {
+                                status=0;
+                                source=StyleSheetBottom.mapExploration[Constants.SOURCE];
+                            }
+                        }
+                    }
+                    onClicked:
+                    {
+                        toggleExploration();
+                    }
+                }
             }
         }
 
@@ -1130,17 +1164,15 @@ NavigationAppHMIMenu {
                 }
 
                 StdButton {
-                    source:StyleSheetScroll.backtoCurrentLocation[Constants.SOURCE]; x:StyleSheetScroll.backtoCurrentLocation[Constants.X]; y:StyleSheetScroll.backtoCurrentLocation[Constants.Y]; width:StyleSheetScroll.backtoCurrentLocation[Constants.WIDTH]; height:StyleSheetScroll.backtoCurrentLocation[Constants.HEIGHT];
-                    id:backtoCurrentLocation;  next:scrollup; prev:scrollright;
-                    onClicked: {
-                        if (Genivi.data['display_on_map']==='show_current_position') {
-                            Genivi.mapviewer_SetTargetPoint(dbusIf,dltIf,Genivi.data['current_position']['lat'],Genivi.data['current_position']['lon'],Genivi.data['current_position']['alt']);
-                        } else {
-                            if (Genivi.data['display_on_map']==='show_position') {
-                                Genivi.mapviewer_SetTargetPoint(dbusIf,dltIf,Genivi.data['position']['lat'],Genivi.data['position']['lon'],Genivi.data['position']['alt']);
-                            }
-                        }
-                    }
+                    source:StyleSheetScroll.rotateClockwize[Constants.SOURCE]; x:StyleSheetScroll.rotateClockwize[Constants.X]; y:StyleSheetScroll.rotateClockwize[Constants.Y]; width:StyleSheetScroll.rotateClockwize[Constants.WIDTH]; height:StyleSheetScroll.rotateClockwize[Constants.HEIGHT];
+                    id:rotateClockwize;
+                    onClicked: {}
+                }
+
+                StdButton {
+                    source:StyleSheetScroll.rotateAntiClockwize[Constants.SOURCE]; x:StyleSheetScroll.rotateAntiClockwize[Constants.X]; y:StyleSheetScroll.rotateAntiClockwize[Constants.Y]; width:StyleSheetScroll.rotateAntiClockwize[Constants.WIDTH]; height:StyleSheetScroll.rotateAntiClockwize[Constants.HEIGHT];
+                    id:rotateAntiClockwize;
+                    onClicked: {}
                 }
 
             }
@@ -1199,7 +1231,7 @@ NavigationAppHMIMenu {
                     source:StyleSheetCompass.directionnorth[Constants.SOURCE]; //todo call get status
                     property int status: 0;
                     function setState(name)
-                    { //the state displayed is the current state
+                    { //the icon displayed is the one of the current state
                         if (name=="N")
                         {
                             status=0;
@@ -1464,7 +1496,7 @@ NavigationAppHMIMenu {
                  }
                  StdButton {
                      source:StyleSheetSettings.west[Constants.SOURCE]; x:StyleSheetSettings.west[StyleSheetSettings.X]; y:StyleSheetSettings.west[StyleSheetSettings.Y]; width:StyleSheetSettings.west[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.west[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.westText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.westText[StyleSheetSettings.PIXELSIZE];
-                            id:west; text:Genivi.gettext("West");  next:perspective; prev:east;
+                            id:west; text:Genivi.gettext("West");
                      onClicked: {
                          set_angle(270);
                      }
@@ -1473,19 +1505,13 @@ NavigationAppHMIMenu {
                      source:StyleSheetSettings.exit[Constants.SOURCE]; x:StyleSheetSettings.exit[StyleSheetSettings.X]; y:StyleSheetSettings.exit[StyleSheetSettings.Y]; width:StyleSheetSettings.exit[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.exit[StyleSheetSettings.HEIGHT];
                             id:exitSettings;  next:north; prev:west;
                      onClicked: {
-                         move_stop();
                          camera_stop();
                          hideMapSettings();
                      }
                  }
                  StdButton {
-                     source:StyleSheetSettings.perspective[Constants.SOURCE]; x:StyleSheetSettings.perspective[StyleSheetSettings.X]; y:StyleSheetSettings.perspective[StyleSheetSettings.Y]; width:StyleSheetSettings.perspective[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.perspective[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.perspectiveText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.perspectiveText[StyleSheetSettings.PIXELSIZE];
-                            id:perspective; text:Genivi.gettext("CameraPerspective3d");  next:daynight; prev:perspective;
-                         onClicked: {togglePerspective();}
-                 }
-                 StdButton {
                      source:StyleSheetSettings.daynight[Constants.SOURCE]; x:StyleSheetSettings.daynight[StyleSheetSettings.X]; y:StyleSheetSettings.daynight[StyleSheetSettings.Y]; width:StyleSheetSettings.daynight[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.daynight[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.daynightText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.daynightText[StyleSheetSettings.PIXELSIZE];
-                            id:daynight; text:Genivi.gettext("Day");  next:tiltp; prev:perspective;
+                            id:daynight; text:Genivi.gettext("Day");
                      onClicked: {
                          toggleDayNight();
                      }
@@ -1602,6 +1628,10 @@ NavigationAppHMIMenu {
                 }
             }
         }
+
+        hideScroll();
+        hideSettings();
+        exploration.setState("C");
         showZoom();
         updateDayNight();
 	}
diff --git a/src/hmi/qml/NavigationAppPOI.qml b/src/hmi/qml/NavigationAppPOI.qml
index 58f50c6..e05ec99 100644
--- a/src/hmi/qml/NavigationAppPOI.qml
+++ b/src/hmi/qml/NavigationAppPOI.qml
@@ -144,10 +144,13 @@ NavigationAppHMIMenu {
         var attributeList=[];
         attributeList[0]=0;
         var res=Genivi.poisearch_RequestResultList(dbusIf,dltIf,Genivi.offset,Genivi.maxResultListSize,attributeList);
+        searchResultNumber.visible=true;
+        if(res[3]<Genivi.maxResultListSize)
+            searchResultNumber.text=res[3];
+        model.clear();
         if(res[3]===0)
         {
             //no match
-            //to do something to inform the user
             return
         }
 
@@ -169,7 +172,6 @@ NavigationAppHMIMenu {
             Genivi.poi_data[id].lat=poi_details[1][5][1];
             Genivi.poi_data[id].lon=poi_details[1][5][3];
         }
-        model.clear();
         for (i = 0 ; i < ids.length ; i+=1) {
             id=ids[i];
             var poi_data=Genivi.poi_data[id];
@@ -177,6 +179,33 @@ NavigationAppHMIMenu {
                 model.append({"name":poi_data.name,"number":id});
             }
         }
+        if(res[3]===1)
+            selectPoi(0);
+    }
+
+    function selectPoi(index)
+    {
+        Genivi.poi_id=index;
+        var poi_data=Genivi.poi_data[index];
+        poiName.text=poi_data.name;
+        poiName.visible=true;
+        selectedValue.text="Lat: "+poi_data.lat.toFixed(4)+"\nLon: "+poi_data.lon.toFixed(4)+"\nDist: "+poi_data.distance+" m";
+        searchResultNumber.visible=false;
+        selectedValueTitle.visible=true;
+        select_reroute.disabled=false;
+        select_display_on_map.disabled=false;
+    }
+
+    function clearSearch()
+    {
+        Genivi.poi_data=[];
+        poiName.text="";
+        poiName.visible=false;
+        selectedValue.text="Lat:\nLon:\nDist:\n";
+        searchResultNumber.visible=false;
+        selectedValueTitle.visible=false;
+        select_reroute.disabled=true;
+        select_display_on_map.disabled=true;
     }
 
     //------------------------------------------//
@@ -214,6 +243,7 @@ NavigationAppHMIMenu {
                 selectedValue.text="Lat:\nLon:\nDist:\n";
                 poiName.visible=false;
                 selectedValueTitle.visible=false;
+                searchResultNumber.visible=false;
                 categoryValue.text=poiCategoryName;
                 poiFrame.visible=false;
                 categoryFrame.visible=true;
@@ -284,9 +314,17 @@ NavigationAppHMIMenu {
             style: Text.Sunken;
             smooth: true
             clip: true
-			text: " "
+            text: "Lat:\nLon:\nDist:\n"
+        }
+        Text {
+            x:StyleSheet.searchResultNumber[Constants.X]; y:StyleSheet.searchResultNumber[Constants.Y]; width:StyleSheet.searchResultNumber[Constants.WIDTH]; height:StyleSheet.searchResultNumber[Constants.HEIGHT];color:StyleSheet.searchResultNumber[Constants.TEXTCOLOR];styleColor:StyleSheet.searchResultNumber[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.searchResultNumber[Constants.PIXELSIZE];
+            id:searchResultNumber
+            style: Text.Sunken;
+            smooth: true
+            clip: true
+            text: ""
         }
-		Component {
+        Component {
             id: searchResultList
             Text {
                 width:StyleSheet.searchResultValue[Constants.WIDTH]; height:StyleSheet.searchResultValue[Constants.HEIGHT];color:StyleSheet.searchResultValue[Constants.TEXTCOLOR];styleColor:StyleSheet.searchResultValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.searchResultValue[Constants.PIXELSIZE];
@@ -308,18 +346,12 @@ NavigationAppHMIMenu {
                 if(keyboardArea.destination===poiValue)
                 {
                     if (what) {
-                        Genivi.poi_id=what.index;
-                        var poi_data=Genivi.poi_data[what.index];
-                        poiName.text=poi_data.name;
-                        poiName.visible=true;
-                        selectedValue.text="Lat: "+poi_data.lat.toFixed(4)+"\nLon: "+poi_data.lon.toFixed(4)+"\nDist: "+poi_data.distance+" m";
-                        selectedValueTitle.visible=true;
-                        select_reroute.disabled=false;
-                        select_display_on_map.disabled=false;
+                        selectPoi(what.index);
                     } else {
                         Genivi.poi_id=null;
                         poiName.visible=false;
-                        selectedValue.text="";
+                        selectedValue.text="Lat:\nLon:\nDist:\n";
+                        searchResultNumber.visible=false;
                         selectedValueTitle.visible=false;
                         select_reroute.disabled=true;
                         select_display_on_map.disabled=true;
@@ -353,7 +385,10 @@ NavigationAppHMIMenu {
             secondLayout: Genivi.kbdSecondLayout;
             next: select_search;
             prev: poiKeyboard;
-            onKeypress: { }
+            onKeypress: {
+                clearSearch();
+                searchPois();
+            }
         }
 
         StdButton {
@@ -361,6 +396,7 @@ NavigationAppHMIMenu {
             id:select_search
             disabled:!(vehicleLocated || Genivi.showroom );
             onClicked: {
+                clearSearch();
                 searchPois();
 			}
 		}
@@ -433,26 +469,28 @@ NavigationAppHMIMenu {
                 }
              }
             selectedValue.text="Lat: "+poi_data.lat.toFixed(4)+"\nLon: "+poi_data.lon.toFixed(4)+"\nDist: "+poi_data.distance+" m";
+            searchResultNumber.visible=false;
             selectedValueTitle.visible=true;
             select_reroute.disabled=false;
             select_display_on_map.disabled=false;
         }else{
-            Genivi.poi_data=[];
-            selectedValue.text="Lat:\nLon:\nDist:\n";
+            clearSearch();
             for (var j = 0 ; j < Genivi.categoriesIdNameList.length ; j+=2) {
-                if (Genivi.categoriesIdNameList[j+1][3] === Genivi.g_default_category_name) {
+                if (Genivi.categoriesIdNameList[j+1][3] === Genivi.default_category_name) {
                     Genivi.category_id=Genivi.categoriesIdNameList[j+1][1];
                     poiCategoryName=Genivi.categoriesIdNameList[j+1][3];
                 }
              }
         }
 
-
         categoryValue.text=poiCategoryName;
         keyboardArea.destination=poiValue; // by default
         keyboardArea.setactivekeys(Genivi.allKeys,true);
         poiFrame.visible=true;
 
+        //launch a search on the default category
+        searchPois();
+
         if(!Genivi.showroom) {
             updateCurrentPosition();
         }
diff --git a/src/update_hmi.sh b/src/update_hmi.sh
new file mode 100755
index 0000000..ce133a8
--- /dev/null
+++ b/src/update_hmi.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./hmi/style_sheet_generator.sh -i ./hmi/gimp/gdp-theme/800x480 -o hmi -v -nl