From af9921122b0799c19634792131a152a6db6dbfa3 Mon Sep 17 00:00:00 2001
From:  <philippe colliot>
Date: Tue, 8 Mar 2016 17:39:26 +0100
Subject: Push preliminary work for W3C POC, based on nodejs and HTML

---
 api/franca/navigation/NavigationTypes.fidl                     |  1 -
 api/franca/navigation/mapviewer/MapViewerConfiguration.fidl    |  2 +-
 .../navigation/navigationcore/NavigationCoreConfiguration.fidl | 10 +++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'api')

diff --git a/api/franca/navigation/NavigationTypes.fidl b/api/franca/navigation/NavigationTypes.fidl
index a4800c2..1a51aa8 100755
--- a/api/franca/navigation/NavigationTypes.fidl
+++ b/api/franca/navigation/NavigationTypes.fidl
@@ -58,7 +58,6 @@ typeCollection NavigationTypes {
 
 /* enumerations */
 	
-// for the time being, no use of inheritance (extends) for the enumerations, to be implemented later
 	enumeration BasicEnum {
 		INVALID 	= 0
 	}
diff --git a/api/franca/navigation/mapviewer/MapViewerConfiguration.fidl b/api/franca/navigation/mapviewer/MapViewerConfiguration.fidl
index bc22502..66c8d01 100644
--- a/api/franca/navigation/mapviewer/MapViewerConfiguration.fidl
+++ b/api/franca/navigation/mapviewer/MapViewerConfiguration.fidl
@@ -11,7 +11,7 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
 
 
 <** @description : This interface offers methods that implement the map viewer configuration functionality of a navigation system.**>
-interface MapViewerConfiguration {
+interface Configuration {
 	version {
 		major 0 
 		minor 1
diff --git a/api/franca/navigation/navigationcore/NavigationCoreConfiguration.fidl b/api/franca/navigation/navigationcore/NavigationCoreConfiguration.fidl
index 1ca1ac9..73caead 100644
--- a/api/franca/navigation/navigationcore/NavigationCoreConfiguration.fidl
+++ b/api/franca/navigation/navigationcore/NavigationCoreConfiguration.fidl
@@ -11,7 +11,7 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
 
 
 <** @description : This interface offers methods that implement the navigation core configuration functionality of a navigation system.**>
-interface NavigationCoreConfiguration {
+interface Configuration {
 	version {
 		major 0 
 		minor 1
@@ -146,7 +146,7 @@ interface NavigationCoreConfiguration {
 	<**	@description : Get the supported set of coordinates format .**>
 	method getSupportedCoordinatesFormat {
 		out {
-			<** @description : array[struct(languageCode,countryCode,scriptCode)]**>
+			<** @description : array[coordinatesFormat]**>
 			CoordinatesFormat[] coordinatesFormatList				
 		}	
 	}	
@@ -155,7 +155,7 @@ interface NavigationCoreConfiguration {
 	method setUnitsOfMeasurement {
 		in {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
-			UnitsOfMeasurement unitsOfMeasurementList				
+			UnitsOfMeasurement[] unitsOfMeasurementList				
 		}	
 	}	
 
@@ -163,7 +163,7 @@ interface NavigationCoreConfiguration {
 	method getUnitsOfMeasurement {
 		out {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
-			UnitsOfMeasurement unitsOfMeasurementList				
+			UnitsOfMeasurement[] unitsOfMeasurementList				
 		}	
 	}	
 
@@ -171,7 +171,7 @@ interface NavigationCoreConfiguration {
 	method getSupportedUnitsOfMeasurement {
 		out {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
-			UnitsOfMeasurement unitsOfMeasurementList				
+			UnitsOfMeasurement[] unitsOfMeasurementList				
 		}	
 	}	
 
-- 
cgit v1.2.1