alignment, rebuild and test with latest versions of navit and positioning

2 files changed, 32 insertions, 11 deletions

diff --git a/src/navigation/README.md b/src/navigation/README.md
index b3389ae..bda24e3 100644
--- a/src/navigation/README.md
+++ b/src/navigation/README.md
@@ -41,11 +41,12 @@ sudo pip install --upgrade pip
 
 To test, launch the navigation middleware by entering:
 ./run -r
-test files:
-./test-route-calculation.py
-./test-location-input.py
+'bug safe' test files (can be launched several times):
+./test-location-input.py -l location.xml
+./test-route-calculation.py -r route.xml
+'bug to be fixed' test files (can be launched only one time):
+./test-guidance.py -r route.xml
 ./test-map-viewer-control.py
-NB: there's a bug when the map is closed, so you need to restart the navigation after the last one
 
 If everything is OK, you must see:
 
@@ -89,6 +90,9 @@ to clean and rebuild all (including invoking cmake)
 or to build updated parts
 ./build.sh -m
 
+NB: in case you didn't build the whole code yet, you can also invoke
+./clone_and_build.sh -m
+
 ### How to test
 Some python scripts can be used for test. 
 Go to ../../test/navigation
@@ -96,11 +100,12 @@ For Python, you need to install some modules (see explanations above)
 
 To test, launch the navigation middleware by entering:
 ./run-capi -r
-test files:
-./test-route-calculation-capi.py
-./test-location-input-capi.py
+'bug safe' test files (can be launched several times):
+./test-location-input-capi.py -l location.xml
+./test-route-calculation-capi.py -r route.xml
+'bug to be fixed' test files
+./test-guidance_capi.py -r route.xml
 ./test-map-viewer-control-capi.py
-NB: there's a bug when the map is closed, so you need to restart the navigation after the last one
 
 If everything is OK, you must see:
 
diff --git a/src/navigation/clone_and_build.sh b/src/navigation/clone_and_build.sh
index 310984b..cd91596 100755
--- a/src/navigation/clone_and_build.sh
+++ b/src/navigation/clone_and_build.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-positioning_version='9e65831eed02cc8a1b2e2e73787d6007b54214b4'
-navit_version='42f9d3484516c88c7cdf647817a6d6a2acac53c2'
+build_option=""
+positioning_version='f341b4a2cb216d6204136794d33076170ab1bf80'
+navit_version='0a8f85666a3b849d70ed450d74bed3cf85466630'
 
 echo "version of positioning is: $positioning_version"
 echo "version of navit is: $navit_version"
@@ -14,6 +15,21 @@ then
 	exit 1
 fi
 
+while getopts m opt
+do
+	case $opt in
+	m)
+		build_option="-m"
+		;;
+	\?)
+		echo "Usage:"
+		echo "$0 [-m]"
+		echo "-m: build with commonAPI plugins "
+		exit 1
+	esac
+done
+
+
 if [ -d "./build" ]
 then
 	find ./build ! -name '*.cbp' -type f -exec rm -f {} +
@@ -32,7 +48,7 @@ patch -p0 -i ../patches/search_list_get_unique.diff
 patch -p0 -i ../patches/fsa_issue_padding.diff
 cd ..
 
-./build.sh -c
+./build.sh -c $build_option