Update some franca files and add a script to generate all

12 files changed, 603 insertions, 12 deletions

diff --git a/api/franca/CMakeLists.txt b/api/franca/CMakeLists.txt
new file mode 100644
index 0000000..2a708cd
--- /dev/null
+++ b/api/franca/CMakeLists.txt
@@ -0,0 +1,64 @@
+###########################################################################
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# Component Name: whole franca generation
+#
+# Author: Marco Residori
+#
+# Copyright (C) 2015, XS Embedded GmbH
+# 
+# Note:
+# The current file is an adaptation of the example file
+# http://git.projects.genivi.org/?p=ipc/common-api-tools.git;a=blob;f=CommonAPI-Examples/E01HelloWorld/CMakeLists.txt
+#
+# License:
+# 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/.
+#
+# @licence end@
+###########################################################################
+
+cmake_minimum_required (VERSION 2.8.1)
+
+project(whole-franca)
+
+option(COMMONAPI_TOOL_GENERATOR
+       "Absolute path to CommonAPI code generator" "")
+option(COMMONAPI_DBUS_TOOL_GENERATOR
+       "Absolute path to CommonAPI-DBus code generator" "")
+
+set(COMMONAPI_FIDL_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+set(COMMONAPI_FIDL_DIR_NAVIGATION "${COMMONAPI_FIDL_DIR}/navigation")
+set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen")
+
+find_package(PkgConfig REQUIRED)
+
+include(FindPkgConfig)
+
+# generate code from fidl files of navigation
+file(GLOB FIDL_FILES 
+${COMMONAPI_FIDL_DIR_NAVIGATION}/*.fidl
+${COMMONAPI_FIDL_DIR_NAVIGATION}/freetextsearch/*.fidl
+${COMMONAPI_FIDL_DIR_NAVIGATION}/mapviewer/*.fidl
+${COMMONAPI_FIDL_DIR_NAVIGATION}/navigationcore/*.fidl
+${COMMONAPI_FIDL_DIR_NAVIGATION}/poiservice/*.fidl
+${COMMONAPI_FIDL_DIR_NAVIGATION}/freetextsearch/speech.fidl
+${COMMONAPI_FIDL_DIR_NAVIGATION}/freetextsearch/*.fidl
+)
+
+if (COMMONAPI_TOOL_GENERATOR)
+     execute_process(WORKING_DIRECTORY ${COMMONAPI_FIDL_DIR}
+                COMMAND ${COMMONAPI_DBUS_TOOL_GENERATOR} -d ${COMMONAPI_GEN_DIR} ${FIDL_FILES})
+else ()
+    message (FATAL_ERROR "Set the variable -DCOMMONAPI_TOOL_GENERATOR=<path>")
+endif ()
+
+if (COMMONAPI_DBUS_TOOL_GENERATOR)
+    execute_process(WORKING_DIRECTORY ${COMMONAPI_FIDL_DIR}
+                COMMAND ${COMMONAPI_TOOL_GENERATOR} -sk -d ${COMMONAPI_GEN_DIR} ${FIDL_FILES})
+else ()
+    message (FATAL_ERROR "Set the variable -DCOMMONAPI_DBUS_TOOL_GENERATOR=<path>")
+endif ()
+
diff --git a/api/franca/navigation/freetextsearch/FreeTextSearch.fidl b/api/franca/navigation/freetextsearch/FreeTextSearch.fidl
new file mode 100644
index 0000000..f735e89
--- /dev/null
+++ b/api/franca/navigation/freetextsearch/FreeTextSearch.fidl
@@ -0,0 +1,200 @@
+/* 

+SPDX-License-Identifier: MPL-2.0

+Copyright (C) 2015-2016, 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, Harman-Becker 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.freetextsearch

+

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

+import org.genivi.navigation.freetextsearch.FreeTextSearchTypes.* from "FreeTextSearchTypes.fidl"

+

+

+<** @description : This interface offers methods that implement the free text search functionality of a navigation system.**>

+interface FreeTextSearch {

+	version {

+		major 0 

+		minor 1

+	}

+

+	<**	

+		@description : This method returns the API version implemented.

+	**>

+	method getVersion {

+		out {

+			<** @description: .**>

+			Version ^version				

+		}	

+	}	

+

+	<** @description : Perform a free text search.

+    	The search is associated to a given sessionHandle

+    	The method returns a freeTextSearchHandle, an identifier to match a response with a request 

+        A single search request will trigger zero or more FtsResultXxx responses followed by an FtsDone response.

+        Each response will contain 1 page of results.

+        A next page of results can be retrieved with the FtsNextPage request.      

+        When you send a new request before receiving a done response on the previous request,

+        then the previous request will be canceled.

+        You will still get a done response on the previous request.

+        This way each request gets a response.

+    **>

+    method FtsRequest {

+        in {

+			<**

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

+			**>

+			Handle sessionHandle

+    	 	<** @description: Text to match. **>

+    	 	FtsString inputString

+    	 	<** @description: Location for scoring the search results.

+    	 	    A result closer to this location gets a higher score than a result further away.

+    	 	**>

+    	 	Coordinate2D searchLocation

+    	 	<** @description: Limit the search to the union of several shapes (each can be a circle or a rectangle).

+    	 	    Pass an empty list to search the whole map.

+    	 	**>

+    	 	ShapeList searchShapes

+    	 	<** @description: The maximum number of addresses and POIs that will be returned. **>

+    	 	PageSize pageSize

+    	 	<** @description: Options to indicate what to search for.

+    	 	    One or more values of TFTSSearchOption can be added together.

+    	 	**>

+    	 	SearchOptions searchOptions

+    	 	<** @description: Additional search conditions, space separated.

+    	 	    The string can be empty when the POI search is not limited by categories

+    	 	    and not limited by countries/states.

+    	 	    Supported conditions:

+    	 	        "category:nnnn"  Limit the POI search to a one or more POI categories,

+    	 	                         where 'nnnn' is a comma-separated list of numerical POI category ids.

+    	 	        "country:aaaaa"  Limit the search to one or more countries (or states),

+    	 	                         where 'aaaaa' is a comma-separated list of ISO-3166-1 alpha 3

+    	 	                         country code concatenated with an optional ISO-3166-2 state code.

+    	 	    Examples:

+    	 	    "category:9373,9374": limits the POI search to the union of categories 9373 and 9374.

+    	 	    "country:USACA": limits the search to the state of California.

+    	 	    "category:6315 country:USACA,MEX": limits the POI search to category 6315

+    	 	    and limits the search to the union of California state and Mexico.

+    	 	**>

+    	 	FtsString searchConditions

+    	 	<** @description: Indication of how fuzzy the search shall be performed. **>

+    	 	FuzzyLevel fuzzyLevel

+    	}

+		out {

+			<**

+				@description : freeTextSearchHandle = free text search handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value

+			**>

+			Handle freeTextSearchHandle

+		}

+		error {

+			NoMoreFtsHandles

+		}

+    }

+

+    <** @description : Get next result page for the last performed search.

+        This request will trigger zero or more FtsResultXxx responses followed by an FtsDone response.

+        If there is no search request done before or if a search request is still in progress

+        then the FtsDone response will return a EStatusNoSearchToContinue status.

+        To be consistent with POIsearch, the page size can be set to another value if needed

+    **>

+    method FtsNextPage {

+    	in {

+			<**

+				@description : free text search handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value.

+			**>

+			Handle freeTextSearchHandle

+    	 	<** @description: The maximum number of addresses and POIs that will be returned. **>

+    	 	PageSize pageSize

+    	 	<** @description: Options to indicate what to search for.

+    	 	    One or more values of TFTSSearchOption can be added together.

+    	 	    You can only get results for options that have been passed to the initial FtsRequest.

+    	 	**>

+    	 	SearchOptions searchOptions

+    	}

+    }

+	

+	<**

+		@description : This method cleans a free text search handle and allows to keep some associated resources if needed.

+	**>

+	method FtsClean {

+		in {

+			<**

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

+			**>

+			Handle sessionHandle

+			<**

+				@description : freeTextSearchHandle = free text search handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value

+			**>

+			Handle freeTextSearchHandle

+    	 	<** 

+    	 		@description : list of handles to keep (can be empty). 

+    	 	**>

+    	 	LocationHandleList locationHandleList

+		}

+	}

+	    

+     <** @description: Cancel the last FTS request. **>

+    method FtsCancel {

+    	

+    }

+

+	<**	@description : Response indicating that the search is done. **>	

+	broadcast FtsDone selective {

+		out {

+			<**

+				@description : freeTextSearchHandle = free text search handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value.

+			**>

+			Handle freeTextSearchHandle

+    	 	<** @description: Status of the search request. **>

+    	 	FtsStatus ftsStatus

+		}

+	}

+		

+	<**	@description : Response with address results. **>	

+	broadcast FtsResultAddresses selective {

+		out {

+			<**

+				@description : freeTextSearchHandle = free text search handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value.

+			**>

+			Handle freeTextSearchHandle

+    	 	<** @description: Matching addresses.

+    	 	    The order of the addresses is the order of matching relevance.

+    	 	    The first address is a better match than the last result.

+    	 	**>

+    	 	Addresses addresses

+    	 	<** @description: Flag to indicate if more addresses might be available in a next page. **>

+    	 	Boolean moreAvailable

+		}

+	}

+	

+	<**	@description : Response with POI results. **>	

+	broadcast FtsResultPois selective {

+		out {

+			<**

+				@description : freeTextSearchHandle = free text search handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value

+			**>

+			Handle freeTextSearchHandle

+    	 	<** @description: Matching POIs.

+    	 	    The order of the POIs is the order of matching relevance.

+    	 	    The first POI is a better match than the last result.

+    	 	**>

+    	 	POIs pois

+    	 	<** @description: Flag to indicate if more POIs might be available in a next page. **>

+    	 	Boolean moreAvailable

+		}

+	}

+		

+	<**	@description : Response with POI category suggestions. **>	

+	broadcast FtsResultPoiCategorySuggestions selective {

+		out {

+			<**

+				@description : freeTextSearchHandle = free text search handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value

+			**>

+			Handle freeTextSearchHandle

+    	 	<** @description: POI category suggestions. **>

+    	 	POICategories poiCategories

+		}

+	}

+		

+}

diff --git a/api/franca/navigation/freetextsearch/FreeTextSearchTypes.fidl b/api/franca/navigation/freetextsearch/FreeTextSearchTypes.fidl
new file mode 100644
index 0000000..05e5fad
--- /dev/null
+++ b/api/franca/navigation/freetextsearch/FreeTextSearchTypes.fidl
@@ -0,0 +1,311 @@
+/* 

+SPDX-License-Identifier: MPL-2.0

+Copyright (C) 2015-2016, 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, Harman-Becker 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.freetextsearch

+

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

+

+typeCollection FreeTextSearchTypes {

+	version {

+		 major 0 

+		 minor 1 

+	}

+

+  	<** 

+  		@description: Type of Sorting.

+  	**>

+  	enumeration SortingType {

+  		AIR_TO_DISTANCE = 0x0

+    	RELEVANCE				= 0x1

+    	UNDEFINED				= 0xF

+  	}

+  

+    <** 

+    	@description: A requestId is an identifier used to match a response to a request.

+        The type is aligned with the one used by the id of POISearch

+    **>

+    typedef RequestId is UInt32

+

+/* string types */	

+	

+    <** 

+    	@description: Type to represent most texts in this interface.

+        Character set = UNICODE

+        Maximum length = 4095

+    **>

+    typedef FtsString is String

+		

+    <** 

+    	@description: A list of strings

+        maximum length = 100

+    **>

+    array FtsStringList of FtsString

+			

+/* shape types */		

+

+  <** @description: A union to contain any of the possble search shapes. **>

+    union ShapeSpecificDetails {

+        Circle circle

+        Rectangle rectangle

+    }

+	

+	<** @description: A shape. **>			

+	struct Shape {

+		ShapeType shapeType 

+		ShapeSpecificDetails shapeDetails

+	}

+		

+    <** @description: A list of shapes.

+        maximum length = 31

+    **>

+    array ShapeList of Shape

+		

+    <** 

+    	@description: A maximum number of results to be returned.

+        Range[0:1000]

+    **>

+    typedef PageSize is UInt16

+

+    <** 

+    	@description: Search options for a search request.

+        The options are flags which can be OR-ed together to create SearchOptions.

+    **>

+    enumeration SearchOption {

+    	<** @description: Search addresses. **>

+        ADDRESS                              =     1

+    	<** @description: Search POIs. **>

+        POI                                  =     2

+        <** @description: Get POI suggestions. **>

+        POI_SUGGESTION                       =     4

+        <** @description: Do not search places when doing an address search. **>

+        NO_PLACES                            =  65536

+        <** @description: Do not search streets when doing an address search. **>

+        NO_STREETS                           = 131072

+        <** @description: Do not make assumptions on POI categories. **>

+        NO_POI_CATEGORY_ASSUMPTIONS          = 262144

+    }

+		

+    <** 

+    	@description: An OR-ed combination of SearchOption flags.

+        Range[0:0x7fffffff]

+    **>

+    typedef SearchOptions is UInt32

+

+    <** 

+    	@description: Search request status. 

+    **>

+	enumeration FtsStatus {

+    	OK

+    	<** @description: User aborted search. **>

+        ABORTED

+        <** @description: Search string is too short to evaluate. **>

+        PREFIX_TOO_SHORT

+        <** @description: There is no search for which a next page can be requested.  **>

+        NO_SEARCH_TO_CONTINUE

+        INTERNAL_ERROR

+        <** @description: No FTS index for the current map. **>

+        INDEX_MISSING

+    	<** @description: The FTS index format is not supported. **>

+        BAD_VERSION

+    	<** @description: A search query not supported by the FTS engine. **>

+        INVALID_PARAMETER_QUERY

+    	<** @description: A search location not on this earth. **>

+        INVALID_PARAMETER_SEARCH_LOCATION

+    	<** @description: An invalid page size. **>

+        INVALID_PARAMETER_PAGE_SIZE

+    	<** @description: Invalid search options passed to the FTS engine. **>

+        INVALID_PARAMETER_SEARCH_OPTIONS

+    	<** @description: Invalid search conditions passed to the FTS engine. **>

+        INVALID_PARAMETER_SEARCH_CONDITIONS

+    	<** @description: One or  more of the search shapes are invalid. **>

+        INVALID_PARAMETER_SEARCH_SHAPES

+    }

+				

+    <** @description: A list of LocationHandles.

+        maximum length = 4096

+    **>

+    array LocationHandleList of LocationHandle

+

+/* address types */

+

+    <** @description: An address can represent a street, a named place, or a mapcode. **>

+    enumeration AddressType {

+        STREET

+        PLACE

+        MAP_CODE

+    }

+			

+	<** 

+		@description: If a user entered a non-existing house number then the closest existing

+	    number is returned. The houseNumberFromInput will contain the house

+	    number from the user input, the houseNumber will contain closest house number.

+	    If the map does not contain house numbers for the street, but the user

+	    input seems to have a house number, then houseNumber will be empty and

+	    houseNumberFromInput will contain the number from the input.

+	 **>			

+	struct StreetDetails {

+    	<** @description: Name of the street. 

+    	**>			

+		FtsString streetName

+    	<** @description: If a user entered a non-existing house number then the closest existing

+	        number is returned. The houseNumberFromInput will contain the house

+	        number from the user input, the houseNumber will contain closest house number.

+	        If the map does not contain house numbers for the street, but the user

+	        input seems to have a house number, then houseNumber will be empty and

+    	    houseNumberFromInput will contain the number from the input. 

+		**>			

+		FtsString houseNumber

+    	<** @description: The house number that the search engine recognized in the user input.

+	        Can be empty.

+	    **>			

+		FtsString houseNumberFromInput

+	}

+

+    enumeration PlaceType {

+    	<** @description: a place of unknown type. **>

+        OTHER

+    	<** @description: a center of a settlement. **>

+        SETTLEMENT = 2

+    }

+			

+	<** @description: Place details. **>			

+	struct PlaceDetails {

+		PlaceType placeType

+		FtsString placeName

+    	<** @description: The bounding box of this place (an estimate). **>			

+		Rectangle placeBoundingBox

+	}

+

+	<** @description: Mapcode details. **>			

+	struct MapCodeDetails {

+    	<** @description: If the location of the mapcode is close to a street, this field

+    	    contains the name of that street, otherwise this field is left empty.

+    	**>			

+		FtsString closestStreetName

+	}

+

+  	<** @description: A union to contain any of the specific types of address details. **>

+    union AddressTypeSpecificDetails {

+        StreetDetails streetDetails

+        PlaceDetails placeDetails

+        MapCodeDetails mapCodeDetails

+    }

+

+	<** @description: Address details for lines, nodes and mapcodes. **>			

+	struct AddressDetails {

+		AddressType addressType

+    	AddressTypeSpecificDetails addressTypeSpecificDetails

+	}

+			

+	<** @description: Address information. **>			

+	struct Address {

+		LocationHandle locationHandle

+		FtsString countryCode

+    	<** @description: Optional state code. **>			

+		FtsString stateCode

+    	<** @description: There can be multiple place names. **>			

+		FtsStringList places

+    	<** @description: There can be multiple postal codes assigned to a street. **>			

+		FtsStringList postalCodes

+    	<** @description: Mapcode of the coordinate **>			

+		FtsString mapCode

+    	AddressDetails addressDetails

+    	Coordinate2D coordinate

+    	<** @description: Distance in meters from the search location.

+    	    -1 if no search location is given.

+    	**>			

+		Radius distance

+		/* confidenceLevel is part of the suggestion of Sandu, in place of score */

+	  	<** @description : 0..255 value scale decided by each OEM/SDK supplier implementation dependant**>

+	  	UInt8		confidenceLevel

+    	<** @description: Indicates whether this match is fuzzy, i.e. it was matched with misspellings. **>			

+		Boolean fuzzyMatch

+	}

+		

+    <** @description: A list of addresses.

+        maximum length = 500

+    **>

+    array Addresses of Address

+		

+/* POI types */

+		

+    <** 

+    	@description: Numerical POI category code.

+        Range[0:0xffffffff]

+    **>

+    typedef FtsPOICategoryCode is UInt32

+	

+	<** @description: POI information. **>			

+	struct FtsPOI {

+		LocationHandle locationHandle

+		FtsPOICategoryCode categoryCode

+		FtsStringList brandNames

+		FtsString poiName

+		FtsString address

+		FtsStringList place

+		FtsStringList postalCode

+		FtsString mapCode

+		FtsString countryCode

+		FtsString stateCode

+		FtsString telephone

+		Coordinate2D coordinate

+    	<** @description: Distance in meters from the search location.

+    	    -1 if no search location is given.

+    	**>			

+		Radius distance

+		/* confidenceLevel is part of the suggestion of Sandu, in place of score */

+	  	<** @description : 0..255 value scale decided by each OEM/SDK supplier implementation dependant**>

+	  	UInt8		confidenceLevel

+    	<** @description: Indicates whether this match is fuzzy, i.e. it was matched with misspellings. **>			

+		Boolean fuzzyMatch

+	}

+		

+    <** @description: A list of POIs.

+        maximum length = 500

+    **>

+    array POIs of FtsPOI

+	

+	<** @description: Data type for POI category suggestions. **>			

+	struct FtsPOICategory {

+		FtsPOICategoryCode categoryCode

+		FtsString categoryName

+    	<** @description: The search engine recognizes synonyms and names associated with a

+    	    POI category. If a match on such a name is found, then this attribute is set to that name.

+    	**>			

+		FtsString matchedName

+    	<** @description: Text that can be used for a suggestion like: "<categoryName> <searchTextSuggestion>"

+    	    Typically this contains the original query text, where the recognized

+    	    category name or synonym has been removed.

+    	**>			

+		FtsString searchTextSuggestion

+    	<** @description: A list of addresses that can be used for suggestions like: "<categoryName> near <address>

+    	    Note the addresses in this list do not have a valid location handle

+    	    as the address is only needed to be displayed as a suggestion.

+    	    The coordinates of an address can be used for a POI window query if the

+    	    user picks a suggestion.

+    	**>			

+		Addresses nearAddressSuggestions

+		/* confidenceLevel is part of the suggestion of Sandu, in place of score */

+	  	<** @description : 0..255 value scale decided by each OEM/SDK supplier implementation dependant**>

+	  	UInt8		confidenceLevel

+	}

+				

+    <** 

+    	@description: A list of POI categories.

+        maximum length = 500

+    **>

+    array POICategories of FtsPOICategory

+	

+    <** @description: Indicates on a scale from 0 to 5 how fuzzy the search results can be.

+        0 means only an exact search is performed, 1 is the lowest level of fuzzy search

+        and 5 means a very fuzzy search.

+        Range[0:5]

+    **>

+    typedef FuzzyLevel is UInt8

+	

+}

diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl
index f94d599..604aa1b 100755
--- a/api/franca/navigation/mapviewer/MapViewerControl.fidl
+++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl
@@ -1,5 +1,5 @@
 // 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

+// 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/.

@@ -15,7 +15,7 @@ import org.genivi.navigation.navigationcore.MapViewerControlTypes.* from "MapVie
 

 interface MapViewerControl {

 	version {

-		major 0

+		major 1 

 		minor 0

 	}

 

diff --git a/api/franca/navigation/navigationcore/Guidance.fidl b/api/franca/navigation/navigationcore/Guidance.fidl
index fe4677f..9d39c38 100755
--- a/api/franca/navigation/navigationcore/Guidance.fidl
+++ b/api/franca/navigation/navigationcore/Guidance.fidl
@@ -16,7 +16,7 @@ import org.genivi.navigation.navigationcore.GuidanceTypes.* from "GuidanceTypes.
 

 interface Guidance {

 	version {

-		major 0

+		major 1 

 		minor 0

 	}

 

diff --git a/api/franca/navigation/navigationcore/LocationInput.fidl b/api/franca/navigation/navigationcore/LocationInput.fidl
index 926f98e..0154612 100644
--- a/api/franca/navigation/navigationcore/LocationInput.fidl
+++ b/api/franca/navigation/navigationcore/LocationInput.fidl
@@ -17,7 +17,7 @@ import org.genivi.navigation.navigationcore.LocationInputTypes.* from "LocationI
 

 interface LocationInput {

 	version {

-		major 3

+		major 1 

 		minor 0

 	}

 

diff --git a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
index c348a0a..b79e391 100755
--- a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
+++ b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
@@ -1,6 +1,6 @@
 /* 

 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

+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/.

@@ -17,7 +17,7 @@ import org.genivi.navigation.navigationcore.MapMatchedPositionTypes.* from "MapM
 

 interface MapMatchedPosition {

 	version {

-		major 0

+		major 1 

 		minor 0

 	}

 

diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl
index 54b30c8..6caeedc 100755
--- a/api/franca/navigation/navigationcore/Routing.fidl
+++ b/api/franca/navigation/navigationcore/Routing.fidl
@@ -18,7 +18,7 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
 

 interface Routing {

 	version {

-		major 0

+		major 1 

 		minor 0

 	}

 

diff --git a/api/franca/navigation/poiservice/CMakeLists.txt b/api/franca/navigation/poiservice/CMakeLists.txt
index 8275ece..042441a 100644
--- a/api/franca/navigation/poiservice/CMakeLists.txt
+++ b/api/franca/navigation/poiservice/CMakeLists.txt
@@ -2,7 +2,7 @@
 # @licence app begin@
 # SPDX-License-Identifier: MPL-2.0
 #
-# Component Name: EnhancedPositionService
+# Component Name: poi-manager-server
 #
 # Author: Marco Residori
 #
diff --git a/api/generate_all.sh b/api/generate_all.sh
new file mode 100755
index 0000000..e446c5e
--- /dev/null
+++ b/api/generate_all.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [ ! $COMMON_API_ROOT_DIR ]
+then 
+	echo 'Set the root dir of the common api tools'
+	echo 'export COMMON_API_ROOT_DIR=<path>'
+	exit 1
+fi
+
+echo 'delete the build folder'
+rm -rf build
+
+mkdir build
+cd build
+
+echo 'generate all the templates for CommonAPI'
+cmake -DCOMMONAPI_DBUS_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-dbus-tools/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/genivi/common-api-tools/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 ../franca/
+
diff --git a/src/poi-service/poi-manager-server/CMakeLists.txt b/src/poi-service/poi-manager-server/CMakeLists.txt
index bb4faac..26de5a1 100644
--- a/src/poi-service/poi-manager-server/CMakeLists.txt
+++ b/src/poi-service/poi-manager-server/CMakeLists.txt
@@ -18,7 +18,7 @@
 project(poi-manager-server)
 message(STATUS ${PROJECT_NAME})
 
-add_definitions("-std=gnu++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
 
 set(PARENT_API poiservice)
 set(ROOT_API navigation)
@@ -33,7 +33,6 @@ set(PRJ_SRC_GEN_POISERVICE_TYPES_PATH ${COMMONAPI_GEN_DIR}/v1_0/org/genivi/${ROO
 set(DBUS_LIB_PATH "/usr/local/lib")
 
 set(CMAKE_VERBOSE_MAKEFILE off)
-cmake_minimum_required(VERSION 2.8)
 
 # DBus Path
 if (DBUS_LIB_PATH)
diff --git a/test/poi-service/poi-manager-client/CMakeLists.txt b/test/poi-service/poi-manager-client/CMakeLists.txt
index ef1ee9d..a5d847c 100644
--- a/test/poi-service/poi-manager-client/CMakeLists.txt
+++ b/test/poi-service/poi-manager-client/CMakeLists.txt
@@ -18,7 +18,7 @@
 project(poi-manager-client)
 message(STATUS ${PROJECT_NAME})
 
-add_definitions("-std=gnu++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
 
 set(PARENT_API poiservice)
 set(ROOT_API navigation)
@@ -33,7 +33,6 @@ set(PRJ_SRC_GEN_POISERVICE_TYPES_PATH ${COMMONAPI_GEN_DIR}/v1_0/org/genivi/${ROO
 set(DBUS_LIB_PATH "/usr/local/lib")
 
 set(CMAKE_VERBOSE_MAKEFILE off)
-cmake_minimum_required(VERSION 2.8)
 
 # DBus Path
 if (DBUS_LIB_PATH)