Some update of the franca files, remove unnecessary Types files

18 files changed, 985 insertions, 947 deletions

diff --git a/api/franca/navigation/NavigationTypes.fidl b/api/franca/navigation/NavigationTypes.fidl
index 5257d1f..5870507 100755
--- a/api/franca/navigation/NavigationTypes.fidl
+++ b/api/franca/navigation/NavigationTypes.fidl
@@ -20,11 +20,10 @@ typeCollection NavigationTypes {
 		String date

 	}

 

+	<** @description: Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value.**>

 	typedef Handle is UInt32

 

-    <** @description: Handle to a location.

-    	Range[0:0x7fffffff]

-	**>

+    <** @description: Handle to a location.**>

     typedef LocationHandle is Handle	

 

 

@@ -75,6 +74,20 @@ typeCollection NavigationTypes {
 		INVALID 	= 0

 	}

 

+	enumeration TimeFormat extends BasicEnum{

+		TWELVEH     = 1

+		TWENTYFOURH	= 2

+	}

+

+	enumeration SessionStatus extends BasicEnum{

+		AVAILABLE = 1

+		NOT_AVAILABLE = 2

+	}

+

+	struct Session {

+		Handle sessionHandle

+		String client

+	}

 	enumeration Units {

 		METER		= 50

 		MILE		= 51

@@ -82,13 +95,7 @@ typeCollection NavigationTypes {
 		YARD		= 53

 		FOOT		= 54

 	}

-

-	enumeration TimeFormat {

-		INVALID		= 0

-		TWELVEH     = 1

-		TWENTYFOURH	= 2

-	}

-

+	

 	struct Locale

 	{

 		<** @description : the language used. ISO 639‐3 language code (lower case)**>

diff --git a/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl b/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl
index 6eebedd..afc3e50 100755
--- a/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl
+++ b/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl
@@ -334,7 +334,7 @@ interface FreeTextSearch {
         You will still get a done response on the previous request.
         This way each request gets a response.
     **>
-    method FtsRequest {
+    method ftsRequest {
         in {
     	 	<** @description: Identifier to match responses to this request. **>
     	 	RequestId requestId
@@ -390,7 +390,7 @@ interface FreeTextSearch {
         If there is no search request done before or if a search request is still in progress
         hen the FtsDone response will return a EStatusNoSearchToContinue status.
     **>
-    method FtsNextPage {
+    method ftsNextPage {
     	in {
     	 	<** @description: Identifier to match responses to this request. **>
     	 	RequestId requestId
@@ -406,7 +406,7 @@ interface FreeTextSearch {
     }
 
      <** @description: Cancel the last FTS request. **>
-    method FtsCancel {
+    method ftsCancel {
     	in {
 			<** @description: Handle to identify the Free Text Search session.
 			**>
@@ -416,7 +416,7 @@ interface FreeTextSearch {
 
 	
 	<**	@description : Response indicating that the search is done. **>	
-	broadcast FtsDone selective {
+	broadcast ftsDone selective {
 		out {
     	 	<** @description: Identifier to match this response with a request. **>
     	 	RequestId requestId
@@ -427,7 +427,7 @@ interface FreeTextSearch {
 	
 	
 	<**	@description : Response with address results. **>	
-	broadcast FtsResultAddresses selective {
+	broadcast ftsResultAddresses selective {
 		out {
     	 	<** @description: Identifier to match this response with a request. **>
     	 	RequestId requestId
@@ -442,7 +442,7 @@ interface FreeTextSearch {
 	}
 	
 	<**	@description : Response with POI results. **>	
-	broadcast FtsResultPois selective {
+	broadcast ftsResultPois selective {
 		out {
     	 	<** @description: Identifier to match this response with a request. **>
     	 	RequestId requestId
@@ -458,7 +458,7 @@ interface FreeTextSearch {
 	
 	
 	<**	@description : Response with POI category suggestions. **>	
-	broadcast FtsResultPoiSuggestions selective {
+	broadcast ftsResultPoiSuggestions selective {
 		out {
     	 	<** @description: Identifier to match this response with a request. **>
     	 	RequestId requestId
@@ -469,7 +469,7 @@ interface FreeTextSearch {
 	
 	
 	<**	@description : Release handle(s) if they are not used anymore. **>	
-	method DeleteLocationHandles {
+	method deleteLocationHandles {
 		in {
     	 	<** @description: list of handles to release. **>
     	 	LocationHandleList locationHandleList
diff --git a/api/franca/navigation/mapviewer/MapViewerConfiguration.fidl b/api/franca/navigation/mapviewer/MapViewerConfiguration.fidl
index 0e8a0c7..bc22502 100644
--- a/api/franca/navigation/mapviewer/MapViewerConfiguration.fidl
+++ b/api/franca/navigation/mapviewer/MapViewerConfiguration.fidl
@@ -4,7 +4,7 @@
 // Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
 // this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 
-package org.genivi.navigation.navigationcore
+package org.genivi.navigation.mapviewer
 
 import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"
 import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
@@ -104,7 +104,7 @@ interface MapViewerConfiguration {
 	}	
 
 	<**	@description : Set the time format.**>
-	method SetTimeFormat {
+	method setTimeFormat {
 		in {
 			<** @description : timeFormat = enum(INVALID,12H,24H, ... ). **>
 			TimeFormat format				
@@ -112,7 +112,7 @@ interface MapViewerConfiguration {
 	}	
 
 	<**	@description : Get the current time format .**>
-	method GetTimeFormat {
+	method getTimeFormat {
 		out {
 			<** @description : timeFormat = enum(INVALID,12H,24H, ... ). **>
 			TimeFormat format				
@@ -120,7 +120,7 @@ interface MapViewerConfiguration {
 	}	
 
 	<**	@description : Get the supported set of time format .**>
-	method GetSupportedTimeFormats {
+	method getSupportedTimeFormats {
 		out {
 			<** @description : timeFormatList = array[timeFormat] .**>
 			TimeFormat[] timeFormatList				
@@ -128,7 +128,7 @@ interface MapViewerConfiguration {
 	}	
 
 	<**	@description : Set the coordinates format.**>
-	method SetCoordinatesFormat {
+	method setCoordinatesFormat {
 		in {
 			<** @description : coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )**>
 			CoordinatesFormat coordinatesFormat				
@@ -136,7 +136,7 @@ interface MapViewerConfiguration {
 	}	
 
 	<**	@description : Get the coordinates format .**>
-	method GetCoordinatesFormat {
+	method getCoordinatesFormat {
 		out {
 			<** @description : coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )**>
 			CoordinatesFormat coordinatesFormat				
@@ -152,7 +152,7 @@ interface MapViewerConfiguration {
 	}	
 
 	<**	@description : Set the units of measurement .**>
-	method SetUnitsOfMeasurement {
+	method setUnitsOfMeasurement {
 		in {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
 			UnitsOfMeasurement unitsOfMeasurementList				
@@ -160,7 +160,7 @@ interface MapViewerConfiguration {
 	}	
 
 	<**	@description : Get the units of measurement .**>
-	method GetUnitsOfMeasurement {
+	method getUnitsOfMeasurement {
 		out {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
 			UnitsOfMeasurement unitsOfMeasurementList				
@@ -168,7 +168,7 @@ interface MapViewerConfiguration {
 	}	
 
 	<**	@description : Get the supported set of units of measurement .**>
-	method GetSupportedUnitsOfMeasurement {
+	method getSupportedUnitsOfMeasurement {
 		out {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
 			UnitsOfMeasurement unitsOfMeasurementList				
@@ -178,7 +178,7 @@ interface MapViewerConfiguration {
 	<**
 		@description : ConfigurationChanged = This signal is sent to the clients when one or more configuration settings changes
 	**>
-	broadcast ConfigurationChanged {
+	broadcast configurationChanged {
 		out {
 
 			<**
diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl
index 5702dd7..629ddcf 100755
--- a/api/franca/navigation/mapviewer/MapViewerControl.fidl
+++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl
@@ -4,22 +4,274 @@
 // Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with

 // this file, you can obtain one at http://mozilla.org/MPL/2.0/.

 

-package org.genivi.navigation.navigationcore

+package org.genivi.navigation.mapviewer

 

 import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"

 import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"

-import org.genivi.navigation.navigationcore.MapViewerControlTypes.* from "MapViewerControlTypes.fidl"

 

 <**

 	@description : MapViewerControl = This interface offers functions to control the MapViewer

 **>

-

 interface MapViewerControl {

 	version {

 		major 1 

 		minor 0

 	}

 

+	enumeration MapViewType extends BasicEnum { //Base 0x0010

+		MAIN_MAP		= 16

+		SPLIT_SCREEN	= 17		

+		GUIDING_MAP		= 18

+	}

+	

+	enumeration MapScaleMode extends BasicEnum { //Base 0x0110

+		AUTOMATIC		= 272

+		MANUAL			= 273

+		HYBRID			= 274

+	}

+

+	enumeration MapPerspective extends BasicEnum { //Base 0x0020

+		PERSPECTIVE_2D	= 32

+		PERSPECTIVE_3D	= 33

+	}

+

+	enumeration MapObject extends BasicEnum {

+		// TODO: Check which elements are really visible

+		DET_POI                           //Points Of Interest

+		DET_TTI                           //TTI elements

+		DET_ONE_WAY_STREET_ARROW          //Arrows marking one way streets

+		DET_CITY_NAME                     //City names

+		DET_ROAD_NAME                     //Road names

+		DET_MOTORWAY_EXIT_MARKER          //Motorway exit signs

+		DET_TRAFFIC_LIGHT                 //Traffic lights

+		DET_TRAFFIC_LIGHTS_ALONG_ROUTE    //Traffic lights along the route

+		DET_ROAD_ICON                     //Road icons

+		DET_DTM                           //Digital Terrain Model

+		DET_LANDMARKS_3D                  //3D landmarks

+		DET_FAVORITES                     //Saved favorite destinations

+		DET_ROUTE_BLOCKING                //Highlighting of blocked routes

+		DET_ROAD                          //Roads

+		DET_POLYGON                       //Polygons

+		DET_DESTINATION                   //Destination flag

+		DET_MANOEUVRE_MARKER              //Maneuvre point markers

+		DET_LANE_GUIDANCE_MARKER          //Lane guidance point markers

+		DET_ROUTE                         //Route

+		DET_MANOEUVRE_ARROW               //Maneuvre arrows

+		DET_TREKKING_TOUR                 //Trekking tours

+		DET_TTI_EDGE_HIGHLIGHTING         //TTI highlighted edges

+		DET_CITY_MARKER                   //City markers

+		DET_VEHICLE                       //Vehicle

+		DET_POLYGON_NAME                  //Name of polygons

+		DET_OFF_ROAD_ROUTE                //Connection line between end of a route and an off-road destination

+		DET_TTI_ARROW                     //Direction arrow for TTI messages

+		DET_POI_NAME                      //Points Of Interest with a label

+		DET_RASTER_MAP                    //Raster maps

+		DET_BREAD_CRUMB_TRAIL             //Line that connects bread crumbs (past positions)

+		DET_EDGE_HIGHLIGHTING             //Draw highlighted edges that were selected by MAP_POINT_QUERY0 - MAP_POINT_QUERY4.

+		DET_DIRECTION_ARROW               //Draw arrows that indicate driving or walking direction.

+		DET_CITY_BUILDINGS                //Render city buildings.

+		DET_FPS_DISPLAY                   //Measure and display frames per second.

+		DET_CROSSHAIR                     //Display cross-hair.

+		DET_DEVDROP_BANNER                //Enables drawing of a banner. The banner indicates that the current version is a developer's version. The banner is rendered across the display.

+		DET_FRAME_AROUND_MAP 			   //a frame is rendered around the map.

+		DET_CORONA                        //a corona is drawn around the earth.

+		DET_WATEREFFECT                   //Demo effect for water.

+		DET_TREES                         //Demo effect for trees.

+		DET_RAIN                          //Demo effect for rain.

+		DET_CITYMODEL_ROUTE_TRANSPARENCY  //Render buildings transparently around route.

+		DET_ROUTE_DESTINATION             //Render destination POIs (e.g. destination flags).

+		DET_RANGE_DISPLAY                 //Display range display.

+		DET_POI_BRANDS                    //Display branded POIs.

+		DET_WEATHER_MARKER                //DrawingElementType_DET_WEATHER_MARKER

+		DET_WEATHER_OVERLAY               //Weather map overlay

+		DET_WAYPOINT_ROUTE

+		DET_WAYPOINT_ROUTE_MARKER

+		DET_STENCIL		

+	}

+

+	enumeration PanAction extends BasicEnum { //Base 0x0100

+		PAN_START		= 256

+		PAN_TO			= 257

+		PAN_END			= 258

+	}

+	

+	enumeration Visibility extends BasicEnum { //Base 0x0040

+		VISIBLE			= 67

+		INVISIBLE		= 68

+		FROZEN			= 69

+	}

+

+	enumeration Level extends BasicEnum { //Base 0x0050

+		LEVEL_1			= 80

+		LEVEL_2			= 81

+		LEVEL_3			= 82

+		LEVEL_4			= 83

+		LEVEL_5			= 84

+	}

+

+	enumeration MapTheme extends BasicEnum {		

+		THEME_BMW_CLASSIC_DAY

+		THEME_BMW_CLASSIC_NIGHT

+		THEME_BMW_CLASSIC_TRAFFIC_DAY

+		THEME_BMW_CLASSIC_TRAFFIC_NIGHT

+		THEME_BMW_ALTERNATIVE_DAY

+		THEME_BMW_ALTERNATIVE_NIGHT

+		THEME_BMW_ALTERNATIVE_TRAFFIC_DAY

+		THEME_BMW_ALTERNATIVE_TRAFFIC_NIGHT

+		THEME_BMW_GUIDING

+

+		THEME_MINI_CLASSIC_DAY

+		THEME_MINI_CLASSIC_NIGHT

+		THEME_MINI_CLASSIC_TRAFFIC_DAY

+		THEME_MINI_CLASSIC_TRAFFIC_NIGHT

+		THEME_MINI_ALTERNATIVE_DAY

+		THEME_MINI_ALTERNATIVE_NIGHT

+		THEME_MINI_ALTERNATIVE_TRAFFIC_DAY

+		THEME_MINI_ALTERNATIVE_TRAFFIC_NIGHT

+		THEME_MINI_GUIDING

+

+		THEME_I_CLASSIC_DAY

+		THEME_I_CLASSIC_NIGHT

+		THEME_I_CLASSIC_TRAFFIC_DAY

+		THEME_I_CLASSIC_TRAFFIC_NIGHT

+		THEME_I_ALTERNATIVE_DAY

+		THEME_I_ALTERNATIVE_NIGHT

+		THEME_I_ALTERNATIVE_TRAFFIC_DAY

+		THEME_I_ALTERNATIVE_TRAFFIC_NIGHT

+		THEME_I_GUIDING						

+	}

+

+	<**

+		@description : struct generated for DBus argument CreateMapViewInstance_mapViewSize

+	**>

+	struct Dimension {

+		UInt16 horizontalSize

+		UInt16 verticalSize

+	}

+

+	map MapObjectVisibility {

+		MapObject to Boolean

+	}

+

+	enumeration MapScaleUnit extends BasicEnum { //Base 0x0030

+		METER		= 50

+		MILE		= 51

+		KM			= 52

+		YARD		= 53

+		FOOT		= 54

+	}

+

+	enumeration MapScaleType extends BasicEnum { //Base 0x0040

+		MIN			= 64

+		MAX			= 65

+		MID			= 66

+	}

+

+	enumeration SelectableMapType extends BasicEnum {

+        MET_POI = 2                            //POI.

+        MET_POLYGON = 3                        //Polygons.

+        MET_EDGE = 4                           //All edges except roads. E.g. railways rivers ferries.

+        MET_ROAD = 5                           //Road edges.

+        MET_ROAD_ICON = 6                      //Road icons.

+        MET_TTI_ICON = 7                       //TTI icons.

+        MET_TTI_EDGE = 8                       //TTI edge [Not yet supported].

+        MET_CITY_MARKER = 9                    //City names and city markers.

+        MET_ROUTE = 10                         //Tours.

+        MET_TREKKING_ROUTE = 11                //Trekking tours.

+        MET_POSITION = 12                      //Position.

+        MET_LANDMARK = 13                      //Landmarks.

+        MET_DESTINATION = 14                   //Destinations.

+        MET_FAVORITE = 15                      //Favorites.

+        MET_PICTURE = 16                       //Picture.

+        MET_GENERIC_MARKER  = 17                //Generic markers like weather markers.

+		

+		CUSTOM_ELEMENT		= 288 //Base 0x0120

+		CURRENT_POSITION	= 289

+		WAYPOINT			= 290

+		POI					= 291

+		TRAFFIC_INCIDENT	= 292	

+		ROUTE				= 293

+		GEOCOORDINATES		= 294

+	}

+

+	<**

+		@description : struct generated for DBus argument GetScaleList_scaleList

+	**>

+	struct MapScale {

+		UInt16 scaleId

+		UInt16 scaleValue

+		MapScaleUnit unit

+		UInt32 millimetersPerPixel

+	}

+

+

+	<**

+		@description : struct generated for DBus argument SetMapViewSaveArea_saveArea

+	**>

+	struct MapViewArea {

+		Double left

+		Double right

+		Double top

+		Double bottom

+	}

+

+	<**

+		@description : struct generated for DBus argument SetMapViewPan_pixelCoordinates

+	**>

+	struct Pixel {

+		UInt16 x

+		UInt16 y

+	}

+

+

+	<**

+		@description : struct generated for DBus argument GetDisplayedRoutes_displayedRoutes

+	**>

+	struct DisplayedRoute {

+		Handle	routeHandle

+		Boolean highlighted

+	}

+

+

+

+	<**

+		@description : struct generated for DBus argument DisplayCustomElements_customElementsElem4

+	**>

+	struct AnchorPoint {

+		Int16 x

+		Int16 y

+	}

+

+	<**

+		@description : struct generated for DBus argument DisplayCustomElements_customElements

+	**>

+	struct CustomElement {

+		String name

+		String iconUri

+		Coordinate2D coordinate

+		AnchorPoint elem4

+	}

+

+

+	map tCustomElementDict {

+		Handle to CustomElement

+	}

+

+	<**

+		@description : struct generated for DBus argument SelectElementsOnMap_selectedElements

+	**>

+	struct SelectedMapElement {

+		SelectableMapType type

+		Coordinate2D position

+		ElementValue value

+	}

+

+	union ElementValue {

+		Int32 trafficIncident

+		Handle handle

+		CustomElement element

+	}

+

 	<**

 		@description : getVersion = This method returns the API version implemented by the server application

 	**>

diff --git a/api/franca/navigation/mapviewer/MapViewerControlTypes.fidl b/api/franca/navigation/mapviewer/MapViewerControlTypes.fidl
deleted file mode 100755
index 013ac1d..0000000
--- a/api/franca/navigation/mapviewer/MapViewerControlTypes.fidl
+++ /dev/null
@@ -1,290 +0,0 @@
-// SPDX-License-Identifier: MPL-2.0

-// Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH,  Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD.,  Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH

-// This Source Code Form is subject to the terms of the

-// Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with

-// this file, you can obtain one at http://mozilla.org/MPL/2.0/.

-

-package org.genivi.navigation.navigationcore

-

-import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"

-

-typeCollection MapViewerControlTypes {

-	

-//	enumeration MapViewType extends BasicEnum { //Base 0x0010

-	enumeration MapViewType { //Base 0x0010

-		INVALID 	= 0

-		MAIN_MAP		= 16

-		SPLIT_SCREEN	= 17		

-		GUIDING_MAP		= 18

-	}

-	

-//	enumeration MapScaleMode extends BasicEnum { //Base 0x0110

-	enumeration MapScaleMode { //Base 0x0110

-		INVALID 	= 0

-		AUTOMATIC		= 272

-		MANUAL			= 273

-		HYBRID			= 274

-	}

-

-//	enumeration MapPerspective extends BasicEnum { //Base 0x0020

-	enumeration MapPerspective { //Base 0x0020

-		INVALID 	= 0

-		PERSPECTIVE_2D	= 32

-		PERSPECTIVE_3D	= 33

-	}

-

-//	enumeration MapObject extends BasicEnum {

-	enumeration MapObject {

-		INVALID 	= 0

-		// TODO: Check which elements are really visible

-		DET_POI                           //Points Of Interest

-		DET_TTI                           //TTI elements

-		DET_ONE_WAY_STREET_ARROW          //Arrows marking one way streets

-		DET_CITY_NAME                     //City names

-		DET_ROAD_NAME                     //Road names

-		DET_MOTORWAY_EXIT_MARKER          //Motorway exit signs

-		DET_TRAFFIC_LIGHT                 //Traffic lights

-		DET_TRAFFIC_LIGHTS_ALONG_ROUTE    //Traffic lights along the route

-		DET_ROAD_ICON                     //Road icons

-		DET_DTM                           //Digital Terrain Model

-		DET_LANDMARKS_3D                  //3D landmarks

-		DET_FAVORITES                     //Saved favorite destinations

-		DET_ROUTE_BLOCKING                //Highlighting of blocked routes

-		DET_ROAD                          //Roads

-		DET_POLYGON                       //Polygons

-		DET_DESTINATION                   //Destination flag

-		DET_MANOEUVRE_MARKER              //Maneuvre point markers

-		DET_LANE_GUIDANCE_MARKER          //Lane guidance point markers

-		DET_ROUTE                         //Route

-		DET_MANOEUVRE_ARROW               //Maneuvre arrows

-		DET_TREKKING_TOUR                 //Trekking tours

-		DET_TTI_EDGE_HIGHLIGHTING         //TTI highlighted edges

-		DET_CITY_MARKER                   //City markers

-		DET_VEHICLE                       //Vehicle

-		DET_POLYGON_NAME                  //Name of polygons

-		DET_OFF_ROAD_ROUTE                //Connection line between end of a route and an off-road destination

-		DET_TTI_ARROW                     //Direction arrow for TTI messages

-		DET_POI_NAME                      //Points Of Interest with a label

-		DET_RASTER_MAP                    //Raster maps

-		DET_BREAD_CRUMB_TRAIL             //Line that connects bread crumbs (past positions)

-		DET_EDGE_HIGHLIGHTING             //Draw highlighted edges that were selected by MAP_POINT_QUERY0 - MAP_POINT_QUERY4.

-		DET_DIRECTION_ARROW               //Draw arrows that indicate driving or walking direction.

-		DET_CITY_BUILDINGS                //Render city buildings.

-		DET_FPS_DISPLAY                   //Measure and display frames per second.

-		DET_CROSSHAIR                     //Display cross-hair.

-		DET_DEVDROP_BANNER                //Enables drawing of a banner. The banner indicates that the current version is a developer's version. The banner is rendered across the display.

-		DET_FRAME_AROUND_MAP 			   //a frame is rendered around the map.

-		DET_CORONA                        //a corona is drawn around the earth.

-		DET_WATEREFFECT                   //Demo effect for water.

-		DET_TREES                         //Demo effect for trees.

-		DET_RAIN                          //Demo effect for rain.

-		DET_CITYMODEL_ROUTE_TRANSPARENCY  //Render buildings transparently around route.

-		DET_ROUTE_DESTINATION             //Render destination POIs (e.g. destination flags).

-		DET_RANGE_DISPLAY                 //Display range display.

-		DET_POI_BRANDS                    //Display branded POIs.

-		DET_WEATHER_MARKER                //DrawingElementType_DET_WEATHER_MARKER

-		DET_WEATHER_OVERLAY               //Weather map overlay

-		DET_WAYPOINT_ROUTE

-		DET_WAYPOINT_ROUTE_MARKER

-		DET_STENCIL		

-	}

-

-//	enumeration PanAction extends BasicEnum { //Base 0x0100

-	enumeration PanAction { //Base 0x0100

-		INVALID 	= 0

-		PAN_START		= 256

-		PAN_TO			= 257

-		PAN_END			= 258

-	}

-	

-//	enumeration Visibility extends BasicEnum { //Base 0x0040

-	enumeration Visibility { //Base 0x0040

-		INVALID 	= 0

-		VISIBLE			= 67

-		INVISIBLE		= 68

-		FROZEN			= 69

-	}

-

-//	enumeration Level extends BasicEnum { //Base 0x0050

-	enumeration Level { //Base 0x0050

-		INVALID 	= 0

-		LEVEL_1			= 80

-		LEVEL_2			= 81

-		LEVEL_3			= 82

-		LEVEL_4			= 83

-		LEVEL_5			= 84

-	}

-

-//	enumeration MapTheme extends BasicEnum {		

-	enumeration MapTheme {		

-		INVALID 	= 0

-		THEME_BMW_CLASSIC_DAY

-		THEME_BMW_CLASSIC_NIGHT

-		THEME_BMW_CLASSIC_TRAFFIC_DAY

-		THEME_BMW_CLASSIC_TRAFFIC_NIGHT

-		THEME_BMW_ALTERNATIVE_DAY

-		THEME_BMW_ALTERNATIVE_NIGHT

-		THEME_BMW_ALTERNATIVE_TRAFFIC_DAY

-		THEME_BMW_ALTERNATIVE_TRAFFIC_NIGHT

-		THEME_BMW_GUIDING

-

-		THEME_MINI_CLASSIC_DAY

-		THEME_MINI_CLASSIC_NIGHT

-		THEME_MINI_CLASSIC_TRAFFIC_DAY

-		THEME_MINI_CLASSIC_TRAFFIC_NIGHT

-		THEME_MINI_ALTERNATIVE_DAY

-		THEME_MINI_ALTERNATIVE_NIGHT

-		THEME_MINI_ALTERNATIVE_TRAFFIC_DAY

-		THEME_MINI_ALTERNATIVE_TRAFFIC_NIGHT

-		THEME_MINI_GUIDING

-

-		THEME_I_CLASSIC_DAY

-		THEME_I_CLASSIC_NIGHT

-		THEME_I_CLASSIC_TRAFFIC_DAY

-		THEME_I_CLASSIC_TRAFFIC_NIGHT

-		THEME_I_ALTERNATIVE_DAY

-		THEME_I_ALTERNATIVE_NIGHT

-		THEME_I_ALTERNATIVE_TRAFFIC_DAY

-		THEME_I_ALTERNATIVE_TRAFFIC_NIGHT

-		THEME_I_GUIDING						

-	}

-

-	<**

-		@description : struct generated for DBus argument CreateMapViewInstance_mapViewSize

-	**>

-	struct Dimension {

-		UInt16 horizontalSize

-		UInt16 verticalSize

-	}

-

-	map MapObjectVisibility {

-		MapObject to Boolean

-	}

-

-//	enumeration MapScaleUnit extends BasicEnum { //Base 0x0030

-	enumeration MapScaleUnit { //Base 0x0030

-		INVALID 	= 0

-		METER		= 50

-		MILE		= 51

-		KM			= 52

-		YARD		= 53

-		FOOT		= 54

-	}

-

-//	enumeration MapScaleType extends BasicEnum { //Base 0x0040

-	enumeration MapScaleType { //Base 0x0040

-		INVALID 	= 0

-		MIN			= 64

-		MAX			= 65

-		MID			= 66

-	}

-

-//	enumeration SelectableMapType extends BasicEnum {

-	enumeration SelectableMapType {

-		INVALID 	= 0

-        MET_POI = 2                            //POI.

-        MET_POLYGON = 3                        //Polygons.

-        MET_EDGE = 4                           //All edges except roads. E.g. railways rivers ferries.

-        MET_ROAD = 5                           //Road edges.

-        MET_ROAD_ICON = 6                      //Road icons.

-        MET_TTI_ICON = 7                       //TTI icons.

-        MET_TTI_EDGE = 8                       //TTI edge [Not yet supported].

-        MET_CITY_MARKER = 9                    //City names and city markers.

-        MET_ROUTE = 10                         //Tours.

-        MET_TREKKING_ROUTE = 11                //Trekking tours.

-        MET_POSITION = 12                      //Position.

-        MET_LANDMARK = 13                      //Landmarks.

-        MET_DESTINATION = 14                   //Destinations.

-        MET_FAVORITE = 15                      //Favorites.

-        MET_PICTURE = 16                       //Picture.

-        MET_GENERIC_MARKER  = 17                //Generic markers like weather markers.

-		

-		CUSTOM_ELEMENT		= 288 //Base 0x0120

-		CURRENT_POSITION	= 289

-		WAYPOINT			= 290

-		POI					= 291

-		TRAFFIC_INCIDENT	= 292	

-		ROUTE				= 293

-		GEOCOORDINATES		= 294

-	}

-

-	<**

-		@description : struct generated for DBus argument GetScaleList_scaleList

-	**>

-	struct MapScale {

-		UInt16 scaleId

-		UInt16 scaleValue

-		MapScaleUnit unit

-		UInt32 millimetersPerPixel

-	}

-

-

-	<**

-		@description : struct generated for DBus argument SetMapViewSaveArea_saveArea

-	**>

-	struct MapViewArea {

-		Double left

-		Double right

-		Double top

-		Double bottom

-	}

-

-	<**

-		@description : struct generated for DBus argument SetMapViewPan_pixelCoordinates

-	**>

-	struct Pixel {

-		UInt16 x

-		UInt16 y

-	}

-

-

-	<**

-		@description : struct generated for DBus argument GetDisplayedRoutes_displayedRoutes

-	**>

-	struct DisplayedRoute {

-		Handle	routeHandle

-		Boolean highlighted

-	}

-

-

-

-	<**

-		@description : struct generated for DBus argument DisplayCustomElements_customElementsElem4

-	**>

-	struct AnchorPoint {

-		Int16 x

-		Int16 y

-	}

-

-	<**

-		@description : struct generated for DBus argument DisplayCustomElements_customElements

-	**>

-	struct CustomElement {

-		String name

-		String iconUri

-		Coordinate2D coordinate

-		AnchorPoint elem4

-	}

-

-

-	map tCustomElementDict {

-		Handle to CustomElement

-	}

-

-	<**

-		@description : struct generated for DBus argument SelectElementsOnMap_selectedElements

-	**>

-	struct SelectedMapElement {

-		SelectableMapType type

-		Coordinate2D position

-		ElementValue value

-	}

-

-	union ElementValue {

-		Int32 trafficIncident

-		Handle handle

-		CustomElement element

-	}

-	

-	

-}
\ No newline at end of file
diff --git a/api/franca/navigation/mapviewer/MapViewerSession.fidl b/api/franca/navigation/mapviewer/MapViewerSession.fidl
new file mode 100644
index 0000000..8f45ecf
--- /dev/null
+++ b/api/franca/navigation/mapviewer/MapViewerSession.fidl
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: MPL-2.0
+// Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH,  Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD.,  Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
+// This Source Code Form is subject to the terms of the
+// Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
+// this file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+package org.genivi.navigation.mapviewer
+
+import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"
+import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
+
+
+<** @description : This interface offers methods that implement the navigation core session functionality of a navigation system.**>
+interface MapViewerSession {
+	version {
+		major 0 
+		minor 1
+	}
+
+	<**	@description : This method returns the API version .**>
+	method getVersion {
+		out {
+			<** @description: .**>
+			Version ^version				
+		}	
+	}	
+
+	<** @description : createSession = This method creates a new session and retrieves a handle .**>
+	method createSession {
+		in {
+			<**
+				@description : client = name or identifier of the client application that requests a new session
+          		The navigation core must internally associate this name to the returned session handle
+          		This parameter can be used to identify the client application and determine if a given feature is enabled for it
+          	**>
+			String client
+		}
+		out {
+			<**	@description : sessionHandle **>
+			Handle sessionHandle
+		}
+		error {
+			<** @description: This error is generated if no more session handles are available **> 
+			NoMoreSessionHandles
+		}
+	}
+
+	<** @description : deleteSession = This method deletes a session and its associated resources .**>
+	method deleteSession {
+		in {
+			<**	@description : sessionHandle **>
+			Handle sessionHandle
+		}
+		error {
+			<** @description: This error is generated if an application tries to delete a session handle that is not available **> 
+			SessionNotAvailable
+		}
+	}
+
+	<**	@description : This method returns whether a given session handle is available or not (for example because it was deleted) .**>
+    method getSessionStatus {
+		in {
+			<**	@description : sessionHandle **>
+			Handle sessionHandle			
+		}   
+		out {
+			<**	@description : sessionStatus = enum(INVALID,AVAILABLE,NOT_AVAILABLE)**>
+			SessionStatus sessionStatus			
+		} 	
+    }
+    
+	<**	@description : This method returns a list of all available sessions .**>
+    method getAllSessions {
+		out {
+          <**	@description : sessionsList = array[struct(sessionHandle,client)]
+          client = name or identifier of the client application that requested the sessionHandle .**>
+			Session[] sessionsList
+		}    	
+    }
+    
+    <** @description : sessionDeleted = This signal is emitted when a session is deleted **>
+	broadcast sessionDeleted {
+		out {
+			<**	@description : sessionHandle **>
+			Handle sessionHandle			
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/api/franca/navigation/navigationcore/Guidance.fidl b/api/franca/navigation/navigationcore/Guidance.fidl
index 366414d..ad8c776 100644
--- a/api/franca/navigation/navigationcore/Guidance.fidl
+++ b/api/franca/navigation/navigationcore/Guidance.fidl
@@ -8,8 +8,6 @@ package org.genivi.navigation.navigationcore
 	

 import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"

 import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"

-import org.genivi.navigation.navigationcore.GuidanceTypes.* from "GuidanceTypes.fidl"

-

 

 <**

 	@description : Guidance = This interface offers functions that implement the route-guidance functionality of a navigation system

@@ -21,6 +19,151 @@ interface Guidance {
 		minor 0

 	}

 

+	enumeration Side extends BasicEnum {

+		LEFT = 128

+		RIGHT = 131

+		NOT_AVAILABLE = 2

+	}

+

+//	enumeration RoadProperty extends BasicEnum {

+		

+//	}

+	

+	enumeration LaneType extends BasicEnum {

+		LANE_INFO_BITMASK_STRAIGHT		= 1

+		LANE_INFO_BITMASK_SLIGHTRIGHT	= 2

+		LANE_INFO_BITMASK_RIGHT			= 4

+		LANE_INFO_BITMASK_SHARPRIGHT	= 8

+		LANE_INFO_BITMASK_RIGHTUTURN	= 16

+		LANE_INFO_BITMASK_SLIGHTLEFT	= 32

+		LANE_INFO_BITMASK_LEFT			= 64

+		LANE_INFO_BITMASK_SHARPLEFT		= 128

+		LANE_INFO_BITMASK_LEFTUTURN		= 256

+	}

+	

+	enumeration PromptMode extends BasicEnum { //Base 0x0040

+		DISABLED_PROMPT					= 65

+		AUTOMATIC_PROMPT				= 66

+		MANUAL_PROMPT					= 67

+	}

+	

+	enumeration ManeuverPhase extends BasicEnum { //Base 0x0050

+		CRUISE 				= 80

+		MANEUVER_APPEARED 	= 81

+		PRE_ADVICE 			= 82

+		ADVICE 				= 83

+		PASSED 				= 84

+	}

+

+	enumeration GuidanceStatus extends BasicEnum { //Base 0x0060

+		ACTIVE							= 96

+		INACTIVE						= 97

+	}

+	

+	enumeration ManeuverType extends BasicEnum { //Base 0x0070

+		STRAIGHT_ON					= 112

+		CROSSROAD					= 113

+		ROUNDABOUT					= 114

+		HIGHWAY_ENTER				= 115

+		HIGHWAY_EXIT				= 116

+		FOLLOW_SPECIFIC_LANE		= 117

+		DESTINATION					= 118

+		WAYPOINT					= 119

+		TURN						= 120

+		BIFURCATION					= 121

+	}

+	

+	enumeration ManeuverDirection extends BasicEnum { //Base 0x0080

+		LEFT							= 128

+		SLIGHT_LEFT						= 129

+		HARD_LEFT						= 130

+		RIGHT							= 131

+		SLIGHT_RIGHT					= 132

+		HARD_RIGHT						= 133

+		UTURN_RIGHT						= 134

+		UTURN_LEFT						= 135

+	}

+	

+	enumeration CalculationMode extends BasicEnum { //Base 0x0090

+		ALL_MANUAL						= 144

+		ALL_AUTOMATIC					= 145

+		TRAFFIC_MANUAL					= 146

+		OFF_ROUTE_MANUAL				= 147

+	}

+

+	enumeration RouteChangedCause extends BasicEnum { //Base 0x0210

+		TRAFFIC							= 528

+		OFF_ROUTE						= 529

+		MANUAL							= 530

+	}

+

+	enumeration ManeuverDirectionType extends BasicEnum { //Base 0x0240

+		DIRECTION					= 576

+		EXIT_NUMBER					= 577

+		ROAD_FORM					= 578

+		LANE_INFO					= 579

+	}

+

+	enumeration LaneDivider extends BasicEnum { //Base 0x0250

+		DIVIDER_UNDEFINED				= 592

+		DIVIDER_INTERRUPTEDLONG			= 593

+		DIVIDER_INTERRUPTEDSHORT		= 594

+		DIVIDER_SOLIDSINGLE				= 595

+		DIVIDER_SOLIDDOUBLE				= 596

+		DIVIDER_SOLIDINTERRUPTED		= 597

+		DIVIDER_INTERRUPTEDSOLID		= 598

+	}

+

+	struct tWaypointStruct {

+		UInt32 waypointOffset

+		UInt32 travelTime

+		Int32 direction

+		Side side

+		Int16 timeZone

+		Int16 daylightSavingTime

+		Boolean isDestination

+		UInt16 number

+	}

+

+	<**

+		@description : struct generated for DBus argument GetManeuversList_maneuversListElem6Elem4

+	**>

+	struct ManeuverSegment {

+		ManeuverType maneuver

+		UInt16 maneuverLength

+	}

+

+	<**

+		@description : struct generated for DBus argument GetManeuversList_maneuversListElem6Elem5

+	**>

+	struct ManeuverTurn {

+		ManeuverDirection maneuverDirection

+		String exitNumber

+	}

+

+	<**

+		@description : struct generated for DBus argument GetManeuversList_maneuversListElem6

+	**>

+	struct tManeuverItem {

+		UInt32 offsetOfManeuver

+		UInt32 travelTime

+		Int32 direction

+		ManeuverSegment segment

+		ManeuverTurn turnTo

+	}

+

+	<**

+		@description : struct generated for DBus argument GetManeuversList_maneuversList

+	**>

+	struct Maneuver {

+		String roadNumberAfterManeuver

+		String roadNameAfterManeuver

+		UInt16 roadPropertyAfterManeuver

+		Side drivingSide

+		UInt32 offsetOfNextManeuver

+		tManeuverItem[] items

+	}

+

 	<**

 		@description : getVersion = This method returns the API version implemented by the server application

 	**>

diff --git a/api/franca/navigation/navigationcore/GuidanceTypes.fidl b/api/franca/navigation/navigationcore/GuidanceTypes.fidl
deleted file mode 100644
index f1dab9c..0000000
--- a/api/franca/navigation/navigationcore/GuidanceTypes.fidl
+++ /dev/null
@@ -1,181 +0,0 @@
-// SPDX-License-Identifier: MPL-2.0

-// Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH,  Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD.,  Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH

-// This Source Code Form is subject to the terms of the

-// Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with

-// this file, you can obtain one at http://mozilla.org/MPL/2.0/.

-

-package org.genivi.navigation.navigationcore

-import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"

-

-typeCollection GuidanceTypes {

-	

-//	enumeration Side extends BasicEnum {

-	enumeration Side {

-		INVALID 	= 0

-		LEFT = 128

-		RIGHT = 131

-		NOT_AVAILABLE = 2

-	}

-

-//	enumeration RoadProperty extends BasicEnum {

-	enumeration RoadProperty {

-		INVALID 	= 0

-		

-	}

-	

-//	enumeration LaneType extends BasicEnum {

-	enumeration LaneType {

-		INVALID 	= 0

-		LANE_INFO_BITMASK_STRAIGHT		= 1

-		LANE_INFO_BITMASK_SLIGHTRIGHT	= 2

-		LANE_INFO_BITMASK_RIGHT			= 4

-		LANE_INFO_BITMASK_SHARPRIGHT	= 8

-		LANE_INFO_BITMASK_RIGHTUTURN	= 16

-		LANE_INFO_BITMASK_SLIGHTLEFT	= 32

-		LANE_INFO_BITMASK_LEFT			= 64

-		LANE_INFO_BITMASK_SHARPLEFT		= 128

-		LANE_INFO_BITMASK_LEFTUTURN		= 256

-	}

-	

-//	enumeration PromptMode extends BasicEnum { //Base 0x0040

-	enumeration PromptMode { //Base 0x0040

-		INVALID 	= 0

-		DISABLED_PROMPT					= 65

-		AUTOMATIC_PROMPT				= 66

-		MANUAL_PROMPT					= 67

-	}

-	

-//	enumeration ManeuverPhase extends BasicEnum { //Base 0x0050

-	enumeration ManeuverPhase { //Base 0x0050

-		INVALID 	= 0

-		CRUISE 				= 80

-		MANEUVER_APPEARED 	= 81

-		PRE_ADVICE 			= 82

-		ADVICE 				= 83

-		PASSED 				= 84

-	}

-

-//	enumeration GuidanceStatus extends BasicEnum { //Base 0x0060

-	enumeration GuidanceStatus{ //Base 0x0060

-		INVALID 	= 0

-		ACTIVE							= 96

-		INACTIVE						= 97

-	}

-	

-//	enumeration ManeuverType extends BasicEnum { //Base 0x0070

-	enumeration ManeuverType { //Base 0x0070

-		INVALID 	= 0

-		STRAIGHT_ON					= 112

-		CROSSROAD					= 113

-		ROUNDABOUT					= 114

-		HIGHWAY_ENTER				= 115

-		HIGHWAY_EXIT				= 116

-		FOLLOW_SPECIFIC_LANE		= 117

-		DESTINATION					= 118

-		WAYPOINT					= 119

-		TURN						= 120

-		BIFURCATION					= 121

-	}

-	

-//	enumeration ManeuverDirection extends BasicEnum { //Base 0x0080

-	enumeration ManeuverDirection { //Base 0x0080

-		INVALID 	= 0

-		LEFT							= 128

-		SLIGHT_LEFT						= 129

-		HARD_LEFT						= 130

-		RIGHT							= 131

-		SLIGHT_RIGHT					= 132

-		HARD_RIGHT						= 133

-		UTURN_RIGHT						= 134

-		UTURN_LEFT						= 135

-	}

-	

-//	enumeration CalculationMode extends BasicEnum { //Base 0x0090

-	enumeration CalculationMode { //Base 0x0090

-		INVALID 	= 0

-		ALL_MANUAL						= 144

-		ALL_AUTOMATIC					= 145

-		TRAFFIC_MANUAL					= 146

-		OFF_ROUTE_MANUAL				= 147

-	}

-

-//	enumeration RouteChangedCause extends BasicEnum { //Base 0x0210

-	enumeration RouteChangedCause { //Base 0x0210

-		INVALID 	= 0

-		TRAFFIC							= 528

-		OFF_ROUTE						= 529

-		MANUAL							= 530

-	}

-

-//	enumeration ManeuverDirectionType extends BasicEnum { //Base 0x0240

-	enumeration ManeuverDirectionType{ //Base 0x0240

-		INVALID 	= 0

-		DIRECTION					= 576

-		EXIT_NUMBER					= 577

-		ROAD_FORM					= 578

-		LANE_INFO					= 579

-	}

-

-//	enumeration LaneDivider extends BasicEnum { //Base 0x0250

-	enumeration LaneDivider { //Base 0x0250

-		INVALID 	= 0

-		DIVIDER_UNDEFINED				= 592

-		DIVIDER_INTERRUPTEDLONG			= 593

-		DIVIDER_INTERRUPTEDSHORT		= 594

-		DIVIDER_SOLIDSINGLE				= 595

-		DIVIDER_SOLIDDOUBLE				= 596

-		DIVIDER_SOLIDINTERRUPTED		= 597

-		DIVIDER_INTERRUPTEDSOLID		= 598

-	}

-

-	struct tWaypointStruct {

-		UInt32 waypointOffset

-		UInt32 travelTime

-		Int32 direction

-		Side side

-		Int16 timeZone

-		Int16 daylightSavingTime

-		Boolean isDestination

-		UInt16 number

-	}

-

-	<**

-		@description : struct generated for DBus argument GetManeuversList_maneuversListElem6Elem4

-	**>

-	struct ManeuverSegment {

-		ManeuverType maneuver

-		UInt16 maneuverLength

-	}

-

-	<**

-		@description : struct generated for DBus argument GetManeuversList_maneuversListElem6Elem5

-	**>

-	struct ManeuverTurn {

-		ManeuverDirection maneuverDirection

-		String exitNumber

-	}

-

-	<**

-		@description : struct generated for DBus argument GetManeuversList_maneuversListElem6

-	**>

-	struct tManeuverItem {

-		UInt32 offsetOfManeuver

-		UInt32 travelTime

-		Int32 direction

-		ManeuverSegment segment

-		ManeuverTurn turnTo

-	}

-

-	<**

-		@description : struct generated for DBus argument GetManeuversList_maneuversList

-	**>

-	struct Maneuver {

-		String roadNumberAfterManeuver

-		String roadNameAfterManeuver

-		UInt16 roadPropertyAfterManeuver

-		Side drivingSide

-		UInt32 offsetOfNextManeuver

-		tManeuverItem[] items

-	}

-

-}
\ No newline at end of file
diff --git a/api/franca/navigation/navigationcore/LocationInput.fidl b/api/franca/navigation/navigationcore/LocationInput.fidl
index 4ceb99e..2fc5ccc 100644
--- a/api/franca/navigation/navigationcore/LocationInput.fidl
+++ b/api/franca/navigation/navigationcore/LocationInput.fidl
@@ -8,7 +8,7 @@ package org.genivi.navigation.navigationcore
 

 import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"

 import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"

-import org.genivi.navigation.navigationcore.LocationInputTypes.* from "LocationInputTypes.fidl"

+import org.genivi.navigation.navigationcore.NavigationCoreTypes.* from "NavigationCoreTypes.fidl"

 

 <**

 	@description : LocationInput = This interface offers functions that implement the location-input functionality of a navigation system

@@ -20,6 +20,55 @@ interface LocationInput {
 		minor 0

 	}

 

+	enumeration AddressAttribute extends GeoLocalizedEnum { //Base 0x00a0

+		COUNTRY			= 166

+		STATE			= 167

+		CITY			= 168

+		ZIPCODE			= 169

+		STREET			= 170

+		HOUSENUMBER		= 171

+		CROSSING		= 172

+		DISTRICT		= 173

+		PHONENUMBER		= 174

+		POINAME			= 175

+		TOWNCENTER		= 176

+		LOCATION_INPUT  = 177

+		FULL_ADDRESS	= 178

+		COUNTRYCODE		= 179

+		HOUSENAME		= 180

+		POSTAL_CODE		= 181

+	}

+	

+	enumeration SearchStatus extends BasicEnum { //Base 0x00c0

+  		SEARCHING		= 193

+  		FINISHED 		= 194		

+	}

+	

+	enumeration ValidationType extends BasicEnum { //Base 0x00d0

+		OK				= 208

+		UNKNOWN			= 209

+		AMBIGUOUS		= 210

+		INCONSISTENT	= 211

+	}

+	

+	array AddressAttributeList of AddressAttribute

+

+    union AddressValue {

+	    Int32 intValue

+	    Double doubleValue

+	    String stringValue

+	    Coordinate3D coordinateValue

+	    ByteBuffer internalData

+    }

+

+	map Address {

+		AddressAttribute to AddressValue

+	}

+

+	map ValidationStatus {

+		AddressAttribute to ValidationType

+	}	

+

 	<**

 		@description : getVersion = This method returns the API version implemented by the server application

 	**>

diff --git a/api/franca/navigation/navigationcore/LocationInputTypes.fidl b/api/franca/navigation/navigationcore/LocationInputTypes.fidl
deleted file mode 100644
index 9af5efa..0000000
--- a/api/franca/navigation/navigationcore/LocationInputTypes.fidl
+++ /dev/null
@@ -1,71 +0,0 @@
-// SPDX-License-Identifier: MPL-2.0

-// Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH,  Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD.,  Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH

-// This Source Code Form is subject to the terms of the

-// Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with

-// this file, you can obtain one at http://mozilla.org/MPL/2.0/.

-

-package org.genivi.navigation.navigationcore

-import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"

-

-typeCollection LocationInputTypes {

-	

-//	enumeration AddressAttribute extends GeoLocalizedEnum { //Base 0x00a0

-	enumeration AddressAttribute  { //Base 0x00a0

-		INVALID 	= 0

-		TIMESTAMP	= 16

-		LATITUDE	= 160

-		LONGITUDE	= 161

-		ALTITUDE	= 162

-		COUNTRY			= 166

-		STATE			= 167

-		CITY			= 168

-		ZIPCODE			= 169

-		STREET			= 170

-		HOUSENUMBER		= 171

-		CROSSING		= 172

-		DISTRICT		= 173

-		PHONENUMBER		= 174

-		POINAME			= 175

-		TOWNCENTER		= 176

-		LOCATION_INPUT  = 177

-		FULL_ADDRESS	= 178

-		COUNTRYCODE		= 179

-		HOUSENAME		= 180

-		POSTAL_CODE		= 181

-	}

-	

-//	enumeration SearchStatus extends BasicEnum {

-	enumeration SearchStatus { //Base 0x00c0

-		INVALID 	= 0

-  		SEARCHING		= 193

-  		FINISHED 		= 194		

-	}

-	

-//	enumeration ValidationType extends BasicEnum { //Base 0x00d0

-	enumeration ValidationType { //Base 0x00d0

-		INVALID 	= 0

-		OK				= 208

-		UNKNOWN			= 209

-		AMBIGUOUS		= 210

-		INCONSISTENT	= 211

-	}

-	

-	array AddressAttributeList of AddressAttribute

-

-    union AddressValue {

-	    Int32 intValue

-	    Double doubleValue

-	    String stringValue

-	    Coordinate3D coordinateValue

-	    ByteBuffer internalData

-    }

-

-	map Address {

-		AddressAttribute to AddressValue

-	}

-

-	map ValidationStatus {

-		AddressAttribute to ValidationType

-	}	

-	

-}

diff --git a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
index cf3ff04..e2e9fc8 100644
--- a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
+++ b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
@@ -8,7 +8,7 @@ package org.genivi.navigation.navigationcore
 

 import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"

 import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"

-import org.genivi.navigation.navigationcore.MapMatchedPositionTypes.* from "MapMatchedPositionTypes.fidl"

+import org.genivi.navigation.navigationcore.NavigationCoreTypes.* from "NavigationCoreTypes.fidl"

 

 <**

 	@description : MapMatchedPosition = This interface offers functions to retrieve the map matched position and to simulate positioning

@@ -20,6 +20,113 @@ interface MapMatchedPosition {
 		minor 0

 	}

 

+	enumeration PositionItemKey extends PositionStatus { //Base 0x00a0

+		HEADING				= 163

+		SPEED				= 164

+		CLIMB				= 165

+	}

+	

+	enumeration AddressItemKey  extends TimeStampedEnum {

+		TIMEZONE_OFFSET		= 17

+		DAYLIGHT_OFFSET		= 18

+		COUNTRY				= 166 //Base 0x00a0

+		STATE				= 167

+		CITY				= 168

+		ZIPCODE				= 169

+		STREET				= 170

+		HOUSENUMBER			= 171

+		CROSSING			= 172

+		DISTRICT			= 173

+		PHONENUMBER			= 174

+		POINAME				= 175

+		TOWNCENTER			= 176

+		LOCATION_INPUT		= 177

+		FULL_ADDRESS		= 178

+		COUNTRYCODE			= 179

+		HOUSENAME			= 180

+		POSTAL_CODE			= 181		

+	}

+		

+	enumeration PositionStatus extends GeoLocalizedEnum { //Base 0x00e0

+		GNSS_FIX_STATUS		= 224

+		DR_STATUS			= 225

+		MM_STATUS			= 226

+		SIMULATION_MODE		= 227		

+	}

+	

+	enumeration MatchMode { //Base 0x00f0

+		MATCH_TYPE			= 240

+		ON_ROAD				= 241

+		OFF_ROAD			= 242

+		ON_FERRY			= 243

+		IN_TUNNEL			= 244

+		ON_CARPARK			= 245

+	}		

+		

+	 enumeration GnnsFixStatus extends BasicEnum { //Base 0x0100

+	 	NO_FIX				= 256

+	 	TIME_FIX			= 257

+	 	FIX_2D				= 258 //2D_FIX is prohibited 

+	 	FIX_3D				= 259

+	}

+		

+	enumeration PositionOnSegmentKey extends TimeStampedEnum { //Base 0x0110

+		SEGMENT_ID				= 272

+		DIRECTION_ON_SEGMENT	= 274

+		DISTANCE_ON_SEGMENT		= 275

+	}

+	

+	enumeration SimulationStatus extends BasicEnum { //Base 0x0220

+		SIMULATION_STATUS_NO_SIMULATION		= 544

+		SIMULATION_STATUS_RUNNING			= 545

+		SIMULATION_STATUS_PAUSED			= 546

+		SIMULATION_STATUS_FIXED_POSITION	= 547

+	}

+	

+	union PositionItemValue {

+		Timestamp timestamp

+		Boolean status

+		GnnsFixStatus fix

+		Double doubleValue

+		Int32 intValue

+	}	

+		

+	map PositionItemDict {

+		PositionItemKey to PositionItemValue

+	}

+	

+	union AddressItemValue {

+		String addressField

+		Int16 offset

+		Timestamp timestamp

+		MatchMode matchMode

+	}

+	

+	map AddressItemDict {

+		AddressItemKey to AddressItemValue

+	}

+	

+	union PositionOnSegmentValue {

+		Boolean directionOnSegment

+		Double distanceOnSegment //to be fixed, use of DistanceInMeters preferred ?

+		ByteBuffer segment

+		Timestamp timestamp

+	}

+	

+	map PositionOnSegmentDict {

+		PositionOnSegmentKey to PositionOnSegmentValue

+	}

+	

+	union PositionStatusValue {

+		Boolean statusValue

+		GnnsFixStatus fixStatus

+		Timestamp timestamp

+	}

+	

+	map PositionStatusDict {

+		PositionStatus to PositionStatusValue

+	}

+

 	<**

 		@description : getVersion = This method returns the API version implemented by the server application

 	**>

diff --git a/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl b/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl
deleted file mode 100644
index cb38318..0000000
--- a/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl
+++ /dev/null
@@ -1,147 +0,0 @@
-// SPDX-License-Identifier: MPL-2.0

-// Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH,  Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD.,  Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH

-// This Source Code Form is subject to the terms of the

-// Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with

-// this file, you can obtain one at http://mozilla.org/MPL/2.0/.

-

-package org.genivi.navigation.navigationcore

-

-import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"

-

-typeCollection MapMatchedPositionTypes {

-	

-//	enumeration PositionItemKey extends PositionStatus { //Base 0x00a0

-	enumeration PositionItemKey { //Base 0x00a0

-		INVALID 	= 0

-		TIMESTAMP	= 16

-		LATITUDE	= 160

-		LONGITUDE	= 161

-		ALTITUDE	= 162

-		GNSS_FIX_STATUS		= 224

-		DR_STATUS			= 225

-		MM_STATUS			= 226

-		SIMULATION_MODE		= 227		

-		HEADING				= 163

-		SPEED				= 164

-		CLIMB				= 165

-	}

-	

-//	enumeration AddressItemKey  extends TimeStampedEnum {

-	enumeration AddressItemKey {

-		INVALID 	= 0

-		TIMESTAMP	= 16

-		TIMEZONE_OFFSET		= 17

-		DAYLIGHT_OFFSET		= 18

-		COUNTRY				= 166 //Base 0x00a0

-		STATE				= 167

-		CITY				= 168

-		ZIPCODE				= 169

-		STREET				= 170

-		HOUSENUMBER			= 171

-		CROSSING			= 172

-		DISTRICT			= 173

-		PHONENUMBER			= 174

-		POINAME				= 175

-		TOWNCENTER			= 176

-		LOCATION_INPUT		= 177

-		FULL_ADDRESS		= 178

-		COUNTRYCODE			= 179

-		HOUSENAME			= 180

-		POSTAL_CODE			= 181		

-	}

-		

-//	enumeration PositionStatus extends GeoLocalizedEnum { //Base 0x00e0

-	enumeration PositionStatus { //Base 0x00e0

-		INVALID 	= 0

-		TIMESTAMP	= 16

-		LATITUDE	= 160

-		LONGITUDE	= 161

-		ALTITUDE	= 162

-		GNSS_FIX_STATUS		= 224

-		DR_STATUS			= 225

-		MM_STATUS			= 226

-		SIMULATION_MODE		= 227		

-	}

-	

-	enumeration MatchMode { //Base 0x00f0

-		MATCH_TYPE			= 240

-		ON_ROAD				= 241

-		OFF_ROAD			= 242

-		ON_FERRY			= 243

-		IN_TUNNEL			= 244

-		ON_CARPARK			= 245

-	}		

-		

-//	 enumeration GnnsFixStatus extends BasicEnum { //Base 0x0100

-	 enumeration GnnsFixStatus { //Base 0x0100

-		INVALID 	= 0

-	 	NO_FIX				= 256

-	 	TIME_FIX			= 257

-	 	FIX_2D				= 258 //2D_FIX is prohibited 

-	 	FIX_3D				= 259

-	}

-		

-//	enumeration PositionOnSegmentKey extends TimeStampedEnum { //Base 0x0110

-	enumeration PositionOnSegmentKey { //Base 0x0110

-		INVALID 	= 0

-		TIMESTAMP	= 16

-		SEGMENT_ID				= 272

-		DIRECTION_ON_SEGMENT	= 274

-		DISTANCE_ON_SEGMENT		= 275

-	}

-	

-//	enumeration SimulationStatus extends BasicEnum { //Base 0x0220

-	enumeration SimulationStatus { //Base 0x0220

-		INVALID 	= 0

-		SIMULATION_STATUS_NO_SIMULATION		= 544

-		SIMULATION_STATUS_RUNNING			= 545

-		SIMULATION_STATUS_PAUSED			= 546

-		SIMULATION_STATUS_FIXED_POSITION	= 547

-	}

-	

-	union PositionItemValue {

-		Timestamp timestamp

-		Boolean status

-		GnnsFixStatus fix

-		Double doubleValue

-		Int32 intValue

-	}	

-		

-	map PositionItemDict {

-		PositionItemKey to PositionItemValue

-	}

-	

-	union AddressItemValue {

-		String addressField

-		Int16 offset

-		Timestamp timestamp

-		MatchMode matchMode

-	}

-	

-	map AddressItemDict {

-		AddressItemKey to AddressItemValue

-	}

-	

-	union PositionOnSegmentValue {

-		Boolean directionOnSegment

-		Double distanceOnSegment //to be fixed, use of DistanceInMeters preferred ?

-		ByteBuffer segment

-		Timestamp timestamp

-	}

-	

-	map PositionOnSegmentDict {

-		PositionOnSegmentKey to PositionOnSegmentValue

-	}

-	

-	union PositionStatusValue {

-		Boolean statusValue

-		GnnsFixStatus fixStatus

-		Timestamp timestamp

-	}

-	

-	map PositionStatusDict {

-		PositionStatus to PositionStatusValue

-	}

-

-	

-}
\ No newline at end of file
diff --git a/api/franca/navigation/navigationcore/NavigationCoreConfiguration.fidl b/api/franca/navigation/navigationcore/NavigationCoreConfiguration.fidl
index 21221dd..1ca1ac9 100644
--- a/api/franca/navigation/navigationcore/NavigationCoreConfiguration.fidl
+++ b/api/franca/navigation/navigationcore/NavigationCoreConfiguration.fidl
@@ -104,7 +104,7 @@ interface NavigationCoreConfiguration {
 	}	
 
 	<**	@description : Set the time format.**>
-	method SetTimeFormat {
+	method setTimeFormat {
 		in {
 			<** @description : timeFormat = enum(INVALID,12H,24H, ... ). **>
 			TimeFormat format				
@@ -112,7 +112,7 @@ interface NavigationCoreConfiguration {
 	}	
 
 	<**	@description : Get the current time format .**>
-	method GetTimeFormat {
+	method getTimeFormat {
 		out {
 			<** @description : timeFormat = enum(INVALID,12H,24H, ... ). **>
 			TimeFormat format				
@@ -120,7 +120,7 @@ interface NavigationCoreConfiguration {
 	}	
 
 	<**	@description : Get the supported set of time format .**>
-	method GetSupportedTimeFormats {
+	method getSupportedTimeFormats {
 		out {
 			<** @description : timeFormatList = array[timeFormat] .**>
 			TimeFormat[] timeFormatList				
@@ -128,7 +128,7 @@ interface NavigationCoreConfiguration {
 	}	
 
 	<**	@description : Set the coordinates format.**>
-	method SetCoordinatesFormat {
+	method setCoordinatesFormat {
 		in {
 			<** @description : coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )**>
 			CoordinatesFormat coordinatesFormat				
@@ -136,7 +136,7 @@ interface NavigationCoreConfiguration {
 	}	
 
 	<**	@description : Get the coordinates format .**>
-	method GetCoordinatesFormat {
+	method getCoordinatesFormat {
 		out {
 			<** @description : coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )**>
 			CoordinatesFormat coordinatesFormat				
@@ -152,7 +152,7 @@ interface NavigationCoreConfiguration {
 	}	
 
 	<**	@description : Set the units of measurement .**>
-	method SetUnitsOfMeasurement {
+	method setUnitsOfMeasurement {
 		in {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
 			UnitsOfMeasurement unitsOfMeasurementList				
@@ -160,7 +160,7 @@ interface NavigationCoreConfiguration {
 	}	
 
 	<**	@description : Get the units of measurement .**>
-	method GetUnitsOfMeasurement {
+	method getUnitsOfMeasurement {
 		out {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
 			UnitsOfMeasurement unitsOfMeasurementList				
@@ -168,7 +168,7 @@ interface NavigationCoreConfiguration {
 	}	
 
 	<**	@description : Get the supported set of units of measurement .**>
-	method GetSupportedUnitsOfMeasurement {
+	method getSupportedUnitsOfMeasurement {
 		out {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
 			UnitsOfMeasurement unitsOfMeasurementList				
@@ -178,7 +178,7 @@ interface NavigationCoreConfiguration {
 	<**
 		@description : ConfigurationChanged = This signal is sent to the clients when one or more configuration settings changes
 	**>
-	broadcast ConfigurationChanged {
+	broadcast configurationChanged {
 		out {
 
 			<**
diff --git a/api/franca/navigation/navigationcore/NavigationCoreSession.fidl b/api/franca/navigation/navigationcore/NavigationCoreSession.fidl
new file mode 100644
index 0000000..4cdda2a
--- /dev/null
+++ b/api/franca/navigation/navigationcore/NavigationCoreSession.fidl
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: MPL-2.0
+// Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH,  Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD.,  Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
+// This Source Code Form is subject to the terms of the
+// Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
+// this file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+package org.genivi.navigation.navigationcore
+
+import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"
+import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
+
+
+<** @description : This interface offers methods that implement the navigation core session functionality of a navigation system.**>
+interface NavigationCoreSession {
+	version {
+		major 0 
+		minor 1
+	}
+
+	<**	@description : This method returns the API version .**>
+	method getVersion {
+		out {
+			<** @description: .**>
+			Version ^version				
+		}	
+	}	
+
+	<** @description : createSession = This method creates a new session and retrieves a handle .**>
+	method createSession {
+		in {
+			<**
+				@description : client = name or identifier of the client application that requests a new session
+          		The navigation core must internally associate this name to the returned session handle
+          		This parameter can be used to identify the client application and determine if a given feature is enabled for it
+          	**>
+			String client
+		}
+		out {
+			<**	@description : sessionHandle **>
+			Handle sessionHandle
+		}
+		error {
+			<** @description: This error is generated if no more session handles are available **> 
+			NoMoreSessionHandles
+		}
+	}
+
+	<** @description : deleteSession = This method deletes a session and its associated resources .**>
+	method deleteSession {
+		in {
+			<**	@description : sessionHandle **>
+			Handle sessionHandle
+		}
+		error {
+			<** @description: This error is generated if an application tries to delete a session handle that is not available **> 
+			SessionNotAvailable
+		}
+	}
+
+	<**	@description : This method returns whether a given session handle is available or not (for example because it was deleted) .**>
+    method getSessionStatus {
+		in {
+			<**	@description : sessionHandle **>
+			Handle sessionHandle			
+		}   
+		out {
+			<**	@description : sessionStatus = enum(INVALID,AVAILABLE,NOT_AVAILABLE)**>
+			SessionStatus sessionStatus			
+		} 	
+    }
+    
+	<**	@description : This method returns a list of all available sessions .**>
+    method getAllSessions {
+		out {
+          <**	@description : sessionsList = array[struct(sessionHandle,client)]
+          client = name or identifier of the client application that requested the sessionHandle .**>
+			Session[] sessionsList
+		}    	
+    }
+    
+    <** @description : sessionDeleted = This signal is emitted when a session is deleted **>
+	broadcast sessionDeleted {
+		out {
+			<**	@description : sessionHandle **>
+			Handle sessionHandle			
+		}
+	}
+	
+}
diff --git a/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl b/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl
new file mode 100644
index 0000000..5ad0d0b
--- /dev/null
+++ b/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: MPL-2.0
+// Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH,  Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD.,  Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
+// This Source Code Form is subject to the terms of the
+// Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
+// this file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+package org.genivi.navigation.navigationcore
+import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"
+import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
+
+typeCollection NavigationCoreTypes {
+ 	enumeration TimeStampedEnum extends BasicEnum { //Base 0x0010
+		TIMESTAMP	= 16
+	}
+
+	enumeration GeoLocalizedEnum extends TimeStampedEnum { //Base 0x00a0
+		LATITUDE	= 160
+		LONGITUDE	= 161
+		ALTITUDE	= 162
+	}	
+}
diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl
index 3d4f7d4..ca6f97e 100644
--- a/api/franca/navigation/navigationcore/Routing.fidl
+++ b/api/franca/navigation/navigationcore/Routing.fidl
@@ -7,8 +7,8 @@
 package org.genivi.navigation.navigationcore

 

 import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"

-import org.genivi.navigation.navigationcore.RoutingTypes.* from "RoutingTypes.fidl"

 import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"

+import org.genivi.navigation.navigationcore.NavigationCoreTypes.* from "NavigationCoreTypes.fidl"

 

 

 <**

@@ -21,6 +21,180 @@ interface Routing {
 		minor 0

 	}

 

+	enumeration CalculationStatus extends BasicEnum { //Base 0x0130

+  		CALCULATION_OK				= 304

+		NO_POSITION					= 305		

+	}

+	

+	enumeration CalculationError extends BasicEnum {

+		UNMATCHED_POSITION			= 306

+		UNREACHABLE_DESTINATION		= 307

+		UNFULFILLED_PREFERENCE_MODE	= 308

+	}

+	

+	enumeration CostModel extends BasicEnum { //Base 0x0160

+		FASTEST			= 352	

+		SHORTEST		= 353

+		ECOLOGICAL		= 354

+		SCENIC			= 355

+		EASY			= 356

+		OFF_ROAD		= 357 //to be confirmed

+		BALANCED		= 358

+		CHEAPEST		= 359

+	}

+  

+	enumeration RoutePreferenceSource extends BasicEnum { //Base 0x0170

+		FERRY				= 368

+		TOLL_ROADS			= 369

+		TUNNELS				= 370

+		HIGHWAYS_MOTORWAYS	= 371

+		VEHICLE_SIZE_LIMIT	= 372

+		CRIME_AREAS			= 373	

+	} 	 	

+  

+ 	enumeration TransportationMeans extends BasicEnum { //Base 0x0180

+		BY_CAR						= 384 

+		ON_FOOT						= 385

+		LONG_RANGE_TRAINS			= 386

+		PUBLIC_TRANSPORTATION		= 387

+		BY_BICYCLE					= 388

+		BY_TRUCK					= 389

+	}

+	

+	enumeration Schedule extends BasicEnum { 

+		ARRIVAL_TIME  		= 394

+ 		ARRIVAL_DATE		= 395

+		DEPARTURE_TIME		= 396

+		DEPARTURE_DATE		= 397 

+	}

+

+	enumeration RouteOverviewType extends Schedule  {

+		TOTAL_TIME			= 398

+		TOTAL_DISTANCE		= 399

+	}

+	

+	enumeration PreferenceMode extends BasicEnum { //Base 0x0190

+ 		PROHIBIT		= 400

+ 		AVOID			= 401

+ 		USE				= 402

+ 		PREFER			= 403	

+ 		IGNORE			= 404	

+ 	}

+ 	 	

+  	enumeration ConditionPreferenceSource extends BasicEnum { //Base 0x0200

+  		TRAFFIC_REALTIME	= 512

+  	}

+ 	 	

+ 	 	

+	<**

+		@description : struct generated for DBus argument SetRoutePreferences_roadPreferenceList

+	**>

+	struct RoutePreference {

+		PreferenceMode mode

+		RoutePreferenceSource source

+	}

+

+	<**

+		@description : struct generated for DBus argument SetRoutePreferences_conditionPreferenceList

+	**>

+	struct ConditionPreference {

+		PreferenceMode mode

+		ConditionPreferenceSource source

+	}

+

+

+	map RouteSchedule {

+		Schedule to UInt32

+	}

+

+ 	enumeration TimeStampedEnum extends BasicEnum {

+		TIMESTAMP	= 16

+	}

+

+	enumeration GeoLocalizedEnum extends TimeStampedEnum {

+		LATITUDE	= 160

+		LONGITUDE	= 161

+		ALTITUDE	= 162

+	}

+	

+	enumeration WaypointElementType extends GeoLocalizedEnum {

+		WAYPOINT_TYPE		= 289

+		LOCATION_INPUT		= 17

+	}

+	

+	enumeration RouteSegmentType extends BasicEnum {

+		LINK_ID					= 320 		//Base 0x0140

+		START_LATITUDE			= 321

+		END_LATITUDE			= 322

+		START_LONGITUDE			= 323

+		END_LONGITUDE			= 324

+		START_ALTITUDE			= 325

+		END_ALTITUDE			= 326

+		ROAD_NAME				= 327

+		DISTANCE				= 328

+		TIME					= 329

+		MANEUVER				= 330

+		INSTRUCTION				= 331

+        BORDER_CROSSING			= 332

+        ADDITIONAL_INFORMATION	= 333

+		ROAD_NUMBER				= 334

+		START_OFFSET			= 335

+		INTERMEDIATE_POINTS		= 288

+        HIGHWAY_EXIT			= 116

+        ALL						= 65535

+	}

+	

+	enumeration IntermediatePointType {

+		HARD_POINT

+		SOFT_POINT

+	}

+	

+	union RouteOverviewItem {

+		UInt32 uValue

+	}

+	

+	struct IntermediatePoint extends Coordinate2D {

+		IntermediatePointType type

+	}

+	

+	//TODO: Incomplete

+	union RouteSegmentItem {

+		Double doubleValue // LATITUDE, LONGITUDE, ALTITUDE

+		IntermediatePoint intermediatePoints

+		String stringValue // ROAD_NUMBER

+		ByteBuffer linkId

+		Int32 int32Value

+		Int16 int16Value

+		UInt32 uInt32Value

+	}

+	

+	union WayPointItem {

+		Double coordinateValue

+		Int32 altitudeValue

+		IntermediatePointType wayPointValue

+		ByteBuffer metaData

+	}

+	

+	map WayPoint {

+		WaypointElementType to WayPointItem

+	}

+

+	map RouteSegment {

+		RouteSegmentType to RouteSegmentItem

+	}

+

+	map RouteOverview {

+		RouteOverviewType to RouteOverviewItem

+	}

+

+	<**

+		@description : struct generated for DBus argument SetBlockedRouteStretches_blockParameters

+	**>

+	struct BlockedRouteElement {

+		UInt32 offset

+		UInt32 length

+	}

+

 	<**

 		@description : This method returns the API version implemented by the server application

 	**>

diff --git a/api/franca/navigation/navigationcore/RoutingTypes.fidl b/api/franca/navigation/navigationcore/RoutingTypes.fidl
deleted file mode 100644
index 90c4293..0000000
--- a/api/franca/navigation/navigationcore/RoutingTypes.fidl
+++ /dev/null
@@ -1,204 +0,0 @@
-// SPDX-License-Identifier: MPL-2.0

-// Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH,  Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD.,  Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH

-// This Source Code Form is subject to the terms of the

-// Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with

-// this file, you can obtain one at http://mozilla.org/MPL/2.0/.

-

-package org.genivi.navigation.navigationcore

-

-import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"

-

-typeCollection RoutingTypes {

-	

-//	enumeration CalculationStatus extends BasicEnum { //Base 0x0130

-	enumeration CalculationStatus { //Base 0x0130

- 		INVALID 	= 0

-  		CALCULATION_OK				= 304

-		NO_POSITION					= 305		

-	}

-	

-//	enumeration CalculationError extends BasicEnum {

-	enumeration CalculationError {

-		INVALID 	= 0

-		UNMATCHED_POSITION			= 306

-		UNREACHABLE_DESTINATION		= 307

-		UNFULFILLED_PREFERENCE_MODE	= 308

-	}

-	

-//	enumeration CostModel extends BasicEnum { //Base 0x0160

-	enumeration CostModel { //Base 0x0160

-		INVALID 	= 0

-		FASTEST			= 352	

-		SHORTEST		= 353

-		ECOLOGICAL		= 354

-		SCENIC			= 355

-		EASY			= 356

-		OFF_ROAD		= 357 //to be confirmed

-		BALANCED		= 358

-		CHEAPEST		= 359

-	}

-  

-//	enumeration RoutePreferenceSource extends BasicEnum { //Base 0x0170

-	enumeration RoutePreferenceSource { //Base 0x0170

-		INVALID 	= 0

-		FERRY				= 368

-		TOLL_ROADS			= 369

-		TUNNELS				= 370

-		HIGHWAYS_MOTORWAYS	= 371

-		VEHICLE_SIZE_LIMIT	= 372

-		CRIME_AREAS			= 373	

-	} 	 	

-  

- //	enumeration TransportationMeans extends BasicEnum { //Base 0x0180

- 	enumeration TransportationMeans { //Base 0x0180

-		INVALID 	= 0

-		BY_CAR						= 384 

-		ON_FOOT						= 385

-		LONG_RANGE_TRAINS			= 386

-		PUBLIC_TRANSPORTATION		= 387

-		BY_BICYCLE					= 388

-		BY_TRUCK					= 389

-	}

-	

-//	enumeration Schedule extends BasicEnum { 

-	enumeration Schedule { 

-		INVALID 	= 0

-		ARRIVAL_TIME  		= 394

- 		ARRIVAL_DATE		= 395

-		DEPARTURE_TIME		= 396

-		DEPARTURE_DATE		= 397 

-	}

-

-	enumeration RouteOverviewType extends Schedule  {

-		TOTAL_TIME			= 398

-		TOTAL_DISTANCE		= 399

-	}

-	

-//	enumeration PreferenceMode extends BasicEnum { //Base 0x0190

-	enumeration PreferenceMode { //Base 0x0190

-		INVALID 	= 0

- 		PROHIBIT		= 400

- 		AVOID			= 401

- 		USE				= 402

- 		PREFER			= 403	

- 		IGNORE			= 404	

- 	}

- 	 	

-//  	enumeration ConditionPreferenceSource extends BasicEnum { //Base 0x0200

-  	enumeration ConditionPreferenceSource { //Base 0x0200

-		INVALID 	= 0

-  		TRAFFIC_REALTIME	= 512

-  	}

- 	 	

- 	 	

-	<**

-		@description : struct generated for DBus argument SetRoutePreferences_roadPreferenceList

-	**>

-	struct RoutePreference {

-		PreferenceMode mode

-		RoutePreferenceSource source

-	}

-

-	<**

-		@description : struct generated for DBus argument SetRoutePreferences_conditionPreferenceList

-	**>

-	struct ConditionPreference {

-		PreferenceMode mode

-		ConditionPreferenceSource source

-	}

-

-

-	map RouteSchedule {

-		Schedule to UInt32

-	}

-

- 	enumeration TimeStampedEnum extends BasicEnum {

-		TIMESTAMP	= 16

-	}

-

-	enumeration GeoLocalizedEnum extends TimeStampedEnum {

-		LATITUDE	= 160

-		LONGITUDE	= 161

-		ALTITUDE	= 162

-	}

-	

-	enumeration WaypointElementType extends GeoLocalizedEnum {

-		WAYPOINT_TYPE		= 289

-		LOCATION_INPUT		= 17

-	}

-	

-	enumeration RouteSegmentType extends BasicEnum {

-		LINK_ID					= 320 		//Base 0x0140

-		START_LATITUDE			= 321

-		END_LATITUDE			= 322

-		START_LONGITUDE			= 323

-		END_LONGITUDE			= 324

-		START_ALTITUDE			= 325

-		END_ALTITUDE			= 326

-		ROAD_NAME				= 327

-		DISTANCE				= 328

-		TIME					= 329

-		MANEUVER				= 330

-		INSTRUCTION				= 331

-        BORDER_CROSSING			= 332

-        ADDITIONAL_INFORMATION	= 333

-		ROAD_NUMBER				= 334

-		START_OFFSET			= 335

-		INTERMEDIATE_POINTS		= 288

-        HIGHWAY_EXIT			= 116

-        ALL						= 65535

-	}

-	

-	enumeration IntermediatePointType {

-		HARD_POINT

-		SOFT_POINT

-	}

-	

-	union RouteOverviewItem {

-		UInt32 uValue

-	}

-	

-	struct IntermediatePoint extends Coordinate2D {

-		IntermediatePointType type

-	}

-	

-	//TODO: Incomplete

-	union RouteSegmentItem {

-		Double doubleValue // LATITUDE, LONGITUDE, ALTITUDE

-		IntermediatePoint intermediatePoints

-		String stringValue // ROAD_NUMBER

-		ByteBuffer linkId

-		Int32 int32Value

-		Int16 int16Value

-		UInt32 uInt32Value

-	}

-	

-	union WayPointItem {

-		Double coordinateValue

-		Int32 altitudeValue

-		IntermediatePointType wayPointValue

-		ByteBuffer metaData

-	}

-	

-	map WayPoint {

-		WaypointElementType to WayPointItem

-	}

-

-	map RouteSegment {

-		RouteSegmentType to RouteSegmentItem

-	}

-

-	map RouteOverview {

-		RouteOverviewType to RouteOverviewItem

-	}

-

-	<**

-		@description : struct generated for DBus argument SetBlockedRouteStretches_blockParameters

-	**>

-	struct BlockedRouteElement {

-		UInt32 offset

-		UInt32 length

-	}

-	

-	

-}
\ No newline at end of file
diff --git a/api/franca/navigation/poiservice/POIConfiguration.fidl b/api/franca/navigation/poiservice/POIConfiguration.fidl
index acbe5b9..43ee539 100644
--- a/api/franca/navigation/poiservice/POIConfiguration.fidl
+++ b/api/franca/navigation/poiservice/POIConfiguration.fidl
@@ -105,7 +105,7 @@ interface POIConfiguration {
 	}	
 
 	<**	@description : Set the time format.**>
-	method SetTimeFormat {
+	method setTimeFormat {
 		in {
 			<** @description : timeFormat = enum(INVALID,12H,24H, ... ). **>
 			TimeFormat format				
@@ -113,7 +113,7 @@ interface POIConfiguration {
 	}	
 
 	<**	@description : Get the current time format .**>
-	method GetTimeFormat {
+	method getTimeFormat {
 		out {
 			<** @description : timeFormat = enum(INVALID,12H,24H, ... ). **>
 			TimeFormat format				
@@ -121,7 +121,7 @@ interface POIConfiguration {
 	}	
 
 	<**	@description : Get the supported set of time format .**>
-	method GetSupportedTimeFormats {
+	method getSupportedTimeFormats {
 		out {
 			<** @description : timeFormatList = array[timeFormat] .**>
 			TimeFormat[] timeFormatList				
@@ -129,7 +129,7 @@ interface POIConfiguration {
 	}	
 
 	<**	@description : Set the coordinates format.**>
-	method SetCoordinatesFormat {
+	method setCoordinatesFormat {
 		in {
 			<** @description : coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )**>
 			CoordinatesFormat coordinatesFormat				
@@ -137,7 +137,7 @@ interface POIConfiguration {
 	}	
 
 	<**	@description : Get the coordinates format .**>
-	method GetCoordinatesFormat {
+	method getCoordinatesFormat {
 		out {
 			<** @description : coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )**>
 			CoordinatesFormat coordinatesFormat				
@@ -153,7 +153,7 @@ interface POIConfiguration {
 	}	
 
 	<**	@description : Set the units of measurement .**>
-	method SetUnitsOfMeasurement {
+	method setUnitsOfMeasurement {
 		in {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
 			UnitsOfMeasurement unitsOfMeasurementList				
@@ -161,7 +161,7 @@ interface POIConfiguration {
 	}	
 
 	<**	@description : Get the units of measurement .**>
-	method GetUnitsOfMeasurement {
+	method getUnitsOfMeasurement {
 		out {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
 			UnitsOfMeasurement unitsOfMeasurementList				
@@ -169,7 +169,7 @@ interface POIConfiguration {
 	}	
 
 	<**	@description : Get the supported set of units of measurement .**>
-	method GetSupportedUnitsOfMeasurement {
+	method getSupportedUnitsOfMeasurement {
 		out {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
 			UnitsOfMeasurement unitsOfMeasurementList				
@@ -179,7 +179,7 @@ interface POIConfiguration {
 	<**
 		@description : ConfigurationChanged = This signal is sent to the clients when one or more configuration settings changes
 	**>
-	broadcast ConfigurationChanged {
+	broadcast configurationChanged {
 		out {
 
 			<**