Fix some wrong enumeration types

10 files changed, 52 insertions, 45 deletions

diff --git a/api/franca/navigation/poiservice/ContentAccessModule.fidl b/api/franca/navigation/poiservice/ContentAccessModule.fidl
index bd53b67..2e71653 100644
--- a/api/franca/navigation/poiservice/ContentAccessModule.fidl
+++ b/api/franca/navigation/poiservice/ContentAccessModule.fidl
@@ -157,7 +157,7 @@ interface POIContentAccessModule {
 			String inputString				

 			<** @description : enum(SORT_DEFAULT,SORT_BY_DISTANCE,SORT_BY_TIME,ATTRIBUTE_CUSTOM, ... )

             If more than one category was defined for this search, the sort criteria should be compliant with all categories.**>

-			UInt16 sortOption				

+			SortOption sortOption				

 		}	

 	}

 

diff --git a/api/franca/navigation/poiservice/POIServiceTypes.fidl b/api/franca/navigation/poiservice/POIServiceTypes.fidl
index fbafed0..b5769ea 100644
--- a/api/franca/navigation/poiservice/POIServiceTypes.fidl
+++ b/api/franca/navigation/poiservice/POIServiceTypes.fidl
@@ -96,6 +96,13 @@ typeCollection POIServiceTypes {
         ATTR_REMOVED  	= 1796

     }

 

+    <** @description: Reason of update**>

+    enumeration RouteStatus { //Base 0x0600

+        OFF_ROUTE		= 1536

+        ON_ROUTE		= 1537

+        INSIDE_CORRIDOR	= 1538

+    }

+

     <** @description: Configuration changed**>

     enumeration ConfigurationChangedReason {

         LOCALES

@@ -246,7 +253,7 @@ typeCollection POIServiceTypes {
 		<** @description:distance in meters to poi from center of the search or from vehicle if search along**>			

         UInt32 distance

 		<** @description:enum(OFF_ROUTE,ON_ROUTE,INSIDE_CORRIDOR, ... )**>			

-        UInt16 routeStatus

+        RouteStatus routeStatus

 		<** @description:List of attributes requested. It could be empty**>			

         PoiAttribute[] attributeList

     }

@@ -343,7 +350,7 @@ typeCollection POIServiceTypes {
  		<**	@description : Category unique id.**>

         CategoryID unique_id

         <** @description : enum(ADDED,REMOVED,ATTR_ADDED,ATTR_MODIFIED,ATTR_REMOVED, ... ) .**>

-    	UInt16 reason

+    	UpdateReason reason

 	}

 	<** @description: pair of category and the this category is available**>			

 	struct CategoryAndStatus

diff --git a/api/poi-service/genivi-poiservice-contentaccessmodule.xml b/api/poi-service/genivi-poiservice-contentaccessmodule.xml
index 16eac50..b000da4 100644
--- a/api/poi-service/genivi-poiservice-contentaccessmodule.xml
+++ b/api/poi-service/genivi-poiservice-contentaccessmodule.xml
@@ -257,7 +257,7 @@
           <line>inputString = contains the name of the poi that is searched. It could be a partial name or an empty string.</line>
         </doc>
       </arg>
-      <arg name="sortOption" type="q" direction="in">
+      <arg name="sortOption" type="i" direction="in">
         <doc>
           <line>sortOption = enum(SORT_DEFAULT,SORT_BY_DISTANCE,SORT_BY_TIME,ATTRIBUTE_CUSTOM, ... )</line>
           <line>If more than one category was defined for this search, the sort criteria should be compliant with all categories.</line>
@@ -294,7 +294,7 @@
           <line>attributeList = List of attributes id to retrieve. This is optional and the list could be empty.</line>
         </doc>
       </arg>
-      <arg name="statusValue" type="q" direction="out">
+      <arg name="statusValue" type="i" direction="out">
         <doc>
           <line>statusValue = enum(INVALID,NOT_STARTED,SEARCHING,FINISHED, ... )</line>
         </doc>
diff --git a/src/poi-service/poi-manager-server/poi-manager-server-stub.cpp b/src/poi-service/poi-manager-server/poi-manager-server-stub.cpp
index fcd00b2..a81d690 100644
--- a/src/poi-service/poi-manager-server/poi-manager-server-stub.cpp
+++ b/src/poi-service/poi-manager-server/poi-manager-server-stub.cpp
@@ -48,7 +48,7 @@ void sqlRequest::onError()
 
 }
 
-vector<poi_category_common_t> sqlRequest::getAvailableCategories(POIServiceTypes::CategoryID &rootCategory)
+vector<poi_category_common_t> sqlRequest::getAvailableCategories(CommonTypes::CategoryID &rootCategory)
 {
     std::string sqlQuery; //SQL request on database
     std::ostringstream  strStream; //temporary stream used for transformation into string
@@ -213,7 +213,7 @@ void sqlRequest::getAvailableArea()
     }
 }
 
-sqlRequest::SQL_REQUEST_ERRORS sqlRequest::createCategory(POIServiceTypes::CAMCategory category, POIServiceTypes::CategoryID& unique_id)
+sqlRequest::SQL_REQUEST_ERRORS sqlRequest::createCategory(POIServiceTypes::CAMCategory category, CommonTypes::CategoryID& unique_id)
 {
     sqlRequest::SQL_REQUEST_ERRORS ret;
     size_t index;
@@ -459,7 +459,7 @@ sqlRequest::SQL_REQUEST_ERRORS sqlRequest::checkIfCategoryNameDoesntExist(std::s
     return ret;
 }
 
-sqlRequest::SQL_REQUEST_ERRORS sqlRequest::checkIfCategoryExist(POIServiceTypes::CategoryID unique_id)
+sqlRequest::SQL_REQUEST_ERRORS sqlRequest::checkIfCategoryExist(CommonTypes::CategoryID unique_id)
 {
     std::string sqlQuery; //SQL request on database
     vector<vector<string> > query_result;
@@ -529,7 +529,7 @@ sqlRequest::SQL_REQUEST_ERRORS sqlRequest::checkIfPoiExist(POIServiceTypes::POI_
     return ret;
 }
 
-sqlRequest::SQL_REQUEST_ERRORS sqlRequest::removeCategory(POIServiceTypes::CategoryID unique_id)
+sqlRequest::SQL_REQUEST_ERRORS sqlRequest::removeCategory(CommonTypes::CategoryID unique_id)
 {
     sqlRequest::SQL_REQUEST_ERRORS ret;
     std::string sqlQuery; //SQL request on database
@@ -682,7 +682,7 @@ sqlRequest::SQL_REQUEST_ERRORS sqlRequest::getFreePoiId(POIServiceTypes::POI_ID
     return ret;
 }
 
-sqlRequest::SQL_REQUEST_ERRORS sqlRequest::getFreeCategoryId(POIServiceTypes::CategoryID& unique_id)
+sqlRequest::SQL_REQUEST_ERRORS sqlRequest::getFreeCategoryId(CommonTypes::CategoryID& unique_id)
 {
     sqlRequest::SQL_REQUEST_ERRORS ret;
     vector<vector<string> > query_result;
@@ -838,7 +838,7 @@ sqlRequest::SQL_REQUEST_ERRORS sqlRequest::checkIfAttributeExist(POIServiceTypes
     return ret;
 }
 
-sqlRequest::SQL_REQUEST_ERRORS sqlRequest::createPoi(POIServiceTypes::CategoryID categoryId, POIServiceTypes::PoiAddedDetails poi, POIServiceTypes::POI_ID &unique_id)
+sqlRequest::SQL_REQUEST_ERRORS sqlRequest::createPoi(CommonTypes::CategoryID categoryId, POIServiceTypes::PoiAddedDetails poi, POIServiceTypes::POI_ID &unique_id)
 {
     sqlRequest::SQL_REQUEST_ERRORS ret;
     std::string sqlQuery; //SQL request on database
@@ -1292,7 +1292,7 @@ void PoiManagerServerStub::getRootCategory(const std::shared_ptr<CommonAPI::Clie
     _reply(m_rootCategory);
 }
 
-void PoiManagerServerStub::getParentCategories(const std::shared_ptr<CommonAPI::ClientId> _client, POIServiceTypes::CategoryID _category, getParentCategoriesReply_t _reply)
+void PoiManagerServerStub::getParentCategories(const std::shared_ptr<CommonAPI::ClientId> _client, CommonTypes::CategoryID _category, getParentCategoriesReply_t _reply)
 {
     uint16_t index;
     POIServiceTypes::CategoryAndLevel categoryAndLevel;
@@ -1308,7 +1308,7 @@ void PoiManagerServerStub::getParentCategories(const std::shared_ptr<CommonAPI::
     _reply(categories);
 }
 
-void PoiManagerServerStub::getChildrenCategories(const std::shared_ptr<CommonAPI::ClientId> _client, POIServiceTypes::CategoryID _category, getChildrenCategoriesReply_t _reply)
+void PoiManagerServerStub::getChildrenCategories(const std::shared_ptr<CommonAPI::ClientId> _client, CommonTypes::CategoryID _category, getChildrenCategoriesReply_t _reply)
 {
     uint16_t index;
     POIServiceTypes::CategoryAndLevel categoryAndLevel;
@@ -1326,7 +1326,7 @@ void PoiManagerServerStub::getChildrenCategories(const std::shared_ptr<CommonAPI
 
 void PoiManagerServerStub::createCategory(const std::shared_ptr<CommonAPI::ClientId> _client, POIServiceTypes::CAMCategory _category, createCategoryReply_t _reply)
 {
-    POIServiceTypes::CategoryID unique_id;
+    CommonTypes::CategoryID unique_id;
 
     mp_sqlRequest->createCategory(_category,unique_id);
     refreshCategoryList();
@@ -1334,7 +1334,7 @@ void PoiManagerServerStub::createCategory(const std::shared_ptr<CommonAPI::Clien
     _reply(unique_id);
 }
 
-void PoiManagerServerStub::removeCategories(const std::shared_ptr<CommonAPI::ClientId> _client, std::vector< POIServiceTypes::CategoryID> _categories, removeCategoriesReply_t _reply)
+void PoiManagerServerStub::removeCategories(const std::shared_ptr<CommonAPI::ClientId> _client, std::vector< CommonTypes::CategoryID> _categories, removeCategoriesReply_t _reply)
 {
     size_t index;
 
@@ -1354,7 +1354,7 @@ void PoiManagerServerStub::removeCategories(const std::shared_ptr<CommonAPI::Cli
     }
 }
 
-void PoiManagerServerStub::addPOIs(const std::shared_ptr<CommonAPI::ClientId> _client, POIServiceTypes::CategoryID _unique_id, std::vector< POIServiceTypes::PoiAddedDetails> _poiList, addPOIsReply_t _reply)
+void PoiManagerServerStub::addPOIs(const std::shared_ptr<CommonAPI::ClientId> _client, CommonTypes::CategoryID _unique_id, std::vector< POIServiceTypes::PoiAddedDetails> _poiList, addPOIsReply_t _reply)
 {
     size_t index;
     std::vector<POIServiceTypes::POI_ID> addedPoiList;
diff --git a/src/poi-service/poi-manager-server/poi-manager-server-stub.h b/src/poi-service/poi-manager-server/poi-manager-server-stub.h
index 18e583a..e9758c3 100644
--- a/src/poi-service/poi-manager-server/poi-manager-server-stub.h
+++ b/src/poi-service/poi-manager-server/poi-manager-server-stub.h
@@ -84,10 +84,10 @@ public:
     sqlRequest();
     ~sqlRequest();
     SQL_REQUEST_ERRORS setDatabase(const char* poiDatabaseFileName);
-    vector<poi_category_common_t> getAvailableCategories(POIServiceTypes::CategoryID& rootCategory);
-    SQL_REQUEST_ERRORS createCategory(POIServiceTypes::CAMCategory category,POIServiceTypes::CategoryID& unique_id);
-    SQL_REQUEST_ERRORS removeCategory(POIServiceTypes::CategoryID unique_id);
-    SQL_REQUEST_ERRORS createPoi(POIServiceTypes::CategoryID categoryId, POIServiceTypes::PoiAddedDetails poi, POIServiceTypes::POI_ID& unique_id);
+    vector<poi_category_common_t> getAvailableCategories(CommonTypes::CategoryID& rootCategory);
+    SQL_REQUEST_ERRORS createCategory(POIServiceTypes::CAMCategory category,CommonTypes::CategoryID& unique_id);
+    SQL_REQUEST_ERRORS removeCategory(CommonTypes::CategoryID unique_id);
+    SQL_REQUEST_ERRORS createPoi(CommonTypes::CategoryID categoryId, POIServiceTypes::PoiAddedDetails poi, POIServiceTypes::POI_ID& unique_id);
     SQL_REQUEST_ERRORS removePoi(POIServiceTypes::POI_ID unique_id);
     SQL_REQUEST_ERRORS searchPoi(const string &categoryName, const string &search_string, NavigationTypes::Coordinate3D &left_bottom_location, NavigationTypes::Coordinate3D &right_top_location, std::vector<POIServiceTypes::POI_ID> &poi_id_list);
 
@@ -164,7 +164,7 @@ private:
 
     SQL_REQUEST_ERRORS checkIfCategoryNameDoesntExist(std::string name);
 
-    SQL_REQUEST_ERRORS checkIfCategoryExist(POIServiceTypes::CategoryID unique_id);
+    SQL_REQUEST_ERRORS checkIfCategoryExist(CommonTypes::CategoryID unique_id);
 
     SQL_REQUEST_ERRORS checkIfAttributeExist(POIServiceTypes::AttributeID unique_id, string name);
 
@@ -172,7 +172,7 @@ private:
 
     SQL_REQUEST_ERRORS getFreePoiId(POIServiceTypes::POI_ID &unique_id);
 
-    SQL_REQUEST_ERRORS getFreeCategoryId(POIServiceTypes::CategoryID &unique_id);
+    SQL_REQUEST_ERRORS getFreeCategoryId(CommonTypes::CategoryID &unique_id);
 
     SQL_REQUEST_ERRORS getFreeAttributeId(POIServiceTypes::AttributeID &unique_id);
 
@@ -197,11 +197,11 @@ public:
     void getSupportedLocales(const std::shared_ptr<CommonAPI::ClientId> _client, getSupportedLocalesReply_t _reply);
     void getAvailableCategories(const std::shared_ptr<CommonAPI::ClientId> _client, getAvailableCategoriesReply_t _reply);
     void getRootCategory(const std::shared_ptr<CommonAPI::ClientId> _client, getRootCategoryReply_t _reply);
-    void getChildrenCategories(const std::shared_ptr<CommonAPI::ClientId> _client, POIServiceTypes::CategoryID _category, getChildrenCategoriesReply_t _reply);
-    void getParentCategories(const std::shared_ptr<CommonAPI::ClientId> _client, POIServiceTypes::CategoryID _category, getParentCategoriesReply_t _reply);
+    void getChildrenCategories(const std::shared_ptr<CommonAPI::ClientId> _client, CommonTypes::CategoryID _category, getChildrenCategoriesReply_t _reply);
+    void getParentCategories(const std::shared_ptr<CommonAPI::ClientId> _client, CommonTypes::CategoryID _category, getParentCategoriesReply_t _reply);
     void createCategory(const std::shared_ptr<CommonAPI::ClientId> _client, POIServiceTypes::CAMCategory _category, createCategoryReply_t _reply);
-    void removeCategories(const std::shared_ptr<CommonAPI::ClientId> _client, std::vector< POIServiceTypes::CategoryID> _categories, removeCategoriesReply_t _reply);
-    void addPOIs(const std::shared_ptr<CommonAPI::ClientId> _client, POIServiceTypes::CategoryID _unique_id, std::vector< POIServiceTypes::PoiAddedDetails> _poiList, addPOIsReply_t _reply);
+    void removeCategories(const std::shared_ptr<CommonAPI::ClientId> _client, std::vector< CommonTypes::CategoryID> _categories, removeCategoriesReply_t _reply);
+    void addPOIs(const std::shared_ptr<CommonAPI::ClientId> _client, CommonTypes::CategoryID _unique_id, std::vector< POIServiceTypes::PoiAddedDetails> _poiList, addPOIsReply_t _reply);
     void removePOIs(const std::shared_ptr<CommonAPI::ClientId> _client, std::vector< POIServiceTypes::POI_ID> _ids, removePOIsReply_t _reply);
     void poiSearchStarted(const std::shared_ptr<CommonAPI::ClientId> _client, ::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, uint16_t _maxSize, ::org::genivi::navigation::NavigationTypes::Coordinate3D _location, std::vector< ::v0_1::org::genivi::navigation::poiservice::POIServiceTypes::CategoryAndRadius> _poiCategories, std::vector< ::v0_1::org::genivi::navigation::poiservice::POIServiceTypes::AttributeDetails> _poiAttributes, std::string _inputString, uint16_t _sortOption, poiSearchStartedReply_t _reply);
     void poiSearchCanceled(const std::shared_ptr<CommonAPI::ClientId> _client, ::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, poiSearchCanceledReply_t _reply);
@@ -219,7 +219,7 @@ private:
 
     uint16_t m_availableCategories;
     vector<poi_category_common_t> m_availableCategoryTable;
-    POIServiceTypes::CategoryID m_rootCategory;
+    CommonTypes::CategoryID m_rootCategory;
     NavigationTypes::Coordinate3D m_centerLocation;
 
     NavigationTypes::Handle m_search_handle;
diff --git a/src/poi-service/poi-server/main.cpp b/src/poi-service/poi-server/main.cpp
index fffae27..0b6725a 100644
--- a/src/poi-service/poi-server/main.cpp
+++ b/src/poi-service/poi-server/main.cpp
@@ -586,12 +586,12 @@ 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 sortOption)
+uint16_t poiContentAccessServer::searchAroundALocation(DBus_geoCoordinate3D::geoCoordinate3D_t location,const std::string* inputString, int32_t sortOption)
 {
     uint16_t maxSize;
     DBus_geoCoordinate3D loc;
     std::vector< attributeId_t > attributes;
-    uint16_t statusValue;
+    int32_t statusValue;
     uint16_t resultListSize;
     std::vector<poiId_t> poiList;
     uint16_t index;
diff --git a/src/poi-service/poi-server/poi-server-class.h b/src/poi-service/poi-server/poi-server-class.h
index 4e0146e..b954f14 100644
--- a/src/poi-service/poi-server/poi-server-class.h
+++ b/src/poi-service/poi-server/poi-server-class.h
@@ -162,7 +162,7 @@ public:
 
     void SetLocale(std::string languageCode, std::string countryCode, std::string scriptCode);
 
-    uint16_t searchAroundALocation(DBus_geoCoordinate3D::geoCoordinate3D_t location,const std::string* inputString, uint16_t sortOption);
+    uint16_t searchAroundALocation(DBus_geoCoordinate3D::geoCoordinate3D_t location, const std::string* inputString, int32_t sortOption);
 
     void SetPoiSearchHandle(handleId_t poiSearchHandle);
 
diff --git a/test/poi-service/poi-contentaccess-module/main.cpp b/test/poi-service/poi-contentaccess-module/main.cpp
index 940bd8c..356f1fa 100644
--- a/test/poi-service/poi-contentaccess-module/main.cpp
+++ b/test/poi-service/poi-contentaccess-module/main.cpp
@@ -334,7 +334,7 @@ void contentAccessModuleServer::removePOIs(const std::vector< poiId_t >& ids)
 
 }
 
-void contentAccessModuleServer::PoiSearchStarted(const handleId_t& poiSearchHandle, const uint16_t& maxSize, const DBus_geoCoordinate3D::DBus_geoCoordinate3D_t& location, const std::vector< DBus_categoryRadius::DBus_categoryRadius_t >& poiCategories, const std::vector< DBus_attributeDetails::DBus_attributeDetails_t >& poiAttributes, const std::string& inputString, const uint16_t& sortOption)
+void contentAccessModuleServer::PoiSearchStarted(const handleId_t& poiSearchHandle, const uint16_t& maxSize, const DBus_geoCoordinate3D::DBus_geoCoordinate3D_t& location, const std::vector< DBus_categoryRadius::DBus_categoryRadius_t >& poiCategories, const std::vector< DBus_attributeDetails::DBus_attributeDetails_t >& poiAttributes, const std::string& inputString, const int32_t& sortOption)
     {
         uint16_t index,sub_index;
         categoryId_t category_index;
@@ -437,7 +437,7 @@ void contentAccessModuleServer::PoiSearchCanceled(const handleId_t& poiSearchHan
         }
     }
 
-void contentAccessModuleServer::ResultListRequested(const camId_t& camId, const handleId_t& poiSearchHandle, const std::vector< attributeId_t >& attributes, uint16_t& statusValue, uint16_t& resultListSize, std::vector< DBus_poiCAMDetails::DBus_poiCAMDetails_t >& resultList)
+void contentAccessModuleServer::ResultListRequested(const camId_t& camId, const handleId_t& poiSearchHandle, const std::vector< attributeId_t >& attributes, int32_t &statusValue, uint16_t& resultListSize, std::vector< DBus_poiCAMDetails::DBus_poiCAMDetails_t >& resultList)
     {
 
         //this method is supposed to check the camId, but into the POC, it's the HMI that declares the CAM (for the moment)
diff --git a/test/poi-service/poi-contentaccess-module/poi-contentaccess-module-class.h b/test/poi-service/poi-contentaccess-module/poi-contentaccess-module-class.h
index 5b0bdcc..2b7d07f 100644
--- a/test/poi-service/poi-contentaccess-module/poi-contentaccess-module-class.h
+++ b/test/poi-service/poi-contentaccess-module/poi-contentaccess-module-class.h
@@ -114,11 +114,11 @@ public:
 
     void removePOIs(const std::vector< poiId_t >& ids);
 
-    void PoiSearchStarted(const handleId_t& poiSearchHandle, const uint16_t& maxSize, const DBus_geoCoordinate3D::DBus_geoCoordinate3D_t& location, const std::vector< DBus_categoryRadius::DBus_categoryRadius_t >& poiCategories, const std::vector< DBus_attributeDetails::DBus_attributeDetails_t >& poiAttributes, const std::string& inputString, const uint16_t& sortOption);
+    void PoiSearchStarted(const handleId_t& poiSearchHandle, const uint16_t& maxSize, const DBus_geoCoordinate3D::DBus_geoCoordinate3D_t& location, const std::vector< DBus_categoryRadius::DBus_categoryRadius_t >& poiCategories, const std::vector< DBus_attributeDetails::DBus_attributeDetails_t >& poiAttributes, const std::string& inputString, const int32_t& sortOption);
 
     void PoiSearchCanceled(const handleId_t& poiSearchHandle);
 
-    void ResultListRequested(const camId_t& camId, const handleId_t& poiSearchHandle, const std::vector< attributeId_t >& attributes, uint16_t& statusValue, uint16_t& resultListSize, std::vector< DBus_poiCAMDetails::DBus_poiCAMDetails_t >& resultList);
+    void ResultListRequested(const camId_t& camId, const handleId_t& poiSearchHandle, const std::vector< attributeId_t >& attributes, int32_t& statusValue, uint16_t& resultListSize, std::vector< DBus_poiCAMDetails::DBus_poiCAMDetails_t >& resultList);
 
     std::vector< DBus_searchResultDetails::DBus_searchResultDetails_t > PoiDetailsRequested(const std::vector< poiId_t >& source_id);
 
diff --git a/test/poi-service/poi-manager-client/main.cpp b/test/poi-service/poi-manager-client/main.cpp
index 2a0eb3b..5db73db 100644
--- a/test/poi-service/poi-manager-client/main.cpp
+++ b/test/poi-service/poi-manager-client/main.cpp
@@ -64,7 +64,7 @@ public:
 
     void ConfigurationChanged(const std::vector< uint16_t >& changedSettings);
 
-    void CategoriesRemoved(const std::vector< POIServiceTypes::CategoryID >& categories);
+    void CategoriesRemoved(const std::vector< CommonTypes::CategoryID >& categories);
 
     void POIAdded(const std::vector< POIServiceTypes::POI_ID >& pois);
 
@@ -84,7 +84,7 @@ public:
 
     void testSearch();
 
-    void createCategory(const POIServiceTypes::CategoryID& category);
+    void createCategory(const CommonTypes::CategoryID& category);
 
     void dumpCategories();
 
@@ -95,8 +95,8 @@ private:
     GtkWidget *mp_popupWindow;
     std::shared_ptr<POIContentAccessModuleProxyDefault> mp_proxy;
     POIServiceTypes::CAMCategory m_category;
-    POIServiceTypes::CategoryID m_category_id;
-    std::vector<POIServiceTypes::CategoryID> m_category_ids;
+    CommonTypes::CategoryID m_category_id;
+    std::vector<CommonTypes::CategoryID> m_category_ids;
     std::vector<POIServiceTypes::POI_ID> m_poi_ids;
     POIServiceTypes::PoiAddedDetails m_poi;
     NavigationTypes::Locale m_locales;
@@ -110,7 +110,7 @@ contentManager::contentManager(std::shared_ptr<POIContentAccessModuleProxyDefaul
 {
     // test: create a new category, with a new attribute and add a poi under this category
     POIServiceTypes::Details categoryDetails;
-    std::vector<POIServiceTypes::CategoryID> categoryParentsIDList;
+    std::vector<CommonTypes::CategoryID> categoryParentsIDList;
     POIServiceTypes::Icon categoryIcons(std::string(ICON_URL));
     POIServiceTypes::Media categoryMedia(std::string(""));
 
@@ -246,7 +246,7 @@ void contentManager::ConfigurationChanged(const std::vector< uint16_t >& changed
     }
 }
 
-void contentManager::CategoriesRemoved(const std::vector<POIServiceTypes::CategoryID> &categories)
+void contentManager::CategoriesRemoved(const std::vector<CommonTypes::CategoryID> &categories)
 {
     size_t index;
 
@@ -311,7 +311,7 @@ void contentManager::connectPopupWindow(GtkWidget *window)
     mp_popupWindow = window;
 }
 
-static void createCategoryAsyncCallback(const CommonAPI::CallStatus& callStatus, const POIServiceTypes::CategoryID& categoryID)
+static void createCategoryAsyncCallback(const CommonAPI::CallStatus& callStatus, const CommonTypes::CategoryID& categoryID)
 {
     if (callStatus != CommonAPI::CallStatus::SUCCESS) {
         cout << "Remote createCategory failed with status: " << static_cast<std::underlying_type<CommonAPI::CallStatus>::type>(callStatus) << endl;
@@ -325,7 +325,7 @@ static void createCategoryAsyncCallback(const CommonAPI::CallStatus& callStatus,
     clientContentManager->dumpCategories();
 }
 
-void contentManager::createCategory(const POIServiceTypes::CategoryID& category)
+void contentManager::createCategory(const CommonTypes::CategoryID& category)
 {
     m_category_id = category;
 }
@@ -356,7 +356,7 @@ void contentManager::dumpLocales()
 
 void contentManager::testCreateCategory()
 {
-    function<void(const CommonAPI::CallStatus&, const POIServiceTypes::CategoryID&)> fcb = createCategoryAsyncCallback;
+    function<void(const CommonAPI::CallStatus&, const CommonTypes::CategoryID&)> fcb = createCategoryAsyncCallback;
 
     mp_proxy->createCategoryAsync(m_category,createCategoryAsyncCallback);
 
@@ -364,7 +364,7 @@ void contentManager::testCreateCategory()
 
 void contentManager::testRemoveCategory()
 {
-    std::vector<POIServiceTypes::CategoryID> categories;
+    std::vector<CommonTypes::CategoryID> categories;
     CommonAPI::CallStatus status;
 
     categories.push_back(m_category_id);
@@ -628,7 +628,7 @@ int main(int  argc , char**  argv )
             populateWindow(window,clientContentManager);
 
             // Connect the DBus signals
-            myProxy->getCategoriesRemovedEvent().subscribe([&](const std::vector<POIServiceTypes::CategoryID>& categories) {
+            myProxy->getCategoriesRemovedEvent().subscribe([&](const std::vector<CommonTypes::CategoryID>& categories) {
                 clientContentManager->CategoriesRemoved(categories);
             });
             myProxy->getConfigurationChangedEvent().subscribe([&](const std::vector< uint16_t >& changedSettings) {