summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasanoaozora <fifitaneki@hotmail.com>2017-01-30 13:28:53 +0100
committerasanoaozora <fifitaneki@hotmail.com>2017-01-30 13:28:53 +0100
commitb646039e2ae19f1b28d19a6348a649eca700f509 (patch)
treee0557e8b4908bdbc117cb495a45c63206a7d35f3
parent698db3fb9f68fcf76b01024f3836ff0cd1501c0a (diff)
downloadpoi-service-b646039e2ae19f1b28d19a6348a649eca700f509.tar.gz
GT-3473
-rw-r--r--api/franca/navigation/navigationcore/Routing.fidl4
-rw-r--r--api/navigation-core/genivi-navigationcore-routing.xml5
-rw-r--r--src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx4
-rw-r--r--src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx2
4 files changed, 12 insertions, 3 deletions
diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl
index 8ae1952..6b69dff 100644
--- a/api/franca/navigation/navigationcore/Routing.fidl
+++ b/api/franca/navigation/navigationcore/Routing.fidl
@@ -609,6 +609,10 @@ interface Routing {
@description : route handle of the calculated route for which alternatives should be calculated
**>
Handle calculatedRoute
+ <**
+ @description : indicates maximum number of alternative routes to be calculated
+ **>
+ UInt16 numberOfAlternativeRoutes
}
out {
Handle[] alternativeRoutesList
diff --git a/api/navigation-core/genivi-navigationcore-routing.xml b/api/navigation-core/genivi-navigationcore-routing.xml
index c102974..3b7f56d 100644
--- a/api/navigation-core/genivi-navigationcore-routing.xml
+++ b/api/navigation-core/genivi-navigationcore-routing.xml
@@ -647,6 +647,11 @@
<line>calculatedRoute = route handle of the calculated route for which alternatives should be calculated. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
</doc>
</arg>
+ <arg name="numberOfAlternativeRoutes" type="q" direction="in">
+ <doc>
+ <line>numberOfAlternativeRoutes = indicates maximum number of alternative routes to be calculated</line>
+ </doc>
+ </arg>
<arg name="error" type="i" direction="out">
</arg>
<arg name="alternativeRoutesList" type="au" direction="out">
diff --git a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
index ffca2f4..c54ac99 100644
--- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
+++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
@@ -354,8 +354,8 @@ class Routing
}
void
- CalculateAlternativeRoutes(const uint32_t& sessionHandle, const uint32_t& calculatedRoute, int32_t& error, std::vector< uint32_t >& alternativeRoutesList)
- {
+ CalculateAlternativeRoutes(const uint32_t& sessionHandle, const uint32_t& calculatedRoute, const uint16_t& numberOfAlternativeRoutes, int32_t& error, std::vector< uint32_t >& alternativeRoutesList)
+ {
throw DBus::ErrorNotSupported("Not yet supported");
}
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 585e8ac..c81017e 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
@@ -396,7 +396,7 @@ class RoutingServerStub : public RoutingStubDefault
* description: calculateAlternativeRoutes = This method allows a client to calculate alternative routes
* that differs from a calculated route
*/
- void calculateAlternativeRoutes(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _sessionHandle, ::v4::org::genivi::navigation::NavigationTypes::Handle _calculatedRoute, calculateAlternativeRoutesReply_t _reply) {
+ void calculateAlternativeRoutes(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _sessionHandle, ::v4::org::genivi::navigation::NavigationTypes::Handle _calculatedRoute, uint16_t _numberOfAlternativeRoutes, calculateAlternativeRoutesReply_t _reply) {
throw DBus::ErrorNotSupported("Not yet supported");
}