Alignment with the current version of Navit

3 files changed, 13 insertions, 26 deletions

diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt
index e84337d..6a75d6c 100644
--- a/src/navigation/CMakeLists.txt
+++ b/src/navigation/CMakeLists.txt
@@ -159,7 +159,7 @@ endif()
 # Check if positioning stuff with the right version has been cloned and do it if necessary
 # positioning_SRC_DIR is set by cmake -Dpositioning_SRC_DIR=<path to positioning src dir> 
 set(positioning_URL http://git.projects.genivi.org/lbs/positioning.git)
-set(positioning_VERSION fe164c14aa9594736656ff5c2ec0251a5f561376)
+set(positioning_VERSION 3a1254f9ac4f5e2d088d24598e76764874a40b99)
 
 if (EXISTS ${positioning_SRC_DIR})
 	execute_process(COMMAND ${git_get_src_version}  
@@ -205,7 +205,7 @@ endif()
 # Check if navit stuff with the right version has been cloned and do it if necessary
 set(navit_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/navit)
 set(navit_URL http://svn.code.sf.net/p/navit/code/trunk)
-set(navit_VERSION 5532)
+set(navit_VERSION 6025)
 set(navit_PATCH_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/patches)
 set(navit_PATCH_DUMMY_FILE ${navit_SRC_DIR}/.patched)
 
diff --git a/src/navigation/patches/ksvg2png_remove_output_param.diff b/src/navigation/patches/ksvg2png_remove_output_param.diff
deleted file mode 100644
index ff99fbc..0000000
--- a/src/navigation/patches/ksvg2png_remove_output_param.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: navit/navit/xpm/CMakeLists.txt
-===================================================================
---- navit/navit/xpm/CMakeLists.txt	(revision 5532)
-+++ navit/navit/xpm/CMakeLists.txt	(working copy)
-@@ -22,7 +22,7 @@
-          file(STRINGS  ${IMAGE_INPUT} NEW_SCALE_LINE REGEX "[^-]width=\"[0-9pxt.]*\"")
-          string(REGEX REPLACE ".*width=\"([0-9]*).*" "\\1" NEW_SCALE ${NEW_SCALE_LINE})
-        endif()
--      set(COMMAND_ARGS ${NEW_SCALE} ${NEW_SCALE}  ${IMAGE_INPUT} --output ${IMAGE_OUTPUT})
-+      set(COMMAND_ARGS ${NEW_SCALE} ${NEW_SCALE}  ${IMAGE_INPUT}  ${IMAGE_OUTPUT})
-    elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "inkscape")
-       if (${SCALE} GREATER 0)
-          set(SCALE_ARGS --export-width=${SCALE} --export-height=${SCALE})
diff --git a/src/navigation/script/README b/src/navigation/script/README
index daba0a8..890f3d4 100644
--- a/src/navigation/script/README
+++ b/src/navigation/script/README
@@ -30,30 +30,30 @@ To build the code:
 To build the navigation middleware you need first to clone some additional stuff:
 ./build.sh clone
 
+Apply a patch (see below for a short history of upgrade)
+cd ../navit
+patch -p0 -i ../patches/search_list_get_unique.diff
+cd ../script
+
 So, build it:
 ./build.sh make
 
 And run:
 ./run 
 
-Issues with Navit:
-The current version of Navit used by the code is the r5532. It's an already old version (but the POC runs with it).
+Annexe:
 
-Upgrade is under progress, with some issues listed below:
+Issues during upgrade of Navit:
+The version has been upgraded from version r5532 to version r6025
 
-Note 1: There's an issue with the latest version of ksvg2png, that doesn't requires --output into the command line
-It's a problem because the png are not correctly generated.
-So, please apply the patch
-patch -p0 -i ../patches/ksvg2png_remove_output_param.diff
+Note 1: There was an issue with the latest version of ksvg2png, that doesn't requires --output into the command line
 The issue is fixed by the r5827
 
-Note 2: Issues during upgrade
-r5549 removed the  get_unique features used by GetSpell
+Note 2: The r5549 removed the  get_unique features used by GetSpell
 So, please apply the patch
 patch -p0 -i ../patches/search_list_get_unique.diff
-r5822 removed the attribute distance_metric, it's fixed by the r5898
 
-r5970 Test route calculation is OK, but stability problems when testing the full FSA stuff, to be investigated
+Note 3: The r5822 removed the attribute distance_metric, it's fixed by the r5898
 
 
 CMakeLists.txt organization: