Fix a bug in makefile, update poi-service with new DBus path

6 files changed, 20 insertions, 2 deletions

diff --git a/src/navigation/script/positioning.mk b/src/navigation/script/0positioning.mk
index f1898cf..f1898cf 100644
--- a/src/navigation/script/positioning.mk
+++ b/src/navigation/script/0positioning.mk
diff --git a/src/navigation/script/0navit.mk b/src/navigation/script/1navit.mk
index d761c06..d761c06 100644
--- a/src/navigation/script/0navit.mk
+++ b/src/navigation/script/1navit.mk
diff --git a/src/navigation/script/README b/src/navigation/script/README
new file mode 100644
index 0000000..5b76885
--- /dev/null
+++ b/src/navigation/script/README
@@ -0,0 +1,9 @@
+Important notice:
+The order of the files included into the Makefile (by include *.mk) has to follow a specific order:
+positioning.mk
+navit.mk
+and others ..
+So, the way it's managed is the following:
+0 radical added to positioning.mk so now the file name is 0positioning.mk
+1 radical added to navit.mk sonow the file name is 1navit.mk
+
diff --git a/test/navigation/README b/test/navigation/README
new file mode 100644
index 0000000..e0c2d2f
--- /dev/null
+++ b/test/navigation/README
@@ -0,0 +1,7 @@
+This folder only contains an example of test file.
+In order to test the navigation core, please do:
+cd ../../src/navigation/script
+./run -n &
+cd ../../../test/navigation/
+python test-route-calculation.py
+kill -9 `ps -ef | grep navit | grep -v grep | awk '{print $2}'`
diff --git a/test/poi-service/poi-client/mainwindow.cpp b/test/poi-service/poi-client/mainwindow.cpp
index 3844941..903f911 100644
--- a/test/poi-service/poi-client/mainwindow.cpp
+++ b/test/poi-service/poi-client/mainwindow.cpp
@@ -21,6 +21,7 @@
 *
 * List of changes:
 * 10-02-2014, Philippe Colliot, refinement and migration to the new repository
+* 15-07-2014, Philippe Colliot, update positioning dbus path 
 * <date>, <name>, <description of change>
 *
 * @licence end@
@@ -286,7 +287,7 @@ void MainWindow::InitUi()
                                                                                                 QDBusConnection::sessionBus(), this);
     m_dbusNavigationGuidanceInterface = new org::genivi::navigationcore::Guidance::DBusGuidanceInterface("org.genivi.navigationcore.Guidance", "/org/genivi/navigationcore",
                                                                                                 QDBusConnection::sessionBus(), this);
-    m_dbusPositioningEnhancedPositionInterface = new org::genivi::positioning::EnhancedPosition::DBusEnhancedPositionInterface("org.genivi.positioning.EnhancedPosition", "/position",
+    m_dbusPositioningEnhancedPositionInterface = new org::genivi::positioning::EnhancedPosition::DBusEnhancedPositionInterface("org.genivi.positioning.EnhancedPosition", "/org/genivi/positioning/EnhancedPosition",
                                                                                                 QDBusConnection::sessionBus(), this);
     m_dbusNavigationCoreSessionInterface = new org::genivi::navigationcore::Session::DBusNavigationCoreSessionInterface("org.genivi.navigationcore.Session", "/org/genivi/navigationcore",
                                                                                                 QDBusConnection::sessionBus(), this );
diff --git a/test/poi-service/script/get-positioning.mk b/test/poi-service/script/get-positioning.mk
index 958a577..141768c 100644
--- a/test/poi-service/script/get-positioning.mk
+++ b/test/poi-service/script/get-positioning.mk
@@ -23,12 +23,13 @@
 # 
 # 28-04-2014, Philippe Colliot, link to the public repos of positioning, add clean feature
 # 4/6/2014, Philippe Colliot, complete src-clean option
+# 15/7/2014, Philippe Colliot, align with the new version of positioning dbus path
 # 
 # @licence end@
 positioning_SRC=$(ROOT_DIR)/positioning
 positioning_API=$(positioning_SRC)/enhanced-position-service/api
 positioning_URL=http://git.projects.genivi.org/lbs/positioning.git
-positioning_VERSION=183d134e734e157c498f6cff367d104e4c5ad670
+positioning_VERSION=963d70c3d3a1f534146372e24c4d53a57d14ade2
 
 ALL+=positioning
 SRC_CLEAN+=clean-positioning_SRC