diff options
author | U-TTG\pego <pego@NL2W7L-101492.ttg.global> | 2014-07-14 17:04:45 +0200 |
---|---|---|
committer | U-TTG\pego <pego@NL2W7L-101492.ttg.global> | 2014-07-14 17:04:45 +0200 |
commit | bae5af37a91aee0821fdac6ca6c9e0a094c03e6e (patch) | |
tree | ff0d058d1f40b7b272d4b92602c92c5fe99b112c | |
parent | 0263c6b40d4cc843efa34baf05d4d7d77b8ce53e (diff) | |
parent | 064202420c41c5d077c43876bd4fc4ff25ce0cd2 (diff) | |
download | poi-service-bae5af37a91aee0821fdac6ca6c9e0a094c03e6e.tar.gz |
Merge branch 'master' of ssh://git.projects.genivi.org/lbs/navigation
15 files changed, 43 insertions, 22 deletions
diff --git a/doc/map-viewer/MapViewerAPI.pdf b/doc/map-viewer/MapViewerAPI.pdf Binary files differindex 9a2fa01..96785a4 100755..100644 --- a/doc/map-viewer/MapViewerAPI.pdf +++ b/doc/map-viewer/MapViewerAPI.pdf diff --git a/doc/map-viewer/tools/MapViewerAPI-part1.doc b/doc/map-viewer/tools/MapViewerAPI-part1.doc Binary files differindex 1fc231e..c27d41d 100755 --- a/doc/map-viewer/tools/MapViewerAPI-part1.doc +++ b/doc/map-viewer/tools/MapViewerAPI-part1.doc diff --git a/doc/map-viewer/tools/MapViewerAPI-part1.pdf b/doc/map-viewer/tools/MapViewerAPI-part1.pdf Binary files differindex 7081382..8ac2a48 100755 --- a/doc/map-viewer/tools/MapViewerAPI-part1.pdf +++ b/doc/map-viewer/tools/MapViewerAPI-part1.pdf diff --git a/doc/map-viewer/tools/generate-doc.sh b/doc/map-viewer/tools/generate-doc.sh index 0d501e3..c1497fa 100755 --- a/doc/map-viewer/tools/generate-doc.sh +++ b/doc/map-viewer/tools/generate-doc.sh @@ -39,3 +39,6 @@ rm *.html #concatenate pdf files pdftk $INPUT_FILE1 $INPUT_FILE2 cat output $OUTPUT_DIR/$OUTPUT_FILE +sleep 1 +rm $INPUT_FILE2 + diff --git a/doc/navigation-core/NavigationCoreAPI.pdf b/doc/navigation-core/NavigationCoreAPI.pdf Binary files differindex 4ede81e..2694f24 100755..100644 --- a/doc/navigation-core/NavigationCoreAPI.pdf +++ b/doc/navigation-core/NavigationCoreAPI.pdf diff --git a/doc/navigation-core/tools/NavigationCoreAPI-part1.doc b/doc/navigation-core/tools/NavigationCoreAPI-part1.doc Binary files differindex 664125e..3337acc 100755 --- a/doc/navigation-core/tools/NavigationCoreAPI-part1.doc +++ b/doc/navigation-core/tools/NavigationCoreAPI-part1.doc diff --git a/doc/navigation-core/tools/NavigationCoreAPI-part1.pdf b/doc/navigation-core/tools/NavigationCoreAPI-part1.pdf Binary files differindex 29eaa2d..94b52b3 100755 --- a/doc/navigation-core/tools/NavigationCoreAPI-part1.pdf +++ b/doc/navigation-core/tools/NavigationCoreAPI-part1.pdf diff --git a/doc/navigation-core/tools/generate-doc.sh b/doc/navigation-core/tools/generate-doc.sh index 80d1709..e646bfc 100755 --- a/doc/navigation-core/tools/generate-doc.sh +++ b/doc/navigation-core/tools/generate-doc.sh @@ -42,3 +42,6 @@ rm *.html #concatenate pdf files pdftk $INPUT_FILE1 $INPUT_FILE2 cat output $OUTPUT_DIR/$OUTPUT_FILE +sleep 1 +rm $INPUT_FILE2 + diff --git a/src/navigation/README b/src/navigation/README index 3456ff4..a7f0a44 100644 --- a/src/navigation/README +++ b/src/navigation/README @@ -17,6 +17,7 @@ FYI: the application (with the HMI) is located into git://git.projects.genivi.or Author: Martin Schaller <martin.schaller@it-schaller.de> Philippe Colliot philippe.colliot@mpsa.com +Marco Residori marco.residori@xse.de License: See headers and LICENSE file @@ -32,7 +33,7 @@ Dependencies: Build: cd $WORKING-DIR/navigation-service/src/navigation/script -make all +make all2 To launch (several options available): ./run diff --git a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx index 814ef4e..b38fa46 100644 --- a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx +++ b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx @@ -98,7 +98,9 @@ class EnhancedPosition public: struct vehicle_priv *m_priv; EnhancedPosition(DBus::Connection &connection, struct vehicle_priv *priv) - : DBus::ObjectProxy(connection, "/position","org.genivi.positioning.EnhancedPosition") + : DBus::ObjectProxy(connection, + "/org/genivi/positioning/EnhancedPosition", + "org.genivi.positioning.EnhancedPosition") { m_priv=priv; try { diff --git a/src/navigation/script/1navit.mk b/src/navigation/script/0navit.mk index d761c06..d761c06 100644 --- a/src/navigation/script/1navit.mk +++ b/src/navigation/script/0navit.mk diff --git a/src/navigation/script/Makefile b/src/navigation/script/Makefile index d010ce1..5597f45 100644 --- a/src/navigation/script/Makefile +++ b/src/navigation/script/Makefile @@ -47,9 +47,13 @@ help:: @echo "src-clean: Clean up all checked out sources" @echo "make APT_GET=yum for Fedora, by default APT_GET is set to apt-get" +#initialize the variable ALL to an empty string +ALL= +#include makefiles include *.mk +#ALL is updated in the makefiles all: $(ALL) src-clean: $(SRC_CLEAN) diff --git a/src/navigation/script/0positioning.mk b/src/navigation/script/positioning.mk index d1f8e6d..f1898cf 100644 --- a/src/navigation/script/0positioning.mk +++ b/src/navigation/script/positioning.mk @@ -23,12 +23,19 @@ # # 4/6/2014, Philippe Colliot, complete src-clean option # +# 26/6/2014, Marco Residori, add support of new enhanced-position-service +# # @licence end@ + positioning_BIN=$(BIN_DIR)/positioning -gnss-service_BIN=$(BIN_DIR)/gnss-service -sensors-service_BIN=$(BIN_DIR)/sensors-service + +log-replayer_BIN=$(positioning_BIN)/log-replayer +gnss-service_BIN=$(positioning_BIN)/gnss-service +sensors-service_BIN=$(positioning_BIN)/sensors-service +enhanced-position-service_BIN=$(positioning_BIN)/enhanced-position-service + positioning_URL=http://git.projects.genivi.org/lbs/positioning.git -positioning_VERSION=HEAD +positioning_VERSION=963d70c3d3a1f534146372e24c4d53a57d14ade2 positioning_SRC=$(SRC_DIR)/positioning_$(positioning_VERSION) positioning_API=$(positioning_SRC)/enhanced-position-service/api @@ -42,19 +49,20 @@ help:: clean-positioning_SRC:: rm -rf $(positioning_SRC) -positioning: $(positioning_BIN)/enhanced-position-service/src/server/position-daemon +positioning: $(positioning_BIN)/enhanced-position-service -$(positioning_BIN)/Makefile: $(positioning_SRC)/enhanced-position-service/CMakeLists.txt - mkdir -p $(positioning_BIN) $(gnss-service_BIN) $(sensors-service_BIN) - cd $(gnss-service_BIN) && cmake $(positioning_SRC)/gnss-service - cd $(sensors-service_BIN) && cmake $(positioning_SRC)/sensors-service - cd $(positioning_BIN) && cmake -DWITH_GPSD=OFF -DWITH_DLT=OFF -DWITH_REPLAYER=ON -DWITH_TESTS=OFF $(positioning_SRC)/enhanced-position-service - - -$(positioning_BIN)/enhanced-position-service/src/server/position-daemon: $(positioning_BIN)/Makefile +$(positioning_BIN)/enhanced-position-service: $(positioning_BIN)/Makefile cd $(gnss-service_BIN) && make cd $(sensors-service_BIN) && make - cd $(positioning_BIN) && make + cd $(log-replayer_BIN) && make + cd $(enhanced-position-service_BIN) && make + +$(positioning_BIN)/Makefile: $(positioning_SRC)/enhanced-position-service/CMakeLists.txt + mkdir -p $(positioning_BIN) $(gnss-service_BIN) $(sensors-service_BIN) $(log-replayer_BIN) $(enhanced-position-service_BIN) + cd $(gnss-service_BIN) && cmake $(positioning_SRC)/gnss-service + cd $(sensors-service_BIN) && cmake $(positioning_SRC)/sensors-service + cd $(log-replayer_BIN) && cmake $(positioning_SRC)/log-replayer + cd $(enhanced-position-service_BIN) && cmake -DWITH_GPSD=OFF -DWITH_DLT=OFF -DWITH_REPLAYER=ON -DWITH_TESTS=OFF $(positioning_SRC)/enhanced-position-service $(positioning_SRC)/enhanced-position-service/CMakeLists.txt: cd $(positioning_SRC)/.. && git clone $(positioning_URL) $(positioning_SRC) diff --git a/src/navigation/script/run b/src/navigation/script/run index 726705b..2768438 100755 --- a/src/navigation/script/run +++ b/src/navigation/script/run @@ -21,7 +21,7 @@ # # List of changes: # -# <date>, <name>, <description of change> +# 26-6-2014, Marco Residori, Added support of new EnhancedPositionService # # @licence end@ function run @@ -111,9 +111,9 @@ do \?) echo "Usage:" echo "$0 [-a application][-c center][-lnx]" - echo "-c: Set center (supported values: paris,tokyo,longitude latitude). Default is geneve" - echo "-g: RUn subprocesses within gdb (only with -x)" - echo "-n: Don't start enhanced positioning service" + echo "-c: Set center (supported values: paris,tokyo,longitude,latitude). Default is geneve" + echo "-g: Run subprocesses within gdb (only with -x)" + echo "-n: Don't start enhanced-position-service" echo "-x: Run subprocesses in own xterm to get separated log messages" exit 1 esac @@ -124,10 +124,10 @@ if [ "$enhpos" = 1 ] then if [ -z "$REPLAYER_LOG_FILE" ] then - REPLAYER_LOG_FILE=$SRC_DIR/positioning/provider/rest/geneve-cologny.gvsl + REPLAYER_LOG_FILE=$BIN_DIR/positioning/log-replayer/logs/geneve-cologny.log fi - export REPLAYER_LOG_FILE - run EnhancedPositionService $BIN_DIR/positioning/src/position-daemon + run LogReplayer $BIN_DIR/positioning/log-replayer/src/log-replayer $REPLAYER_LOG_FILE + run EnhancedPositionService $BIN_DIR/positioning/enhanced-position-service/src/enhanced-position-service fi cd $BIN_DIR/navit/navit >bookmark.txt diff --git a/test/navigation/test-route-calculation.py b/test/navigation/test-route-calculation.py index f26c31c..f26c31c 100644..100755 --- a/test/navigation/test-route-calculation.py +++ b/test/navigation/test-route-calculation.py |