GT-3227: Update of guidance, mapmatchedposition and routing

4 files changed, 11 insertions, 59 deletions

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 {

 

@@ -211,18 +198,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

 	**>

 	method startSimulation {

@@ -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 @@
         </doc>
       </arg>
     </method>
-    <method name="AddSimulationStatusListener">
-      <doc>
-        <line> AddSimulationStatusListener = Add this node as a listener to Simulation Status changes.</line>
-		<line>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.</line>
-      </doc>
-    </method>
-    <method name="RemoveSimulationStatusListener">
-      <doc>
-        <line> RemoveSimulationStatusListener = Remove this node as a listener to Simulation Status changes.</line>
-      </doc>
-    </method>
     <signal name="SimulationStatusChanged">
       <doc>
         <line>SimulationStatusChanged = This signal is emitted when the Simulation Status has changed</line>
@@ -118,18 +107,6 @@
         </doc>
       </arg>
     </method>
-    <method name="AddSimulationSpeedListener">
-      <doc>
-        <line> AddSimulationSpeedListener = Add this node as a listener to simulation speed factor changes.</line>
-		<line>Upon changes a SimulationSpeedChanged signal will be received.</line>
-		<line>NavigationCore will only send out a SimulationSpeedChanged signal if there is at least one node listening to these changes</line>
-      </doc>
-    </method>
-    <method name="RemoveSimulationSpeedListener">
-      <doc>
-        <line> RemoveSimulationSpeedListener = Remove this node as a listener to simulation speed factor changes.</line>
-      </doc>
-    </method>
     <signal name="SimulationSpeedChanged">
       <doc>
         <line>SimulationSpeedChanged = This signal is emitted when the simulation speed factor has changed</line>