diff options
-rw-r--r-- | src/navigation/README | 4 | ||||
-rw-r--r-- | src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx | 4 | ||||
-rwxr-xr-x | src/navigation/rebuild_all.sh | 35 | ||||
-rwxr-xr-x | src/poi-service/rebuild_all.sh | 25 | ||||
-rw-r--r-- | test/poi-service/poi-manager-client/main.cpp | 9 | ||||
-rwxr-xr-x | test/poi-service/rebuild_all.sh | 36 |
6 files changed, 85 insertions, 28 deletions
diff --git a/src/navigation/README b/src/navigation/README index fe208c2..0bdbb99 100644 --- a/src/navigation/README +++ b/src/navigation/README @@ -1,4 +1,4 @@ -Release date of the file: 21-01-2016 +Release date of the file: 16-02-2016 Status: OK Project: @@ -28,7 +28,7 @@ Ubuntu 14.04 LTS =============================== Current versions of additional code =============================== -<current version of positioning> (git): 8bcb5aee2172bf1672b4402a2dbae480d5fbdc25 +<current version of positioning> (git): 5b6b120d836259afb57b3ad6bf2f6ba8107c4a3e <current version of navit> (svn): 6135 =============================== diff --git a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx index f4b0353..3e01180 100644 --- a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx +++ b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx @@ -290,7 +290,7 @@ class ContentAccessModule } void - PoiSearchStarted(const uint32_t& poiSearchHandle, const uint16_t& maxSize, const ::DBus::Struct< double, double, double >& location, const std::vector< ::DBus::Struct< uint32_t, uint32_t > >& poiCategories, const std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, DBusCommonAPIVariant, int32_t, bool > >& poiAttributes, const std::string& inputString, const uint16_t& sortOption) + PoiSearchStarted(const uint32_t& poiSearchHandle, const uint16_t& maxSize, const ::DBus::Struct< double, double, double >& location, const std::vector< ::DBus::Struct< uint32_t, uint32_t > >& poiCategories, const std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, DBusCommonAPIVariant, int32_t, bool > >& poiAttributes, const std::string& inputString, const int32_t& sortOption) { struct attr navit; struct coord_geo g; @@ -348,7 +348,7 @@ class ContentAccessModule } void - ResultListRequested(const uint8_t& camId, const uint32_t& poiSearchHandle, const std::vector< uint32_t >& attributeList, uint16_t& statusValue, uint16_t& resultListSize, std::vector< ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > >& resultList) + ResultListRequested(const uint8_t& camId, const uint32_t& poiSearchHandle, const std::vector< uint32_t >& attributeList, int32_t& statusValue, uint16_t& resultListSize, std::vector< ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > >& resultList) { struct item *item; int count=0; diff --git a/src/navigation/rebuild_all.sh b/src/navigation/rebuild_all.sh index a1c5bde..06c2249 100755 --- a/src/navigation/rebuild_all.sh +++ b/src/navigation/rebuild_all.sh @@ -1,9 +1,28 @@ #!/bin/bash -echo 'clean up the build folder' -if [ -d "./build" ] +clean=0 + +while getopts c opt +do + case $opt in + c) + clean=1 + ;; + \?) + echo "Usage:" + echo "$0 [-c ]" + echo "-c: Rebuild with clean" + exit 1 + esac +done + +if [ "$clean" = 1 ] then - find ./build ! -name '*.cbp' -type f -exec rm -f {} + + echo 'clean up the build folder' + if [ -d "./build" ] + then + find ./build ! -name '*.cbp' -type f -exec rm -f {} + + fi fi mkdir -p build @@ -13,11 +32,17 @@ cd navit mkdir -p navit cd navit echo 'build navit' -cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../../navit/navit/ +if [ "$clean" = 1 ] +then + cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../../navit/navit/ +fi make cd ../../ echo 'build navigation' -cmake ../ +if [ "$clean" = 1 ] +then + cmake ../ +fi make cd .. diff --git a/src/poi-service/rebuild_all.sh b/src/poi-service/rebuild_all.sh index 688f9af..5d4861e 100755 --- a/src/poi-service/rebuild_all.sh +++ b/src/poi-service/rebuild_all.sh @@ -4,10 +4,14 @@ debug="OFF" franca="OFF" dbus="ON" commonapi_tools_option="" +clean=0 -while getopts df opt +while getopts cdf opt do case $opt in + c) + clean=1 + ;; d) debug="ON" ;; @@ -17,7 +21,8 @@ do ;; \?) echo "Usage:" - echo "$0 [-df]" + echo "$0 [-cdf]" + echo "-c: Rebuild with clean" echo "-d: Enable the debug messages" echo "-f: Build using the Franca interfaces" exit 1 @@ -51,18 +56,24 @@ then commonapi_tools_option="-DDBUS_LIB_PATH="$DBUS_LIB_PATH" -DCOMMONAPI_DBUS_TOOL_DIR="$COMMONAPI_DBUS_TOOL_DIR" -DCOMMONAPI_TOOL_DIR="$COMMONAPI_TOOL_DIR fi -echo 'clean up the build folder' -if [ -d "./build" ] +if [ "$clean" = 1 ] then - find ./build ! -name '*.cbp' -type f -exec rm -f {} + + echo 'clean up the build folder' + if [ -d "./build" ] + then + find ./build ! -name '*.cbp' -type f -exec rm -f {} + + fi fi + mkdir -p build cd build echo 'build poi-server' -cmake -DWITH_FRANCA_DBUS_INTERFACE=$franca -DWITH_DBUS_INTERFACE=$dbus $commonapi_tools_option -DWITH_DEBUG=$debug ../ - +if [ "$clean" = 1 ] +then + cmake -DWITH_FRANCA_DBUS_INTERFACE=$franca -DWITH_DBUS_INTERFACE=$dbus $commonapi_tools_option -DWITH_DEBUG=$debug ../ +fi make diff --git a/test/poi-service/poi-manager-client/main.cpp b/test/poi-service/poi-manager-client/main.cpp index e64d4f5..8decba0 100644 --- a/test/poi-service/poi-manager-client/main.cpp +++ b/test/poi-service/poi-manager-client/main.cpp @@ -408,8 +408,15 @@ void contentManager::testSearch() categoryAndRadius.setRadius(SEARCH_RADIUS); poiCategories.push_back(categoryAndRadius); - attributeDetails.setCategoryId(m_category_id); attributeDetails.setId(ATTRIBUTE_ADDRCITY); + attributeDetails.setCategoryId(m_category_id); + attributeDetails.setType(POIServiceTypes::AttributeType::BOOLEAN); + POIServiceTypes::AttributeValue v(NEW_STARS_VALUE); + attributeDetails.setValue(v); + attributeDetails.setOper(POIServiceTypes::OperatorType::EQUAL); + attributeDetails.setMandatory(FALSE); + + poiAttributes.clear(); poiAttributes.push_back(attributeDetails); mp_proxy->poiSearchStarted(SEARCH_HANDLE,SEARCH_MAX_SIZE,location,poiCategories,poiAttributes,SEARCH_STRING,POIServiceTypes::SortOption::ATTRIBUTE_CUSTOM,status); diff --git a/test/poi-service/rebuild_all.sh b/test/poi-service/rebuild_all.sh index fc02261..828b2d6 100755 --- a/test/poi-service/rebuild_all.sh +++ b/test/poi-service/rebuild_all.sh @@ -4,10 +4,14 @@ debug="OFF" franca="OFF" dbus="ON" commonapi_tools_option="" +clean=0 -while getopts df opt +while getopts cdf opt do case $opt in + c) + clean=1 + ;; d) debug="ON" ;; @@ -17,7 +21,8 @@ do ;; \?) echo "Usage:" - echo "$0 [-df]" + echo "$0 [-cdf]" + echo "-c: Rebuild with clean" echo "-d: Enable the debug messages" echo "-f: Build using the Franca interfaces" exit 1 @@ -52,19 +57,22 @@ then fi -echo 'build the poi server' cd ../../src/poi-service ./rebuild_all.sh "$@" cd ../../test/poi-service -echo 'build the poi client' - -echo 'clean up the build folder' -if [ -d "./build" ] +if [ "$clean" = 1 ] then - find ./build ! -name '*.cbp' -type f -exec rm -f {} + + echo 'clean up the build folder' + if [ -d "./build" ] + then + find ./build ! -name '*.cbp' -type f -exec rm -f {} + + fi +else + echo 'just build without generation of the database' fi + mkdir -p build cd build @@ -72,12 +80,18 @@ cd build echo 'build poi-client' # Important notice: for the time being, it's just poi manager client that can be built against common api, # so it's needed to set WITH_DBUS_INTERFACE=ON for positioning -cmake -DWITH_DATABASE_SUPPLIER=ON -DWITH_FRANCA_DBUS_INTERFACE=$franca -DWITH_DBUS_INTERFACE=ON $commonapi_tools_option -DWITH_DEBUG=$debug ../ +if [ "$clean" = 1 ] +then + cmake -DWITH_DATABASE_SUPPLIER=ON -DWITH_FRANCA_DBUS_INTERFACE=$franca -DWITH_DBUS_INTERFACE=ON $commonapi_tools_option -DWITH_DEBUG=$debug ../ +fi make cd .. -echo 'populate the database with POIs of Paris' -./prepare -c paris +if [ "$clean" = 1 ] +then + echo 'populate the database with POIs of Paris' + ./prepare -c paris +fi |