update POI POCs and add sequence charts for navigation

16 files changed, 66 insertions, 63 deletions

diff --git a/test/navigation/README.md b/test/navigation/README.md
index ae90708..c43cbac 100644
--- a/test/navigation/README.md
+++ b/test/navigation/README.md
@@ -43,4 +43,12 @@ To launch all the tests:
 ```
 NB: The locations and the routes are defined for the map database around Geneva (the reference map database into the repository). 
 
+##Sequence charts
+In order to illustrate the DBus exchanges, some sequence diagrams are available:
+location-input.pdf -->  ./test-location-input.py -l location.xml
+route-calculation.pdf --> ./test-route-calculation.py -r route.xml
+guidance.pdf --> ./test-guidance.py -r route.xml (partial)
+map-viewer-control.pdf --> ./test-map-viewer-control.py
+
+NB: The sequence charts have been caught and generated with an Elektrobit tool (EBSolys)
 
diff --git a/test/navigation/guidance.pdf b/test/navigation/guidance.pdf
new file mode 100644
index 0000000..e846ea7
--- /dev/null
+++ b/test/navigation/guidance.pdf
diff --git a/test/navigation/location-input.pdf b/test/navigation/location-input.pdf
new file mode 100644
index 0000000..8dafd63
--- /dev/null
+++ b/test/navigation/location-input.pdf
diff --git a/test/navigation/map-viewer-control.pdf b/test/navigation/map-viewer-control.pdf
new file mode 100644
index 0000000..3576c1f
--- /dev/null
+++ b/test/navigation/map-viewer-control.pdf
diff --git a/test/navigation/route-calculation.pdf b/test/navigation/route-calculation.pdf
new file mode 100644
index 0000000..120c51a
--- /dev/null
+++ b/test/navigation/route-calculation.pdf
diff --git a/test/navigation/test.log b/test/navigation/test.log
deleted file mode 100644
index 79bb1a9..0000000
--- a/test/navigation/test.log
+++ /dev/null
@@ -1,19 +0,0 @@
-#SPDX-License-Identifier: CC-BY-SA-4.0
-#Log file for the FSA simulator
-#GNS version 2.0.0
-#SNS version 2.0.0
-#VEH version 0.0.0 (alpha)
-#localization geneve cologny
-#vehicle speed 90 km/h so 2500 cm/1000 ms
-#engine speed 2000 RPM
-#ignition key ON (Not Applicable)
-#fuel level 30 l
-#fuel consumption 5.4 l/h so 1500 µl/1000 ms (6 l/100)
-#step 1000 ms
-#totalodo is used for simulating distance step in cm
-0,0$GVGNSVER,2,0,0
-0,0$GVSNSVER,2,0,0
-0,0$GVVEHVER,0,0,0
-1000,0$GVGNSP,1000,46.201839,6.146647,0,0X03
-1000,0$GVSNSVEHSP,1000,90.00,0X01
-1000,0$GVGNSC,1000,11.111111,0,27.000000,0X05
diff --git a/test/poi-service/poi-client/mainwindow.cpp b/test/poi-service/poi-client/mainwindow.cpp
index ac09d1d..a9053fc 100644
--- a/test/poi-service/poi-client/mainwindow.cpp
+++ b/test/poi-service/poi-client/mainwindow.cpp
@@ -280,19 +280,19 @@ void MainWindow::InitUi()
 
     // init D-Bus (every interfaces on the session bus)
     //create instances of clients
-    m_dbusPoiSearchInterface = new org::genivi::poiservice::poiSearch::DBusSearchInterface("org.genivi.poiservice.POISearch", "/org/genivi/poiservice/POISearch",
+    m_dbusPoiSearchInterface = new org::genivi::navigation::poiservice::poiSearch::DBusSearchInterface("org.genivi.navigation.poiservice.POISearch", "/org/genivi/poiservice/POISearch",
                                                                                                 QDBusConnection::sessionBus(), this);
-    m_dbusConfigurationInterface = new org::genivi::poiservice::poiSearch::DBusConfigurationInterface("org.genivi.poiservice.Configuration", "/org/genivi/poiservice/Configuration",
+    m_dbusConfigurationInterface = new org::genivi::navigation::poiservice::poiSearch::DBusConfigurationInterface("org.genivi.navigation.poiservice.POIConfiguration", "/org/genivi/poiservice/Configuration",
                                                                                                 QDBusConnection::sessionBus(), this);
-    m_dbusContentAccessInterface = new org::genivi::poiservice::poiContentAccess::DBusContentAccessInterface("org.genivi.poiservice.POIContentAccess","/org/genivi/poiservice/POIContentAccess",
+    m_dbusContentAccessInterface = new org::genivi::navigation::poiservice::poiContentAccess::DBusContentAccessInterface("org.genivi.navigation.poiservice.POIContentAccess","/org/genivi/poiservice/POIContentAccess",
                                                                                                 QDBusConnection::sessionBus(), this);
-    m_dbusNavigationRoutingInterface = new org::genivi::navigationcore::Routing::DBusRoutingInterface("org.genivi.navigationcore.Routing", "/org/genivi/navigationcore",
+    m_dbusNavigationRoutingInterface = new org::genivi::navigation::navigationcore::Routing::DBusRoutingInterface("org.genivi.navigation.navigationcore.Routing", "/org/genivi/navigationcore",
                                                                                                 QDBusConnection::sessionBus(), this);
-    m_dbusNavigationGuidanceInterface = new org::genivi::navigationcore::Guidance::DBusGuidanceInterface("org.genivi.navigationcore.Guidance", "/org/genivi/navigationcore",
+    m_dbusNavigationGuidanceInterface = new org::genivi::navigation::navigationcore::Guidance::DBusGuidanceInterface("org.genivi.navigation.navigationcore.Guidance", "/org/genivi/navigationcore",
                                                                                                 QDBusConnection::sessionBus(), this);
     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",
+    m_dbusNavigationCoreSessionInterface = new org::genivi::navigation::navigationcore::Session::DBusNavigationCoreSessionInterface("org.genivi.navigation.navigationcore.Session", "/org/genivi/navigationcore",
                                                                                                 QDBusConnection::sessionBus(), this );
 
     //connect to signals
diff --git a/test/poi-service/poi-client/mainwindow.h b/test/poi-service/poi-client/mainwindow.h
index dbf3a19..0d2ca2b 100644
--- a/test/poi-service/poi-client/mainwindow.h
+++ b/test/poi-service/poi-client/mainwindow.h
@@ -187,13 +187,13 @@ private:
     QList<QPixmap> m_tableIconPOI;
 
     //handles to DBus interfaces
-    org::genivi::poiservice::poiSearch::DBusSearchInterface *m_dbusPoiSearchInterface;
-    org::genivi::poiservice::poiSearch::DBusConfigurationInterface *m_dbusConfigurationInterface;
-    org::genivi::navigationcore::Routing::DBusRoutingInterface *m_dbusNavigationRoutingInterface;
-    org::genivi::navigationcore::Guidance::DBusGuidanceInterface *m_dbusNavigationGuidanceInterface;
+    org::genivi::navigation::poiservice::poiSearch::DBusSearchInterface *m_dbusPoiSearchInterface;
+    org::genivi::navigation::poiservice::poiSearch::DBusConfigurationInterface *m_dbusConfigurationInterface;
+    org::genivi::navigation::navigationcore::Routing::DBusRoutingInterface *m_dbusNavigationRoutingInterface;
+    org::genivi::navigation::navigationcore::Guidance::DBusGuidanceInterface *m_dbusNavigationGuidanceInterface;
     DBusEnhancedPositionInterface *m_dbusPositioningEnhancedPositionInterface;
-    org::genivi::navigationcore::Session::DBusNavigationCoreSessionInterface *m_dbusNavigationCoreSessionInterface;
-    org::genivi::poiservice::poiContentAccess::DBusContentAccessInterface *m_dbusContentAccessInterface;
+    org::genivi::navigation::navigationcore::Session::DBusNavigationCoreSessionInterface *m_dbusNavigationCoreSessionInterface;
+    org::genivi::navigation::poiservice::poiContentAccess::DBusContentAccessInterface *m_dbusContentAccessInterface;
 
     geoCoordinate3D_t m_geoLocation;
 
diff --git a/test/poi-service/poi-client/poi-client-DBusConfigurationInterface.h b/test/poi-service/poi-client/poi-client-DBusConfigurationInterface.h
index 6f38441..bec44a2 100644
--- a/test/poi-service/poi-client/poi-client-DBusConfigurationInterface.h
+++ b/test/poi-service/poi-client/poi-client-DBusConfigurationInterface.h
@@ -53,7 +53,7 @@ class DBusConfigurationInterface: public QDBusAbstractInterface
     Q_OBJECT
 public:
     static inline const char *staticInterfaceName()
-    { return "org.genivi.poiservice.Configuration"; }
+    { return "org.genivi.navigation.poiservice.POIConfiguration"; }
 
 public:
     DBusConfigurationInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
@@ -144,9 +144,11 @@ private:
 
 namespace org {
   namespace genivi {
-    namespace poiservice {
-        namespace poiSearch {
-      typedef ::DBusConfigurationInterface DBusConfigurationInterface;
+    namespace navigation {
+        namespace poiservice {
+            namespace poiSearch {
+        typedef ::DBusConfigurationInterface DBusConfigurationInterface;
+            }
         }
     }
   }
diff --git a/test/poi-service/poi-client/poi-client-DBusContentAccessInterface.h b/test/poi-service/poi-client/poi-client-DBusContentAccessInterface.h
index 6a0ec94..38ef6a3 100644
--- a/test/poi-service/poi-client/poi-client-DBusContentAccessInterface.h
+++ b/test/poi-service/poi-client/poi-client-DBusContentAccessInterface.h
@@ -52,7 +52,7 @@ class DBusContentAccessInterface: public QDBusAbstractInterface
     Q_OBJECT
 public:
     static inline const char *staticInterfaceName()
-    { return "org.genivi.poiservice.POIContentAccess"; }
+    { return "org.genivi.navigation.poiservice.POIContentAccess"; }
 
 public:
     DBusContentAccessInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
@@ -110,9 +110,11 @@ private:
 
 namespace org {
   namespace genivi {
-    namespace poiservice {
-        namespace poiContentAccess {
-      typedef ::DBusContentAccessInterface DBusContentAccessInterface;
+    namespace navigation {
+        namespace poiservice {
+            namespace poiContentAccess {
+        typedef ::DBusContentAccessInterface DBusContentAccessInterface;
+            }
         }
     }
   }
@@ -126,7 +128,7 @@ class DBusContentAccessModuleInterface: public QDBusAbstractInterface
     Q_OBJECT
 public:
     static inline const char *staticInterfaceName()
-    { return "org.genivi.poiservice.POIContentAccessModule"; }
+    { return "org.genivi.navigation.poiservice.POIContentAccessModule"; }
 
 public:
     DBusContentAccessModuleInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
@@ -245,9 +247,11 @@ private:
 
 namespace org {
   namespace genivi {
-    namespace poiservice {
-        namespace contentAccessModule {
-      typedef ::DBusContentAccessModuleInterface DBusContentAccessModuleInterface;
+    namespace navigation {
+        namespace poiservice {
+            namespace contentAccessModule {
+        typedef ::DBusContentAccessModuleInterface DBusContentAccessModuleInterface;
+            }
         }
     }
   }
diff --git a/test/poi-service/poi-client/poi-client-DBusGuidanceInterface.h b/test/poi-service/poi-client/poi-client-DBusGuidanceInterface.h
index f73ed5c..b0bf91e 100644
--- a/test/poi-service/poi-client/poi-client-DBusGuidanceInterface.h
+++ b/test/poi-service/poi-client/poi-client-DBusGuidanceInterface.h
@@ -52,7 +52,7 @@ class DBusGuidanceInterface: public QDBusAbstractInterface
     Q_OBJECT
 public:
     static inline const char *staticInterfaceName()
-    { return "org.genivi.navigationcore.Guidance"; }
+    { return "org.genivi.navigation.navigationcore.Guidance"; }
 
 public:
     DBusGuidanceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
@@ -73,9 +73,11 @@ private:
 
 namespace org {
   namespace genivi {
-    namespace navigationcore {
-        namespace Guidance {
-      typedef ::DBusGuidanceInterface DBusGuidanceInterface;
+    namespace navigation {
+        namespace navigationcore {
+            namespace Guidance {
+        typedef ::DBusGuidanceInterface DBusGuidanceInterface;
+            }
         }
     }
   }
diff --git a/test/poi-service/poi-client/poi-client-DBusNavigationCoreSessionInterface.h b/test/poi-service/poi-client/poi-client-DBusNavigationCoreSessionInterface.h
index 902648e..85564f4 100644
--- a/test/poi-service/poi-client/poi-client-DBusNavigationCoreSessionInterface.h
+++ b/test/poi-service/poi-client/poi-client-DBusNavigationCoreSessionInterface.h
@@ -52,7 +52,7 @@ class DBusNavigationCoreSessionInterface: public QDBusAbstractInterface
     Q_OBJECT
 public:
     static inline const char *staticInterfaceName()
-    { return "org.genivi.navigationcore.Session"; }
+    { return "org.genivi.navigation.navigationcore.Session"; }
 
 public:
     DBusNavigationCoreSessionInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
@@ -76,9 +76,11 @@ private:
 
 namespace org {
   namespace genivi {
-    namespace navigationcore {
-        namespace Session {
-      typedef ::DBusNavigationCoreSessionInterface DBusNavigationCoreSessionInterface;
+    namespace navigation {
+        namespace navigationcore {
+            namespace Session {
+        typedef ::DBusNavigationCoreSessionInterface DBusNavigationCoreSessionInterface;
+            }
         }
     }
   }
diff --git a/test/poi-service/poi-client/poi-client-DBusRoutingInterface.h b/test/poi-service/poi-client/poi-client-DBusRoutingInterface.h
index 7246efb..e867342 100644
--- a/test/poi-service/poi-client/poi-client-DBusRoutingInterface.h
+++ b/test/poi-service/poi-client/poi-client-DBusRoutingInterface.h
@@ -52,7 +52,7 @@ class DBusRoutingInterface: public QDBusAbstractInterface
     Q_OBJECT
 public:
     static inline const char *staticInterfaceName()
-    { return "org.genivi.navigationcore.Routing"; }
+    { return "org.genivi.navigation.navigationcore.Routing"; }
 
 public:
     DBusRoutingInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
@@ -85,9 +85,11 @@ private:
 
 namespace org {
   namespace genivi {
-    namespace navigationcore {
-        namespace Routing {
-      typedef ::DBusRoutingInterface DBusRoutingInterface;
+    namespace navigation {
+        namespace navigationcore {
+            namespace Routing {
+        typedef ::DBusRoutingInterface DBusRoutingInterface;
+            }
         }
     }
   }
diff --git a/test/poi-service/poi-client/poi-client-DBusSearchInterface.h b/test/poi-service/poi-client/poi-client-DBusSearchInterface.h
index ac81b0f..c950f85 100644
--- a/test/poi-service/poi-client/poi-client-DBusSearchInterface.h
+++ b/test/poi-service/poi-client/poi-client-DBusSearchInterface.h
@@ -53,7 +53,7 @@ class DBusSearchInterface: public QDBusAbstractInterface
     Q_OBJECT
 public:
     static inline const char *staticInterfaceName()
-    { return "org.genivi.poiservice.POISearch"; }
+    { return "org.genivi.navigation.poiservice.POISearch"; }
 
 public:
     DBusSearchInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
@@ -199,9 +199,11 @@ private:
 
 namespace org {
   namespace genivi {
-    namespace poiservice {
-        namespace poiSearch {
-      typedef ::DBusSearchInterface DBusSearchInterface;
+    namespace navigation {
+        namespace poiservice {
+            namespace poiSearch {
+        typedef ::DBusSearchInterface DBusSearchInterface;
+            }
         }
     }
   }
diff --git a/test/poi-service/poi-contentaccess-module/main.cpp b/test/poi-service/poi-contentaccess-module/main.cpp
index 07af337..cfa8ac0 100644
--- a/test/poi-service/poi-contentaccess-module/main.cpp
+++ b/test/poi-service/poi-contentaccess-module/main.cpp
@@ -48,9 +48,9 @@
 
 #include <QSettings>
 
-static const char* contentAccessModule_SERVICE_NAME = "org.genivi.poiservice.POIContentAccessModule";
+static const char* contentAccessModule_SERVICE_NAME = "org.genivi.navigation.poiservice.POIContentAccessModule";
 static const char* contentAccessModule_OBJECT_PATH = "/org/genivi/poiservice/POIContentAccessModule";
-static const char* poiContentAccess_SERVICE_NAME = "org.genivi.poiservice.POIContentAccess";
+static const char* poiContentAccess_SERVICE_NAME = "org.genivi.navigation.poiservice.POIContentAccess";
 static const char* poiContentAccess_OBJECT_PATH = "/org/genivi/poiservice/POIContentAccess";
 
 // SQL requests
diff --git a/test/poi-service/poi-contentaccess-module/poi-contentaccess-module-class.h b/test/poi-service/poi-contentaccess-module/poi-contentaccess-module-class.h
index 2b7d07f..124b1c1 100644
--- a/test/poi-service/poi-contentaccess-module/poi-contentaccess-module-class.h
+++ b/test/poi-service/poi-contentaccess-module/poi-contentaccess-module-class.h
@@ -58,7 +58,7 @@ class poiContentAccess;
 
 
 class  poiContentAccess
-: public org::genivi::poiservice::POIContentAccess_proxy,
+: public org::genivi::navigation::poiservice::POIContentAccess_proxy,
   public DBus::IntrospectableProxy,
   public DBus::ObjectProxy
 {
@@ -75,7 +75,7 @@ private:
 
 
 class  contentAccessModuleServer
-: public org::genivi::poiservice::POIContentAccessModule_adaptor,
+: public org::genivi::navigation::poiservice::POIContentAccessModule_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {