From e599b957799ba65a1512711c0e2617f8fd3c0d2b Mon Sep 17 00:00:00 2001 From: asanoaozora Date: Mon, 14 Nov 2016 20:07:16 +0100 Subject: GT-3227: Update of guidance, mapmatchedposition and routing --- api/franca/navigation/navigationcore/Guidance.fidl | 4 +-- .../navigationcore/MapMatchedPosition.fidl | 35 ++++------------------ api/franca/navigation/navigationcore/Routing.fidl | 8 ++--- .../genivi-navigationcore-mapmatchedposition.xml | 23 -------------- 4 files changed, 11 insertions(+), 59 deletions(-) (limited to 'api') diff --git a/api/franca/navigation/navigationcore/Guidance.fidl b/api/franca/navigation/navigationcore/Guidance.fidl index 79dc029..e678e7a 100644 --- a/api/franca/navigation/navigationcore/Guidance.fidl +++ b/api/franca/navigation/navigationcore/Guidance.fidl @@ -90,8 +90,8 @@ interface Guidance { } enumeration RoadProperty extends BasicEnum { - UNDEFINED = 256 - TOLL_ROADS = 257 + DEFAULT = 65534 + TOLL_ROADS = 369 } enumeration RouteChangedCause extends BasicEnum { TRAFFIC = 528 diff --git a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl index 82f52f9..c7238e5 100644 --- a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl +++ b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl @@ -44,7 +44,9 @@ interface MapMatchedPosition { FULL_ADDRESS = 178 COUNTRYCODE = 179 HOUSENAME = 180 - POSTAL_CODE = 181 + POSTAL_CODE = 181 + ROAD_NUMBER = 334 + MATCH_TYPE = 240 } enumeration PositionStatus extends GeoLocalizedEnum { //Base 0x00e0 @@ -167,21 +169,6 @@ interface MapMatchedPosition { } } - <** - @description : AddSimulationStatusListener = Add this node as a listener to Simulation Status changes. - **> - method addSimulationStatusListener { - } - - <** - @description : RemoveSimulationStatusListener = Remove this node as a listener to Simulation Status changes. - **> - method removeSimulationStatusListener { - } - - <** - @description : setSimulationSpeed = This method sets the speed factor for the simulation mode - **> method setSimulationSpeed { in { @@ -210,18 +197,6 @@ interface MapMatchedPosition { } } - <** - @description : AddSimulationSpeedListener = Add this node as a listener to simulation speed factor changes. - **> - method addSimulationSpeedListener { - } - - <** - @description : RemoveSimulationSpeedListener = Remove this node as a listener to simulation speed factor changes. - **> - method removeSimulationSpeedListener { - } - <** @description : startSimulation = This method starts, or resumes, a Follow Active Route simulation **> @@ -323,7 +298,7 @@ interface MapMatchedPosition { <** @description : simulationStatusChanged = This signal is emitted when the Simulation Status has changed **> - broadcast simulationStatusChanged { + broadcast simulationStatusChanged selective { out { <** @@ -336,7 +311,7 @@ interface MapMatchedPosition { <** @description : simulationSpeedChanged = This signal is emitted when the simulation speed factor has changed **> - broadcast simulationSpeedChanged { + broadcast simulationSpeedChanged selective { out { <** diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl index 0001dc6..2c9d773 100644 --- a/api/franca/navigation/navigationcore/Routing.fidl +++ b/api/franca/navigation/navigationcore/Routing.fidl @@ -85,7 +85,7 @@ interface Routing { PreferenceMode to RoutePreferenceSource } - struct RoutePreference { + struct RoadPreference { PreferenceMode mode RoutePreferenceSource source } @@ -330,7 +330,7 @@ interface Routing { **> String countryCode - RoutePreference[] roadPreferenceList + RoadPreference[] roadPreferenceList ConditionPreference[] conditionPreferenceList } @@ -359,7 +359,7 @@ interface Routing { String countryCode } out { - RoutePreference[] roadPreferenceList + RoadPreference[] roadPreferenceList ConditionPreference[] conditionPreferenceList } } @@ -369,7 +369,7 @@ interface Routing { **> method getSupportedRoutePreferences { out { - RoutePreference[] routePreferencesList + RoadPreference[] routePreferencesList ConditionPreference[] conditionPreferenceList } } diff --git a/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml b/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml index 2d9a590..0470dd9 100644 --- a/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml +++ b/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml @@ -66,17 +66,6 @@ - - - AddSimulationStatusListener = Add this node as a listener to Simulation Status changes. - Upon changes a SimulationStatusChanged signal will be received. NavigationCore will only send out a SimulationStatusChanged signal if there is at least one node listening to these changes. - - - - - RemoveSimulationStatusListener = Remove this node as a listener to Simulation Status changes. - - SimulationStatusChanged = This signal is emitted when the Simulation Status has changed @@ -118,18 +107,6 @@ - - - AddSimulationSpeedListener = Add this node as a listener to simulation speed factor changes. - Upon changes a SimulationSpeedChanged signal will be received. - NavigationCore will only send out a SimulationSpeedChanged signal if there is at least one node listening to these changes - - - - - RemoveSimulationSpeedListener = Remove this node as a listener to simulation speed factor changes. - - SimulationSpeedChanged = This signal is emitted when the simulation speed factor has changed -- cgit v1.2.1