diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2016-07-05 17:07:17 +0200 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2016-07-05 17:07:17 +0200 |
| commit | 0cb3158c51cb3d167eabcfbe40930906592a08c2 (patch) | |
| tree | 0300327612c6e8db4b086c7de9f99e09243485ad /src | |
| parent | 6412262adc39b2db08ca27d0030c7103cb23a5fb (diff) | |
| download | poi-service-0cb3158c51cb3d167eabcfbe40930906592a08c2.tar.gz | |
add a test script for routing capi, but still a bug in setwaypoints :-(
Diffstat (limited to 'src')
| -rw-r--r-- | src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
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 ff97a77..3eb1449 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 @@ -45,6 +45,7 @@ #include "roadprofile.h" #include "map.h" #include "event.h" +#include <unistd.h> #include <CommonAPI/CommonAPI.hpp> #include <CommonTypes.hpp> @@ -341,6 +342,8 @@ 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(); } @@ -634,6 +637,8 @@ RoutingObj::GetCostModel(Routing::CostModel &CostModel) void RoutingObj::SetWaypoints(uint32_t SessionHandle, bool StartFromCurrentPosition, std::vector<Routing::WayPoint> Waypoints) { + Routing::WayPoint waypoint; + Routing::WayPoint::iterator it; if (StartFromCurrentPosition) { if (Waypoints.size() != 1) throw DBus::ErrorFailed("StartFromCurrentPosition is set, but Waypoint size is not 1"); @@ -642,9 +647,12 @@ RoutingObj::SetWaypoints(uint32_t SessionHandle, bool StartFromCurrentPosition, throw DBus::ErrorFailed("StartFromCurrentPosition is not set, but Waypoint size is not 2"); } for (size_t i=0 ; i < Waypoints.size(); i++) { - if (Waypoints[i].find(Routing::WaypointElementType::LATITUDE) == Waypoints[i].end()) + 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 (Waypoints[i].find(Routing::WaypointElementType::LONGITUDE) == Waypoints[i].end()) + if (waypoint.find(Routing::WaypointElementType::LONGITUDE) == waypoint.end()) throw DBus::ErrorInvalidArgs("Waypoint doesn't contain Longitude"); } m_startfromcurrentposition=StartFromCurrentPosition; |