CommonAPI: navigationcore routing plugin OK

7 files changed, 22 insertions, 16 deletions

diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt
index bb599cc..13eb1ae 100644
--- a/src/navigation/CMakeLists.txt
+++ b/src/navigation/CMakeLists.txt
@@ -144,6 +144,8 @@ add_subdirectory(navigation-core)
 
 add_subdirectory(map-viewer)
 
+add_subdirectory(poi-cam)
+
 if (NOT WITH_PLUGIN_MIGRATION)
-    add_subdirectory(poi-cam)
+#    add_subdirectory(poi-cam)
 endif()
diff --git a/src/navigation/map-viewer/CMakeLists.txt b/src/navigation/map-viewer/CMakeLists.txt
index ad8194d..e176cc3 100644
--- a/src/navigation/map-viewer/CMakeLists.txt
+++ b/src/navigation/map-viewer/CMakeLists.txt
@@ -89,11 +89,15 @@ if(${YOCTO_CONFIG})
     include_directories(${STAGING_INCDIR}/navit)
 endif()
 
+add_subdirectory(configuration-plugin)
+add_subdirectory(mapviewercontrol-plugin)
+add_subdirectory(session-plugin)
+
 if (WITH_PLUGIN_MIGRATION)
     set(FRANCA_DIR "${API_DIR}/franca")
-    add_subdirectory(configuration-server-plugin)
-    add_subdirectory(mapviewercontrol-server-plugin)
-    add_subdirectory(session-server-plugin)
+#    add_subdirectory(configuration-server-plugin)
+#    add_subdirectory(mapviewercontrol-server-plugin)
+#    add_subdirectory(session-server-plugin)
 else()
     add_subdirectory(configuration-plugin)
     add_subdirectory(mapviewercontrol-plugin)
diff --git a/src/navigation/navigation-core/CMakeLists.txt b/src/navigation/navigation-core/CMakeLists.txt
index 8723405..5f8e679 100644
--- a/src/navigation/navigation-core/CMakeLists.txt
+++ b/src/navigation/navigation-core/CMakeLists.txt
@@ -90,6 +90,8 @@ if(${YOCTO_CONFIG})
 endif()
 
 
+add_subdirectory(enhancedposition-plugin)
+
 if (WITH_PLUGIN_MIGRATION)
     set(FRANCA_DIR "${API_DIR}/franca")
     add_subdirectory(configuration-server-plugin)
@@ -98,8 +100,8 @@ if (WITH_PLUGIN_MIGRATION)
     add_subdirectory(mapmatchedposition-server-plugin)
     add_subdirectory(routing-server-plugin)
     add_subdirectory(session-server-plugin)
-    add_subdirectory(poicam-server-plugin)
-    add_subdirectory(enhancedposition-client-plugin)
+#    add_subdirectory(poicam-server-plugin)
+#    add_subdirectory(enhancedposition-client-plugin)
 else()
     add_subdirectory(configuration-plugin)
     add_subdirectory(locationinput-plugin)
diff --git a/src/navigation/navigation-core/locationinput-server-plugin/CMakeLists.txt b/src/navigation/navigation-core/locationinput-server-plugin/CMakeLists.txt
index c910984..5610143 100644
--- a/src/navigation/navigation-core/locationinput-server-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/locationinput-server-plugin/CMakeLists.txt
@@ -34,7 +34,7 @@ if(DBUS_LIB_PATH)
   message(STATUS "DBUS_LIB_PATH = " ${DBUS_LIB_PATH})
   set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
   set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
-  set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
+  set(DBUS_LIBRARIES ${DBUS_LIBDIR}/libdbus-1.so)
 else()
   message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
 endif()
@@ -98,9 +98,9 @@ link_directories(
 )
 
 set(LIBRARIES
-    ${DBUS_LIBRARIES}
     ${COMMONAPI_LIBRARIES}
     ${COMMONAPI_DBUS_LIBRARIES}
+    ${DBUS_LIBRARIES}
     ${GOBJECT_LIBRARIES}
     ${GLIB_LIBRARIES}
     ${DBUS_CPP_GLIB_LIBRARIES}
diff --git a/src/navigation/navigation-core/locationinput-server-plugin/genivi_navigationcore_locationinput.cxx b/src/navigation/navigation-core/locationinput-server-plugin/genivi_navigationcore_locationinput.cxx
index 2a987ed..37b52f2 100644
--- a/src/navigation/navigation-core/locationinput-server-plugin/genivi_navigationcore_locationinput.cxx
+++ b/src/navigation/navigation-core/locationinput-server-plugin/genivi_navigationcore_locationinput.cxx
@@ -121,7 +121,7 @@ public:
         uint32_t LocationInputHandle;
         dbg(lvl_debug,"enter\n");
         LocationInputHandle=FIRST_LOCATION_HANDLE;
-        while (mp_handles.count(LocationInputHandle)>0 ) {
+        while ((mp_handles.count(LocationInputHandle)>0 ) && (mp_handles[LocationInputHandle] != NULL)) {
             LocationInputHandle++;
             if (LocationInputHandle == MAX_LOCATION_HANDLES)
                 throw DBus::ErrorLimitsExceeded("Out of location handles");
@@ -140,10 +140,12 @@ public:
         {
             LocationInputObj *obj=mp_handles[_locationInputHandle];
             delete(obj);
+            mp_handles[_locationInputHandle]=NULL;
         }
         else {
             throw DBus::ErrorInvalidArgs("location handle invalid");
         }
+
         _reply();
     }
 
diff --git a/src/navigation/navigation-core/navit_genivi_navigationcore_capi.xsl b/src/navigation/navigation-core/navit_genivi_navigationcore_capi.xsl
index 94b92c9..68cd29d 100644
--- a/src/navigation/navigation-core/navit_genivi_navigationcore_capi.xsl
+++ b/src/navigation/navigation-core/navit_genivi_navigationcore_capi.xsl
@@ -35,9 +35,9 @@
 		<xsl:text>&#x0A;                </xsl:text>
 		<plugin path="../../navigation-core/mapmatchedposition-server-plugin/.libs/libgenivi_navigationcore_mapmatchedposition_server.so" ondemand="no"/>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../navigation-core/enhancedposition-client-plugin/.libs/libgenivi_positioning_enhancedposition_client.so" ondemand="no"/>
+		<plugin path="../../navigation-core/enhancedposition-plugin/.libs/libgenivi_positioning_enhancedposition.so" ondemand="no"/>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../navigation-core/poicam-server-plugin/.libs/libgenivi_poiservice_cam_server.so" ondemand="no"/>
+		<plugin path="../../poi-cam/.libs/libgenivi_poiservice_cam_navit.so" ondemand="no"/>
         </xsl:template>
         <xsl:template match="/config/plugins/plugin">
 		<xsl:copy><xsl:apply-templates select="@*|node()"/></xsl:copy>
diff --git a/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx
index 3eb1449..5032f36 100644
--- a/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx
+++ b/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx
@@ -342,8 +342,6 @@ class  RoutingServerStub : public RoutingStubDefault
         RoutingObj *obj=mp_handles[_routeHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Route handle invalid");
-        printf("0\n");
-
         obj->SetWaypoints(_sessionHandle, _startFromCurrentPosition, _waypointsList);
         _reply();
     }
@@ -648,8 +646,6 @@ RoutingObj::SetWaypoints(uint32_t SessionHandle, bool StartFromCurrentPosition,
     }
     for (size_t i=0 ; i < Waypoints.size(); i++) {
         waypoint = Waypoints[i];
-        printf("0\n");
-        printf("%d",waypoint[Routing::WaypointElementType::LATITUDE]);
         if (waypoint.find(Routing::WaypointElementType::LATITUDE) == waypoint.end())
             throw DBus::ErrorInvalidArgs("Waypoint doesn't contain Latitude");
         if (waypoint.find(Routing::WaypointElementType::LONGITUDE) == waypoint.end())
@@ -688,7 +684,7 @@ RoutingObj::CalculateRoute(uint32_t SessionHandle)
     struct pcoord pc;
 
     if (!m_waypoints.size())
-        throw DBus::ErrorFailed("no waipoints set");
+        throw DBus::ErrorFailed("no waypoints set");
     route_set_profile(m_route.u.route,m_vehicleprofile.u.vehicleprofile);
     if (!m_startfromcurrentposition) {
         route_set_destination(m_route.u.route, NULL, 0);