alignment with navit git in progress

6 files changed, 19 insertions, 17 deletions

diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt
index ef9e54b..d25997b 100644
--- a/src/navigation/CMakeLists.txt
+++ b/src/navigation/CMakeLists.txt
@@ -60,10 +60,10 @@ set(API_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../api")
 set(NAVIGATION_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navigation-common")
 
 if(NOT ${YOCTO_CONFIG})
-    set(NAVIT_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navit/navit/cmake")
+    set(NAVIT_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navit/cmake")
     set(DBUS_GENERATED_INCLUDE_DIR_POSITIONING "${CMAKE_CURRENT_BINARY_DIR}/enhanced-position-service/dbus/api") # this one is for positioning
     set(DBUS_GENERATED_INCLUDE_DIR_SPEECH "${CMAKE_CURRENT_BINARY_DIR}/dbus-include/speech-service") # this one is for speech
-    set(NAVIT_CONFIG_H_DIR "${CMAKE_CURRENT_BINARY_DIR}/navit/navit")
+    set(NAVIT_CONFIG_H_DIR "${CMAKE_CURRENT_BINARY_DIR}/navit")
 else()
     set(NAVIT_CMAKE_DIR "${STAGING_LIBDIR}/navit/cmake")
     set(DBUS_GENERATED_INCLUDE_DIR_POSITIONING "${STAGING_INCDIR}/positioning") # this one is for positioning
@@ -71,7 +71,7 @@ else()
     set(NAVIT_CONFIG_H_DIR "${STAGING_DATADIR}")
 endif()
 
-set(NAVIT_BIN_DIR "${CMAKE_CURRENT_BINARY_DIR}/navit/navit/navit")
+set(NAVIT_BIN_DIR "${CMAKE_CURRENT_BINARY_DIR}/navit/navit")
 set(NAVIT_MAPS_DIR "${NAVIT_BIN_DIR}/maps")
 
 set(DBUS_GENERATED_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/dbus-include")
diff --git a/src/navigation/README b/src/navigation/README
index 0bdbb99..14daf7e 100644
--- a/src/navigation/README
+++ b/src/navigation/README
@@ -1,4 +1,4 @@
-Release date of the file: 16-02-2016 
+Release date of the file: 09-03-2016 
 Status: OK
 
 Project:
@@ -29,7 +29,7 @@ Ubuntu 14.04 LTS
 Current versions of additional code 
 ===============================
 <current version of positioning> (git): 5b6b120d836259afb57b3ad6bf2f6ba8107c4a3e
-<current version of navit> (svn): 6135
+<current version of navit> (git): 162a3e43d14531a7053872903674351a3142eea2
 
 ===============================
 How to get additional code 
@@ -41,7 +41,11 @@ git checkout <current version of positioning>
 cd ../
 
 Get navit:
-svn checkout http://svn.code.sf.net/p/navit/code/trunk navit -r<current version of navit>
+git clone https://github.com/navit-gps/navit.git
+cd navit
+git checkout <current version of navit>
+cd ../
+
 
 Now apply a patch to navit (The r5549 removed the  get_unique features used by GetSpell):
 cd navit
@@ -97,11 +101,9 @@ cd build
 For the time being, navit is not being able to be built directly with the top CmakeLists.txt (to be improved), so it's needed to do it separately:
 mkdir navit
 cd navit
-mkdir navit
-cd navit
-cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../../navit/navit/
+cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../navit/
 make
-cd ../../
+cd ../
 
 Now let's build the other parts:
 cmake ../
diff --git a/src/navigation/map-viewer/CMakeLists.txt b/src/navigation/map-viewer/CMakeLists.txt
index 538f3d1..ebfe58c 100644
--- a/src/navigation/map-viewer/CMakeLists.txt
+++ b/src/navigation/map-viewer/CMakeLists.txt
@@ -47,12 +47,12 @@ find_program(XSLTPROC xsltproc REQUIRED)
 if(NOT ${YOCTO_CONFIG})
     execute_process(
         OUTPUT_FILE ${NAVIT_BIN_DIR}/navit_genivi_mapviewer.xml
-        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_mapviewer.xsl ${navit_SOURCE_DIR}/navit/navit_shipped.xml
+        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_mapviewer.xsl ${navit_SOURCE_DIR}/navit_shipped.xml
     )
 else()
     execute_process(
         OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/navit_genivi_mapviewer.xml
-        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_mapviewer.xsl ${NAVIT_CMAKE_DIR}/../navit/navit_shipped.xml
+        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_mapviewer.xsl ${NAVIT_CMAKE_DIR}/../navit_shipped.xml
     )
 endif()
 
diff --git a/src/navigation/navigation-core/CMakeLists.txt b/src/navigation/navigation-core/CMakeLists.txt
index c9fad47..8e29383 100644
--- a/src/navigation/navigation-core/CMakeLists.txt
+++ b/src/navigation/navigation-core/CMakeLists.txt
@@ -47,12 +47,12 @@ find_program(XSLTPROC xsltproc REQUIRED)
 if(NOT ${YOCTO_CONFIG})
     execute_process(
         OUTPUT_FILE ${NAVIT_BIN_DIR}/navit_genivi_navigationcore.xml
-        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_navigationcore.xsl ${navit_SOURCE_DIR}/navit/navit_shipped.xml
+        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_navigationcore.xsl ${navit_SOURCE_DIR}/navit_shipped.xml
     )
 else()
     execute_process(
         OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/navit_genivi_navigationcore.xml
-        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_navigationcore.xsl ${NAVIT_CMAKE_DIR}/../navit/navit_shipped.xml
+        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_navigationcore.xsl ${NAVIT_CMAKE_DIR}/../navit_shipped.xml
     )
 endif()
 
diff --git a/src/navigation/patches/search_list_get_unique.diff b/src/navigation/patches/search_list_get_unique.diff
index e315c78..8a912fa 100644
--- a/src/navigation/patches/search_list_get_unique.diff
+++ b/src/navigation/patches/search_list_get_unique.diff
@@ -1,7 +1,7 @@
 Index: navit/navit/search.c
 ===================================================================
---- navit/navit/search.c	(revision 5827)
-+++ navit/navit/search.c	(working copy)
+--- navit/search.c	(revision 5827)
++++ navit/search.c	(working copy)
 @@ -1048,3 +1048,138 @@
  search_init(void)
  {
diff --git a/src/navigation/run b/src/navigation/run
index 9c53196..d7b62f5 100755
--- a/src/navigation/run
+++ b/src/navigation/run
@@ -94,7 +94,7 @@ CUR_DIR=$PWD
 BIN_DIR=$CUR_DIR/bin
 SRC_DIR=$PWD
 LOGREPLAYER_LOGS_DIR=$SRC_DIR/positioning/log-replayer/logs
-NAVIT_BIN_DIR=$CUR_DIR/build/navit/navit/navit/
+NAVIT_BIN_DIR=$CUR_DIR/build/navit/navit/
 
 while getopts c:gnorvx opt
 do