diff options
author | Martin Schaller <martin.schaller@it-schaller.de> | 2014-05-04 11:58:23 -0700 |
---|---|---|
committer | Martin Schaller <martin.schaller@it-schaller.de> | 2014-05-04 11:58:23 -0700 |
commit | 93e7e464b6ef4ac19db3796dc89bb5726cfba782 (patch) | |
tree | bf9bcba6c4f1fa63d27de74031dd2cf4babb082b | |
parent | aad2583ef5a374185857680d7b0479f5b8039223 (diff) | |
download | poi-service-93e7e464b6ef4ac19db3796dc89bb5726cfba782.tar.gz |
Forward sortOption to cam
-rw-r--r-- | src/poi-service/poi-server/main.cpp | 6 | ||||
-rw-r--r-- | src/poi-service/poi-server/poi-server-class.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/poi-service/poi-server/main.cpp b/src/poi-service/poi-server/main.cpp index a580b9e..0d6fce0 100644 --- a/src/poi-service/poi-server/main.cpp +++ b/src/poi-service/poi-server/main.cpp @@ -613,10 +613,9 @@ DBus_searchResultDetails::DBus_searchResultDetails_t poiContentAccessServer::Get return(m_poiDetailsTable.at(index)); } -uint16_t poiContentAccessServer::searchAroundALocation(DBus_geoCoordinate3D::geoCoordinate3D_t location,const std::string* inputString) +uint16_t poiContentAccessServer::searchAroundALocation(DBus_geoCoordinate3D::geoCoordinate3D_t location,const std::string* inputString, uint16_t sortOption) { uint16_t maxSize; - uint16_t sortOption; DBus_geoCoordinate3D loc; std::vector< std::string > attributes; uint16_t statusValue; @@ -633,7 +632,6 @@ uint16_t poiContentAccessServer::searchAroundALocation(DBus_geoCoordinate3D::geo //prepare the data for the Poi Search on the CAM maxSize = 255; //by default, to be discussed why it's needed to define it ? - sortOption = 0; //by default loc.set(location); mp_contentAccessModule->PoiSearchStarted(m_poiSearchHandle,maxSize,loc.getDBus(),m_poiCategories,m_poiAttributes,*inputString,sortOption); @@ -1262,7 +1260,7 @@ void poiSearchServer::StartPoiSearch(const uint8_t& poiSearchHandle, const std:: // search on the embedded database first m_totalSize = searchAroundALocation(m_centerLocation,&inputString); //search around the current location of the vehicle //and now search on the additional database if the cam has been registered before the creation of the poi search handle - m_totalSize += mp_poiContentAccess->searchAroundALocation(m_centerLocation,&inputString); + m_totalSize += mp_poiContentAccess->searchAroundALocation(m_centerLocation,&inputString,sortOption); m_searchStatus = GENIVI_POISERVICE_FINISHED; PoiStatus(poiSearchHandle,(uint16_t)m_searchStatus); ResultListChanged(poiSearchHandle,m_totalSize); diff --git a/src/poi-service/poi-server/poi-server-class.h b/src/poi-service/poi-server/poi-server-class.h index 0b4fa60..de5b884 100644 --- a/src/poi-service/poi-server/poi-server-class.h +++ b/src/poi-service/poi-server/poi-server-class.h @@ -186,7 +186,7 @@ public: void SetLanguage(std::string LanguageCode, std::string CountryCode); - uint16_t searchAroundALocation(DBus_geoCoordinate3D::geoCoordinate3D_t location,const std::string* inputString); + uint16_t searchAroundALocation(DBus_geoCoordinate3D::geoCoordinate3D_t location,const std::string* inputString, uint16_t sortOption); void SetPoiSearchHandle(uint8_t poiSearchHandle); |