CommonAPI: poi service migrated (not tested yet)

3 files changed, 19 insertions, 9 deletions

diff --git a/api/franca/navigation/poiservice/POIConfiguration.fidl b/api/franca/navigation/poiservice/POIConfiguration.fidl
index 1507a92..5d3f12b 100644
--- a/api/franca/navigation/poiservice/POIConfiguration.fidl
+++ b/api/franca/navigation/poiservice/POIConfiguration.fidl
@@ -25,21 +25,31 @@ interface POIConfiguration {
 		}	
 	}		
 
+
     <** @description: Units of measurement**>
     enumeration UnitsOfMeasurementAttribute {
         INVALID 				= 0
         LENGTH 	= 49 //Base 0x0030
     }
 
-    union UnitsOfMeasurementValue {
-	    Int32 intValue
-	    Double doubleValue
-    }
+	enumeration UnitsOfMeasurementValue {
+		METER		= 50
+		MILE		= 51
+		KM			= 52
+		YARD		= 53
+		FOOT		= 54
+	}
+
+	array UnitsOfMeasurementListValue of UnitsOfMeasurementValue 
 
 	map UnitsOfMeasurement {
 		UnitsOfMeasurementAttribute to UnitsOfMeasurementValue
 	}
 
+	map UnitsOfMeasurementList {
+		UnitsOfMeasurementAttribute to UnitsOfMeasurementListValue
+	}
+	
 	enumeration Units {
 		METER		= 50
 		MILE		= 51
@@ -164,7 +174,7 @@ interface POIConfiguration {
 	method getSupportedUnitsOfMeasurement {
 		out {
 			<** @description : unitsOfMeasurementList = array[unitsOfMeasurement]**>
-			UnitsOfMeasurement unitsOfMeasurementList				
+			UnitsOfMeasurementList unitsOfMeasurementList				
 		}	
 	}	
 
diff --git a/api/franca/navigation/poiservice/POISearch.fidl b/api/franca/navigation/poiservice/POISearch.fidl
index 4fda51e..1824307 100644
--- a/api/franca/navigation/poiservice/POISearch.fidl
+++ b/api/franca/navigation/poiservice/POISearch.fidl
@@ -239,7 +239,7 @@ interface POISearch {
 	}	

 		

 	<**	@description : This signal indicates that one or more POI categories were added, updated or removed.**>	

-	broadcast CategoriesUpdated {

+	broadcast categoriesUpdated {

 		out {

 			<**	@description : List of POI categories modified or added.**>

 			CategoryAndReason[] poiCategories			

@@ -247,7 +247,7 @@ interface POISearch {
 	}

 	

 	<**	@description : This signal updates the search or proximity alert status of the specified handle.**>	

-	broadcast PoiStatus {

+	broadcast poiStatus {

 		out {

 			<** @description : poi search unique handle.**>

 			Handle poiSearchHandle				

@@ -257,7 +257,7 @@ interface POISearch {
 	}

 	

 	<**	@description : This signal updates in the poi results list.**>	

-	broadcast ResultListChanged {

+	broadcast resultListChanged {

 		out {

 			<** @description : poi search unique handle.**>

 			Handle poiSearchHandle				

diff --git a/api/franca/navigation/poiservice/POIServiceTypes.fidl b/api/franca/navigation/poiservice/POIServiceTypes.fidl
index 44f851b..1dca5c3 100644
--- a/api/franca/navigation/poiservice/POIServiceTypes.fidl
+++ b/api/franca/navigation/poiservice/POIServiceTypes.fidl
@@ -208,7 +208,7 @@ typeCollection POIServiceTypes {
 	

 

 	

-  	<** @description: Attribute associcated to an POI used in addPOI and POI Search Result(both CAM and Service)**>			

+  	<** @description: Attribute associated to an POI used in addPOI and POI Search Result(both CAM and Service)**>			

     struct PoiAttribute

     {

 		<** @description:attribute unique id (see data model)**>