From 3e023867588ef29d9808c27f37d3e6e0bcfeccb4 Mon Sep 17 00:00:00 2001 From: asanoaozora Date: Tue, 14 Feb 2017 17:59:57 +0100 Subject: fix API version to V2.0 in the POIService POCs --- .../poicam-server-plugin/CMakeLists.txt | 18 ++++++++++-------- .../genivi_poiservice_cam_navit.cxx | 14 +++++++------- src/poi-service/poi-manager-server/CMakeLists.txt | 18 ++++++++++-------- .../poi-manager-server/poi-manager-server-stub.h | 2 +- 4 files changed, 28 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/navigation/navigation-core/poicam-server-plugin/CMakeLists.txt b/src/navigation/navigation-core/poicam-server-plugin/CMakeLists.txt index 2256ffa..32ead21 100644 --- a/src/navigation/navigation-core/poicam-server-plugin/CMakeLists.txt +++ b/src/navigation/navigation-core/poicam-server-plugin/CMakeLists.txt @@ -29,23 +29,25 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin) # Path to the generated files -set(API_VERSION_MAJOR 4) -set(API_VERSION "v${API_VERSION_MAJOR}") -set(PRJ_SRC_GEN_ROOT_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION}/org/genivi) #files shared by all the APIs -set(PRJ_SRC_GEN_NAVIGATION_PATH ${PRJ_SRC_GEN_ROOT_PATH}/navigation) #files shared by the navigation APIs -set(PRJ_SRC_GEN_POISERVICE_PATH ${PRJ_SRC_GEN_NAVIGATION_PATH}/poiservice) #files shared by the poiservice APIs +set(API_VERSION_NAVIGATION_MAJOR 4) +set(API_VERSION_NAVIGATION "v${API_VERSION_NAVIGATION_MAJOR}") +set(API_VERSION_POISERVICE_MAJOR 2) +set(API_VERSION_POISERVICE "v${API_VERSION_POISERVICE_MAJOR}") +set(PRJ_SRC_GEN_COMMON_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi) +set(PRJ_SRC_GEN_NAVIGATION_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi/navigation) #files shared by the navigation APIs +set(PRJ_SRC_GEN_POISERVICE_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_POISERVICE}/org/genivi/navigation/poiservice) #files shared by the poiservice APIs # Source Files FILE(GLOB PRJ_LOCAL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.cxx) # Source Files for generating the server stub set(FRANCA_FILE_SERVER "POIContentAccessModule") FILE(GLOB PRJ_STUB_GEN_SRCS - ${PRJ_SRC_GEN_ROOT_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_ROOT_PATH}/*Types.cpp ${PRJ_SRC_GEN_ROOT_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_ROOT_PATH}/*StubDefault.cpp + ${PRJ_SRC_GEN_COMMON_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*Types.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_ROOT_PATH}/*StubDefault.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*Types.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*StubDefault.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/${FRANCA_FILE_SERVER}DBusStub*.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/${FRANCA_FILE_SERVER}Types.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/${FRANCA_FILE_SERVER}DBusDeployment.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/${FRANCA_FILE_SERVER}StubDefault.cpp ) FILE(GLOB PRJ_STUB_IMPL_SRCS - ${PRJ_SRC_GEN_ROOT_PATH}/*Stub*.cpp + ${PRJ_SRC_GEN_COMMON_PATH}/*Stub*.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*Stub*.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/${FRANCA_FILE_SERVER}Stub*.cpp ) @@ -58,7 +60,7 @@ set(PRJ_SRCS ${PRJ_LOCAL_SRCS} ${PRJ_STUB_GEN_SRCS} ${PRJ_STUB_IMPL_SRCS} ${PRJ_ include_directories( ${COMMONAPI_GEN_DIR} - ${PRJ_SRC_GEN_ROOT_PATH} + ${PRJ_SRC_GEN_COMMON_PATH} ${PRJ_SRC_GEN_NAVIGATION_PATH} ${PRJ_SRC_GEN_POISERVICE_PATH} ${DBUS_INCLUDE_DIRS} diff --git a/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx b/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx index 0f98611..11a4384 100644 --- a/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx +++ b/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx @@ -55,7 +55,7 @@ #define dbg(level,...) ; #endif -using namespace v4::org::genivi::navigation::poiservice; +using namespace v2::org::genivi::navigation::poiservice; using namespace v4::org::genivi::navigation; using namespace v4::org::genivi; @@ -174,7 +174,7 @@ void getParentCategories(const std::shared_ptr _client, ::v /** * description: Creates a category by name and return an unique id. */ -void createCategory(const std::shared_ptr _client, ::v4::org::genivi::navigation::poiservice::POIServiceTypes::CAMCategory _category, createCategoryReply_t _reply){ +void createCategory(const std::shared_ptr _client, ::v2::org::genivi::navigation::poiservice::POIServiceTypes::CAMCategory _category, createCategoryReply_t _reply){ throw DBus::ErrorNotSupported("Not yet supported"); } @@ -191,7 +191,7 @@ void removeCategories(const std::shared_ptr _client, std::v * database, a signal is emitted when the update is done, that gives the id of * the elements added */ -void addPOIs(const std::shared_ptr _client, ::v4::org::genivi::CommonTypes::CategoryID _unique_id, std::vector< ::v4::org::genivi::navigation::poiservice::POIServiceTypes::PoiAddedDetails> _poiList, addPOIsReply_t _reply){ +void addPOIs(const std::shared_ptr _client, ::v4::org::genivi::CommonTypes::CategoryID _unique_id, std::vector< ::v2::org::genivi::navigation::poiservice::POIServiceTypes::PoiAddedDetails> _poiList, addPOIsReply_t _reply){ throw DBus::ErrorNotSupported("Not yet supported"); } @@ -199,7 +199,7 @@ void addPOIs(const std::shared_ptr _client, ::v4::org::geni * description: Removes a list of POIs to a category. Because of required time to remove it * from the database, a signal is emitted when the update is done. */ -void removePOIs(const std::shared_ptr _client, std::vector< ::v4::org::genivi::navigation::poiservice::POIServiceTypes::POI_ID> _ids, removePOIsReply_t _reply){ +void removePOIs(const std::shared_ptr _client, std::vector< ::v2::org::genivi::navigation::poiservice::POIServiceTypes::POI_ID> _ids, removePOIsReply_t _reply){ throw DBus::ErrorNotSupported("Not yet supported"); } @@ -209,7 +209,7 @@ void removePOIs(const std::shared_ptr _client, std::vector< * parameters. Of course the CAM will only be aware of the search if it registers * one of the search categories. */ -void poiSearchStarted(const std::shared_ptr _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, uint16_t _maxSize, ::v4::org::genivi::navigation::NavigationTypes::Coordinate3D _location, std::vector< ::v4::org::genivi::navigation::poiservice::POIServiceTypes::CategoryAndRadius> _poiCategories, std::vector< ::v4::org::genivi::navigation::poiservice::POIServiceTypes::AttributeDetails> _poiAttributes, std::string _inputString, ::v4::org::genivi::navigation::poiservice::POIServiceTypes::SortOption _sortOption, poiSearchStartedReply_t _reply){ +void poiSearchStarted(const std::shared_ptr _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, uint16_t _maxSize, ::v4::org::genivi::navigation::NavigationTypes::Coordinate3D _location, std::vector< ::v2::org::genivi::navigation::poiservice::POIServiceTypes::CategoryAndRadius> _poiCategories, std::vector< ::v2::org::genivi::navigation::poiservice::POIServiceTypes::AttributeDetails> _poiAttributes, std::string _inputString, ::v2::org::genivi::navigation::poiservice::POIServiceTypes::SortOption _sortOption, poiSearchStartedReply_t _reply){ struct attr navit; struct coord_geo g; dbg(lvl_debug,"enter handle=%d size=%d location=%f,%f,%d string='%s' sortOption=%d\n",_poiSearchHandle, _maxSize, _location.getLatitude(),_location.getLongitude(),_location.getAltitude(), _inputString.c_str(), _sortOption); @@ -276,7 +276,7 @@ void poiSearchCanceled(const std::shared_ptr _client, ::v4: * unique id is managed by the POI component, the CAM only provides the POI name, * the category and coordinates as well as all the relevant detailed information. */ -void resultListRequested(const std::shared_ptr _client, ::v4::org::genivi::navigation::poiservice::POIServiceTypes::ContentAccessModuleID _camId, ::v4::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, std::vector< ::v4::org::genivi::navigation::poiservice::POIServiceTypes::AttributeID> _attributeList, resultListRequestedReply_t _reply){ +void resultListRequested(const std::shared_ptr _client, ::v2::org::genivi::navigation::poiservice::POIServiceTypes::ContentAccessModuleID _camId, ::v4::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, std::vector< ::v2::org::genivi::navigation::poiservice::POIServiceTypes::AttributeID> _attributeList, resultListRequestedReply_t _reply){ struct item *item; int count=0; POIServiceTypes::SearchStatusState _statusValue; @@ -345,7 +345,7 @@ void resultListRequested(const std::shared_ptr _client, ::v * contains the name, the parent categories, the list of attributes, the icons, * ... . */ -void poiDetailsRequested(const std::shared_ptr _client, std::vector< ::v4::org::genivi::navigation::poiservice::POIServiceTypes::POI_ID> _source_id, poiDetailsRequestedReply_t _reply){ +void poiDetailsRequested(const std::shared_ptr _client, std::vector< ::v2::org::genivi::navigation::poiservice::POIServiceTypes::POI_ID> _source_id, poiDetailsRequestedReply_t _reply){ dbg(lvl_debug,"enter\n"); std::vector< POIServiceTypes::SearchResultDetails> _results; NavigationTypes::Coordinate3D location; diff --git a/src/poi-service/poi-manager-server/CMakeLists.txt b/src/poi-service/poi-manager-server/CMakeLists.txt index 4fe46ce..8f56712 100644 --- a/src/poi-service/poi-manager-server/CMakeLists.txt +++ b/src/poi-service/poi-manager-server/CMakeLists.txt @@ -56,22 +56,24 @@ set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") add_subdirectory(${FRANCA_DIR}/navigation/poiservice "${CMAKE_CURRENT_BINARY_DIR}/franca") # Path to the generated files -set(API_VERSION_MAJOR 4) -set(API_VERSION "v${API_VERSION_MAJOR}") -set(PRJ_SRC_GEN_ROOT_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION}/org/genivi) #files shared by all the APIs -set(PRJ_SRC_GEN_NAVIGATION_PATH ${PRJ_SRC_GEN_ROOT_PATH}/navigation) #files shared by the navigation APIs -set(PRJ_SRC_GEN_POISERVICE_PATH ${PRJ_SRC_GEN_NAVIGATION_PATH}/poiservice) #files shared by the poiservice APIs +set(API_VERSION_NAVIGATION_MAJOR 4) +set(API_VERSION_NAVIGATION "v${API_VERSION_NAVIGATION_MAJOR}") +set(API_VERSION_POISERVICE_MAJOR 2) +set(API_VERSION_POISERVICE "v${API_VERSION_POISERVICE_MAJOR}") +set(PRJ_SRC_GEN_COMMON_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi) #files shared by all the APIs +set(PRJ_SRC_GEN_NAVIGATION_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi/navigation) #files shared by the navigation APIs +set(PRJ_SRC_GEN_POISERVICE_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_POISERVICE}/org/genivi/navigation/poiservice) #files shared by the poiservice APIs # Source Files FILE(GLOB PRJ_LOCAL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) FILE(GLOB PRJ_COMMON_SRCS ${COMMON_DIR}/poi-common-database.cpp ${COMMON_DIR}/poi-common-math.cpp) FILE(GLOB PRJ_STUB_GEN_SRCS - ${PRJ_SRC_GEN_ROOT_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_ROOT_PATH}/*Types.cpp ${PRJ_SRC_GEN_ROOT_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_ROOT_PATH}/*StubDefault.cpp + ${PRJ_SRC_GEN_COMMON_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*Types.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*StubDefault.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*Types.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*StubDefault.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*Types.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*StubDefault.cpp ) FILE(GLOB PRJ_STUB_IMPL_SRCS - ${PRJ_SRC_GEN_ROOT_PATH}/*Stub*.cpp + ${PRJ_SRC_GEN_COMMON_PATH}/*Stub*.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*Stub*.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*Stub*.cpp ) @@ -81,7 +83,7 @@ set(PRJ_SRCS ${PRJ_LOCAL_SRCS} ${PRJ_COMMON_SRCS} ${PRJ_STUB_GEN_SRCS} ${PRJ_STU include_directories( ${COMMON_DIR} ${COMMONAPI_GEN_DIR} - ${PRJ_SRC_GEN_ROOT_PATH} + ${PRJ_SRC_GEN_COMMON_PATH} ${PRJ_SRC_GEN_NAVIGATION_PATH} ${PRJ_SRC_GEN_POISERVICE_PATH} ${DBUS_INCLUDE_DIRS} 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 c34d265..fc03c4b 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 @@ -41,7 +41,7 @@ #include "poi-common-math.h" using namespace std; -using namespace v4::org::genivi::navigation::poiservice; +using namespace v2::org::genivi::navigation::poiservice; using namespace v4::org::genivi::navigation; using namespace v4::org::genivi; -- cgit v1.2.1