POI manager POCs built against commonAPI 3.1.5

5 files changed, 10 insertions, 20 deletions

diff --git a/api/franca/navigation/NavigationTypes.fidl b/api/franca/navigation/NavigationTypes.fidl
index 043b966..a4800c2 100755
--- a/api/franca/navigation/NavigationTypes.fidl
+++ b/api/franca/navigation/NavigationTypes.fidl
@@ -8,17 +8,6 @@ package org.genivi.navigation
 

 typeCollection NavigationTypes {

 

-	<** @description: version.**>			

-	struct Version {

-		<** @description : when the major changes, then backward compatibility with previous releases is not granted.**>

-		UInt16 ^versionMajor

-		<** @description : when the minor changes, then backward compatibility with previous releases is granted, but something changed in the implementation of the API (e.g. new methods may have been added).**>

-		UInt16 ^versionMinor

-		<** @description : when the micro changes, then backward compatibility with previous releases is granted (bug fixes or documentation modifications).**>

-		UInt16 ^versionMicro

-		<** @description : release date (e.g. 21-06-2011).**>

-		String date

-	}

 

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

 	typedef Handle is UInt32

diff --git a/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl b/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl
index bed885c..2fb84be 100755
--- a/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl
+++ b/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl
@@ -8,6 +8,7 @@
 
 package org.genivi.navigation.freetextsearchservice
 
+import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"
 import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
 
 <** @description : This interface allows a user to find locations by entering a single text string.
diff --git a/api/franca/navigation/poiservice/ContentAccessModule.fidl b/api/franca/navigation/poiservice/ContentAccessModule.fidl
index 3961b74..bd53b67 100644
--- a/api/franca/navigation/poiservice/ContentAccessModule.fidl
+++ b/api/franca/navigation/poiservice/ContentAccessModule.fidl
@@ -178,7 +178,7 @@ interface POIContentAccessModule {
 			<** @description : poi search unique handle.**>

 			Handle poiSearchHandle				

 			<** @description : List of attributes id to retrieve. This is optional and the list could be empty.**>

-			AttributeID[] attributes				

+			AttributeID[] attributeList				

 		}	

 		out {

 			<** @description : enum(INVALID,NOT_STARTED,SEARCHING,FINISHED, ... ).**>

diff --git a/api/franca/navigation/poiservice/POISearch.fidl b/api/franca/navigation/poiservice/POISearch.fidl
index e7ecbdf..8a8f249 100644
--- a/api/franca/navigation/poiservice/POISearch.fidl
+++ b/api/franca/navigation/poiservice/POISearch.fidl
@@ -213,7 +213,7 @@ interface POISearch {
 			<** @description : maximum number of elements that should be returned as result.**>

 			UInt16 maxWindowSize				

 			<** @description : List of attributes id to retrieve. This is optional and the list could be empty.**>

-			AttributeID[] attributes				

+			AttributeID[] attributeList				

 		}	

 		out {

 			<** @description : enum(INVALID,NOT_STARTED,SEARCHING,FINISHED, ... ).**>

diff --git a/api/franca/navigation/poiservice/POIServiceTypes.fidl b/api/franca/navigation/poiservice/POIServiceTypes.fidl
index ef36ecd..81b82e6 100644
--- a/api/franca/navigation/poiservice/POIServiceTypes.fidl
+++ b/api/franca/navigation/poiservice/POIServiceTypes.fidl
@@ -180,7 +180,7 @@ typeCollection POIServiceTypes {
 		<**	@description : struct(list of parents_id, icons, name, short_desc, media).**>

 		Details details

 		<**	@description : array[struct(name, type, array[struct(operator_id, operator_name)])].**>

-		CategoryAttribute[] attributes

+		CategoryAttribute[] attributeList

 		<**	@description : array[struct(id, name)].**>

 		CategorySortOption[] sortOptions

 	}

@@ -191,7 +191,7 @@ typeCollection POIServiceTypes {
  		<**	@description : enum(INVALID,ALL_CATEGORIES,AIRPORT,RESTAURANT,HOTEL,GAZ_STATION,CAR_PARK, ...). Note: A POI category is a unique ID. It could be a predefined category or a custom one defined by a POI plug-in **>			

 		CategoryID id	

 		<**	@description : array[struct(name, type, array[struct(operator_id, operator_name)])].**>

-		CategoryAttribute[] attributes

+		CategoryAttribute[] attributeList

 		<**	@description : array[struct(id, name)].**>

 		CategorySortOption[] sortOptions

 	}

@@ -241,7 +241,7 @@ typeCollection POIServiceTypes {
   		<** @description: array[unique_id].**>			

         CategoryID[] categories

    		<** @description: array[struct(name,type,value)].**>			

-        PoiAttribute[] attributes

+        PoiAttribute[] attributeList

     }

 

  	<** @description:**>			

@@ -254,7 +254,7 @@ typeCollection POIServiceTypes {
 		<** @description:enum(OFF_ROUTE,ON_ROUTE,INSIDE_CORRIDOR, ... )**>			

         UInt16 routeStatus

 		<** @description:List of attributes requested. It could be empty**>			

-        PoiAttribute[] attributes

+        PoiAttribute[] attributeList

     }

 

 	

@@ -272,7 +272,7 @@ typeCollection POIServiceTypes {
  		<** @description:distance in meters to poi from center of the search.**>			

         UInt16 distance

  		<** @description:List of attributes requested. It could be empty.**>			

-        PoiAttribute[] attributes

+        PoiAttribute[] attributeList

     }

 	

  	

@@ -318,7 +318,7 @@ typeCollection POIServiceTypes {
 		<**	@description : struct(unique_id, list of parents_id, icons, name, top_level, short_desc, media).**>

         CategoryDetails details

 		<**	@description : array[struct(name, type, array[struct(operator_id, operator_name)].**>

-        CategoryAttribute[] attributes

+        CategoryAttribute[] attributeList

  		<**	@description : array[struct(id, name)].**>

         CategorySortOption[] sortOptions

     }

@@ -368,6 +368,6 @@ typeCollection POIServiceTypes {
         <** @description:POI location.**>           

         Coordinate3D location

    		<** @description: array[struct(id,type,value)].**>			

-        PoiAttribute[] attributes

+        PoiAttribute[] attributeList

     }

 }