Update of the folders and the franca files for speech and POI CAM

19 files changed, 385 insertions, 347 deletions

diff --git a/api/franca/CMakeLists.txt b/api/franca/CMakeLists.txt
index 2a708cd..421fa8e 100644
--- a/api/franca/CMakeLists.txt
+++ b/api/franca/CMakeLists.txt
@@ -31,6 +31,7 @@ option(COMMONAPI_DBUS_TOOL_GENERATOR
 
 set(COMMONAPI_FIDL_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(COMMONAPI_FIDL_DIR_NAVIGATION "${COMMONAPI_FIDL_DIR}/navigation")
+set(COMMONAPI_FIDL_DIR_HMI "${COMMONAPI_FIDL_DIR}/hmi")
 set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen")
 
 find_package(PkgConfig REQUIRED)
@@ -39,13 +40,14 @@ include(FindPkgConfig)
 
 # generate code from fidl files of navigation
 file(GLOB FIDL_FILES 
+${COMMONAPI_FIDL_DIR}/*.fidl
 ${COMMONAPI_FIDL_DIR_NAVIGATION}/*.fidl
-${COMMONAPI_FIDL_DIR_NAVIGATION}/freetextsearch/*.fidl
+${COMMONAPI_FIDL_DIR_NAVIGATION}/freetextsearchservice/*.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
+${COMMONAPI_FIDL_DIR_HMI}/*.fidl
+${COMMONAPI_FIDL_DIR_HMI}/speechservice/*.fidl
 )
 
 if (COMMONAPI_TOOL_GENERATOR)
diff --git a/api/franca/CommonTypes.fidl b/api/franca/CommonTypes.fidl
new file mode 100755
index 0000000..89fba01
--- /dev/null
+++ b/api/franca/CommonTypes.fidl
@@ -0,0 +1,23 @@
+// 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

+

+typeCollection CommonTypes {

+

+	<** @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

+	}

+

+}
\ No newline at end of file
diff --git a/api/franca/hmi/speechservice/SpeechOutput.fidl b/api/franca/hmi/speechservice/SpeechOutput.fidl
new file mode 100644
index 0000000..e4107d6
--- /dev/null
+++ b/api/franca/hmi/speechservice/SpeechOutput.fidl
@@ -0,0 +1,177 @@
+// SPDX-License-Identifier: MPL-2.0
+// Component Name: SpeechOutputService
+// Compliance Level: Abstract Component
+// Copyright (C) 2014, Continental Automotive GmbH, Elektrobit Automotive GmbH
+// 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/.
+
+package org.genivi.hmi.speechservice
+
+import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"
+
+<** @description : SpeechOutput interface.
+    The GENIVI SpeechOutput interface allows client applications to access TTS functionality   
+**> 
+interface SpeechOutput {
+	version {
+		major 0
+		minor 1
+	}
+	
+	<**	@description : This method returns the API version implemented by the content access module.**>
+	method getVersion {
+		out {
+			<** @description: .**>
+			Version ^version				
+		}	
+	}	
+
+	<** @description : Max length of a single prompt part. **>
+	const UInt32 MAX_CHUNK_LENGTH = 1024
+
+	<** @description : String containing the prompt to play. **>
+	typedef Chunk is String
+
+	<** @description : Index of the added prompt, zero based. **>
+	typedef ChunkID is UInt32
+
+	<** @description : String containing the name of the last reached marker. **>
+	typedef Marker is String
+
+	<** @description : Connection status, will be notified. **>
+	enumeration ConnectionStatus
+	{
+		CS_UNKNOWN		/* no instance of prompter available for member initialization purposes. */
+		CS_ESTABLISHED	/* success status, client is connected */
+		CS_REFUSED		/* currently a connection with the given priority is not possible. */
+		CS_POSSIBLE		/* notification that after a rejected prompt, a new attempt would be successful */
+		CS_PENDING		/* while connecting to service */
+		CS_PAUSED		/* client is paused */
+		CS_TERMINATED	/* client is disconnected */
+		CS_MAX			/* max value shall be error checked */
+	}
+	
+	<** @description : Connection type, used from openPrompter(). 
+	Defines the Audio connection that should be used for the prompter application.
+	The enum values will be mapped to an existing product connection id. **>
+	enumeration ConnectionType
+	{
+		CT_NAVIGATION	/* reserved for internal Navigation application */
+		CT_READER		/* reserved for internal Reader application */
+		CT_GEN_HIGH		/* reserved for connections of generic application with high priority */
+		CT_GEN_MEDIUM	/* reserved for connections of generic application with medium priority */
+		CT_GEN_LOW		/* reserved for connections of generic application with low priority */
+		CT_MAX			/* max value shall be error checked */
+	}
+	
+	<** @description : Processing type, used from openPrompter(). Sets text normalization mode and active prompt database of the TTS engine for the given context **>
+	enumeration PreProcessingType
+	{
+		PPT_DIALOG		/* activates preprocessing rules for Dialog context */
+		PPT_NAVIGATION	/* activates preprocessing rules for Navigation context */
+		PPT_NONE		/* resets preprocessing rules */
+		PPT_READER		/* activates preprocessing rules for Reader context */
+		PPT_MAX			/* max value shall be error checked */
+	}
+	
+	<** @description : Queue status, will be notified. **>
+	enumeration QueueStatus
+	{
+		QS_UNKNOWN		/* no instance of prompter available for member initialization purposes. */
+		QS_FULL			/* chunk was rejected because chunk doesn't fit into buffer */
+		QS_HIGH_FILL	/* was added, but less than n% space missing. The client should consider delaying further additions. There is a risk successive chunk additions will not be heard and return an error. */
+		QS_LOW_FILL		/* the chunk was added, and there is enough memory for more chunks available */
+		QS_MAX			/* max value shall be error checked */
+	}
+	
+	<** @description : TTS status, will be notified. **>
+	enumeration TtsStatus
+	{
+		TS_UNKNOWN			/* no instance of prompter available for member initialization purposes. */
+		TS_NOT_INITIALIZED	/* prompter is not ready (startup , language change) */
+		TS_ACTIVE			/* prompter is active */
+		TS_ABORTED			/* prompter was aborted */
+		TS_MARKER			/* marker reached */
+		TS_IDLE				/* prompter in idle state */
+		TS_ENQUEUED			/* queue not empty, new chunk arrived */
+		TS_FINISHED			/* prompter finished speaking */
+		TS_FAILED			/* prompting failed */
+		TS_MAX				/* max value shall be error checked */
+	}
+
+	<** @description : Must be called to open a SpeechOutputService session and to get the audio connection. **>
+	method openPrompter {
+		in {
+	        <** @description : Sets the Audio connection that should be used for the prompter application. **>
+			ConnectionType connectionType
+			<** @description : Sets the text normaization mode and which active prompt data base will be activated. **>
+			PreProcessingType preProcessingType
+		}
+	}
+
+	<** @description : The prompter must be opened to trigger the playback of the provided prompt. 
+	The prompt length must not exceed the length of a PromptChunk buffer.
+	Synthesizes the provided text or if using the escape sequence of the engine supplier a wave file in a supported sampling rate is provided, the system will back back also wave files. 
+	The text will be normalized using the context identifier provided to openprompter. This applies to matching prerecorded files as well as the synthesis of number and words that are matched to a lexical dictionary.
+	The synthesize will start if the prompter is idle, if the prompter is already playing the playback will be delayed until all previously added text chunks are played back. For every text chunk provided a notification will be send. **>
+    method addTextChunk {
+		in {
+			<** @description : String containing the prompt to play. **>
+			Chunk chunk
+		}
+		out {
+			<** @description : Index of the added prompt, zero based. **>
+			ChunkID chunkID
+		}
+	}
+
+	<** @description : A prompt must be playing to perform an abort action. If no prompting operation in progress there will be no reaction of the system. **>
+    method abortPrompter { }
+
+	<** @description : The prompter is closed after the last text chunk submitted has finished playing. **>
+    method closePrompter {	}
+	
+
+	// *** notification methods
+	
+	/**
+	 * The notifiy status messages will be send to signal the status as feedback on control of prompting functionalities.
+	 */
+	
+	<** @description : Notifies the connection status **>
+    broadcast notifyConnectionStatus selective {
+    	out {
+			<** @description : Client connection status. **>
+    		ConnectionStatus connectionStatus
+   		}
+    }
+
+	<** @description : Notifies the last reached marker. **>
+	broadcast notifyMarkerReached selective {
+		out {
+			<** @description : ID of the processed chunk. **>
+			ChunkID chunkID
+			<** @description : String with the name of the reached marker (if TTS engine supports inserting bookmarks with a name). **>
+			Marker marker
+		}
+	}
+	
+	<** @description : Notifies the queue status. **>
+	broadcast notifyQueueStatus selective {
+		out {
+			<** @description : Fill status of the text buffer. **>
+			QueueStatus queueStatus
+		}
+	}
+
+	<** @description : Notifies the TTS engine status. **>
+	broadcast notifyTTSStatus selective {
+		out {
+			<** @description : Current status of the TTS. **>
+			TtsStatus ttsStatus
+		}
+	}
+}
+
diff --git a/api/franca/navigation/NavigationTypes.fidl b/api/franca/navigation/NavigationTypes.fidl
index 727debd..c1cf0c2 100755
--- a/api/franca/navigation/NavigationTypes.fidl
+++ b/api/franca/navigation/NavigationTypes.fidl
@@ -8,18 +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

-	}

-

 	typedef Handle is UInt32

 

     <** @description: Handle to a location.

diff --git a/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl b/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl
index 87eac78..c64516f 100755
--- a/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl
+++ b/api/franca/navigation/freetextsearchservice/FreeTextSearch.fidl
@@ -1,4 +1,3 @@
-
 // SPDX-License-Identifier: MPL-2.0
 // Copyright (C) 2015-2016, PCA Peugeot Citroën, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH,
 // Alpine Electronics R&D Europe GmbH, Harman-Becker Automotive GmbH.
@@ -8,6 +7,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/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl
index 604aa1b..5702dd7 100755
--- a/api/franca/navigation/mapviewer/MapViewerControl.fidl
+++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl
@@ -6,6 +6,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.MapViewerControlTypes.* from "MapViewerControlTypes.fidl"

 

diff --git a/api/franca/navigation/navigationcore/Guidance.fidl b/api/franca/navigation/navigationcore/Guidance.fidl
index 9d39c38..366414d 100644
--- a/api/franca/navigation/navigationcore/Guidance.fidl
+++ b/api/franca/navigation/navigationcore/Guidance.fidl
@@ -6,6 +6,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.GuidanceTypes.* from "GuidanceTypes.fidl"

 

diff --git a/api/franca/navigation/navigationcore/GuidanceTypes.fidl b/api/franca/navigation/navigationcore/GuidanceTypes.fidl
index be47331..f1dab9c 100644
--- a/api/franca/navigation/navigationcore/GuidanceTypes.fidl
+++ b/api/franca/navigation/navigationcore/GuidanceTypes.fidl
@@ -1,10 +1,8 @@
-/* 

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

-*/

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

diff --git a/api/franca/navigation/navigationcore/LocationInput.fidl b/api/franca/navigation/navigationcore/LocationInput.fidl
index 0154612..4ceb99e 100644
--- a/api/franca/navigation/navigationcore/LocationInput.fidl
+++ b/api/franca/navigation/navigationcore/LocationInput.fidl
@@ -1,13 +1,12 @@
-/* 

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

-*/

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

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

 

diff --git a/api/franca/navigation/navigationcore/LocationInputTypes.fidl b/api/franca/navigation/navigationcore/LocationInputTypes.fidl
index 41c4e92..9af5efa 100644
--- a/api/franca/navigation/navigationcore/LocationInputTypes.fidl
+++ b/api/franca/navigation/navigationcore/LocationInputTypes.fidl
@@ -1,10 +1,8 @@
-/* 

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

-*/

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

diff --git a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
index b79e391..cf3ff04 100644
--- a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
+++ b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
@@ -1,13 +1,12 @@
-/* 

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

-*/

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

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

 

diff --git a/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl b/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl
index 096cb15..cb38318 100644
--- a/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl
+++ b/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl
@@ -1,10 +1,8 @@
-/* 

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

-*/

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

 

diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl
index fd243a8..3d4f7d4 100644
--- a/api/franca/navigation/navigationcore/Routing.fidl
+++ b/api/franca/navigation/navigationcore/Routing.fidl
@@ -1,13 +1,12 @@
-/* 

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

-*/

+// 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.navigationcore.RoutingTypes.* from "RoutingTypes.fidl"

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

 

diff --git a/api/franca/navigation/navigationcore/RoutingTypes.fidl b/api/franca/navigation/navigationcore/RoutingTypes.fidl
index 62719c5..90c4293 100644
--- a/api/franca/navigation/navigationcore/RoutingTypes.fidl
+++ b/api/franca/navigation/navigationcore/RoutingTypes.fidl
@@ -1,10 +1,8 @@
-/* 

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

-*/

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

 

diff --git a/api/franca/navigation/poiservice/ContentAccessModule.fidl b/api/franca/navigation/poiservice/ContentAccessModule.fidl
index 40c4750..3961b74 100644
--- a/api/franca/navigation/poiservice/ContentAccessModule.fidl
+++ b/api/franca/navigation/poiservice/ContentAccessModule.fidl
@@ -1,13 +1,12 @@
-/* 

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

-*/

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

 

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

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

 import org.genivi.navigation.poiservice.POIServiceTypes.* from "POIServiceTypes.fidl"

 

@@ -15,8 +14,8 @@ import org.genivi.navigation.poiservice.POIServiceTypes.* from "POIServiceTypes.
 <** @description : This interface offers methods that implement the POI search functionality of a navigation system.**>

 interface POIContentAccessModule {

 	version {

-		major 1 

-		minor 0

+		major 0 

+		minor 1

 	}

 	

 	<**	@description : This method returns the API version implemented by the content access module.**>

@@ -59,7 +58,87 @@ interface POIContentAccessModule {
 			Locale[] localeList				

 		}	

 	}	

+

+	<**	@description : This method retrieves the list od POI categories available (pre-defined and custom).**>

+	method getAvailableCategories {

+		out {

+			<** @description : List of categories (id, name and top_level).**>

+			CategoryAndName[] categories				

+		}

+	}

+	

+	<**	@description : Get the root category id. That would be ALL_CATEGORIES.**>

+	method getRootCategory {

+		out {

+			<** @description : The root category is a top level one by design.**>

+			CategoryID category				

+		}

+	}

+	

+	<**	@description : Get the children categories id and type (top level) from the a parent unique id.**>

+	method getChildrenCategories {

+		in {

+			<** @description : unique category id.**>

+			CategoryID category				

+		}	

+		out {

+			<** @description : List of categories (id and top_level).**>

+			CategoryAndLevel[] categories				

+		}

+	}

+	

+	<**	@description : Get the parent categories id and type (top level) from the a unique id.**>

+	method getParentCategories {

+		in {

+			<** @description : unique category id.**>

+			CategoryID category				

+		}	

+		out {

+			<** @description : List of categories (id and top_level).**>

+			CategoryAndLevel[] categories				

+		}

+	}

+

+	<**	@description : Creates a category by name and return an unique id.**>

+	method createCategory {

+		in {

+			<** @description : List of details for the category to create.**>

+			CAMCategory category				

+		}	

+		out {

+			<** @description : Category unique id.**>

+			CategoryID unique_id				

+		}	

+	}

+	

+	<**	@description : Removes a list of categories. Because of required time to remove it from the database, a signal is emitted when the deletion is done.**>

+	method removeCategories {

+		in {

+			<** @description : List of categories to be removed.**>

+			CategoryID[] categories				

+		}

+	}

+

+	<**	@description : Adds a list of POIs to a category. Because of required time to add it to the database, a signal is emitted when the update is done, that gives the id of the elements added**>

+	method addPOIs {

+		in {

+			<** @description : Category unique id.**>

+			CategoryID unique_id	

+

+			<** @description : List of POIs and all their content. Note that there's no id sent, because it's up to the component to give it**>

+			PoiAddedDetails[] poiList			

+		}	

+		

+	}

 	

+	<**	@description : Removes a list of POIs to a category. Because of required time to remove it from the database, a signal is emitted when the update is done.**>

+	method removePOIs {

+		in {

+			<** @description : List of unique ids of POIs to remove.**>

+			POI_ID[] ids				

+		}

+	}

+

 	<**	@description : This method is sent by the POI service component to inform all the CAM that a new POI search was started.

         It provides all the relevant search parameters. Of course the CAM will only be aware of the search if it registers one of the search categories.**>

 	method poiSearchStarted {

@@ -95,7 +174,7 @@ interface POIContentAccessModule {
 	method resultListRequested {

 		in {

 			<** @description : Content access module unique id as known by the POI service component.**>

-			UInt8 camId				

+			ContentAccessModuleID camId				

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

 			Handle poiSearchHandle				

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

@@ -132,5 +211,39 @@ interface POIContentAccessModule {
 		}

 	}

 

+	<**	@description : CategoriesRemoved = This signal is emitted when a list of categories and associated content has been removed from the database.**>

+	broadcast CategoriesRemoved {

+		out {

+			<**	@description : List of categories removed.**>

+			CategoryID[] categories

+		}

+	}

+

+	<**	@description : POIAdded = This signal is emitted when a list of POIs and associated content has been added to the database. It returns the ids.**>

+	broadcast POIAdded {

+		out {

+			<**	@description : List of unique ids of POIs added. The order is the same as the order in the AddPOIs method.**>

+			POI_ID[] pois

+		}

+	}

+

+	<**	@description : POIRemoved = This signal is emitted when a list of POIs and associated content has been removed from the database.**>

+	broadcast POIRemoved {

+		out {

+			<**	@description : List of unique ids of POIs removed.**>

+			POI_ID[] pois

+		}

+	}

 

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

+	broadcast SearchStatusChanged {

+		out {

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

+			Handle poiSearchHandle				

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

+			SearchStatusState statusValue		

+			<** @description : List of pois that match the search (only valid if status is set to SEARCHING or FINISHED, by default empty list).**>

+			POI_ID[] pois		

+		}

+	}

 }
\ No newline at end of file
diff --git a/api/franca/navigation/poiservice/POIContentManager.fidl b/api/franca/navigation/poiservice/POIContentManager.fidl
deleted file mode 100644
index faaa336..0000000
--- a/api/franca/navigation/poiservice/POIContentManager.fidl
+++ /dev/null
@@ -1,251 +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.poiservice

-

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

-import org.genivi.navigation.poiservice.POIServiceTypes.* from "POIServiceTypes.fidl"

-

-

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

-interface POIContentManager {

-	version {

-		major 0 

-		minor 1

-	}

-	

-	<**	@description : This method returns the API version implemented by the content access module.**>

-	method getVersion {

-		out {

-			<** @description: .**>

-			Version ^version				

-		}	

-	}		

-	

-	<**	@description : Set the current language set for the search by poi provider module.

-        The language defines the poi and categories name and details language. If the language is not supported, the default details will be returned in the native language.**>

-	method setLocale {

-		in {

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

-			String languageCode				

-			<** @description : the country specific variant for the language to be used. ISO 3166‐1 alpha 3 country code (upper case)**>

-			String countryCode				

-			<** @description : the script specific variant for the language to be used. ISO 15924 alpha 4 script code (upper case)**>

-			String scriptCode				

-		}	

-	}	

-

-	<**	@description : Get the current language set for the search by poi provider module.**>

-	method getLocale {

-		out {

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

-			String languageCode				

-			<** @description : the country specific variant for the language used. ISO 3166‐1 alpha 3 country code (upper case)**>

-			String countryCode				

-			<** @description : the script specific variant for the language used. ISO 15924 alpha 4 script code (upper case)**>

-			String scriptCode				

-		}	

-	}	

-

-	<**	@description : Get the supported set of locales for the search by poi provider module.**>

-	method getSupportedLocales {

-		out {

-			<** @description : array[struct(languageCode,countryCode,scriptCode)]**>

-			Locale[] localeList				

-		}	

-	}	

-

-	<**	@description : This method retrieves the list od POI categories available (pre-defined and custom).**>

-	method getAvailableCategories {

-		out {

-			<** @description : List of categories (id, name and top_level).**>

-			CategoryAndName[] categories				

-		}

-	}

-	

-	<**	@description : Get the root category id. That would be ALL_CATEGORIES.**>

-	method getRootCategory {

-		out {

-			<** @description : The root category is a top level one by design.**>

-			CategoryID category				

-		}

-	}

-	

-	<**	@description : Get the children categories id and type (top level) from the a parent unique id.**>

-	method getChildrenCategories {

-		in {

-			<** @description : unique category id.**>

-			CategoryID category				

-		}	

-		out {

-			<** @description : List of categories (id and top_level).**>

-			CategoryAndLevel[] categories				

-		}

-	}

-	

-	<**	@description : Get the parent categories id and type (top level) from the a unique id.**>

-	method getParentCategories {

-		in {

-			<** @description : unique category id.**>

-			CategoryID category				

-		}	

-		out {

-			<** @description : List of categories (id and top_level).**>

-			CategoryAndLevel[] categories				

-		}

-	}

-

-	<**	@description : Creates a category by name and return an unique id.**>

-	method createCategory {

-		in {

-			<** @description : List of details for the category to create.**>

-			CAMCategory category				

-		}	

-		out {

-			<** @description : Category unique id.**>

-			CategoryID unique_id				

-		}	

-	}

-	

-	<**	@description : Removes a list of categories. Because of required time to remove it from the database, a signal is emitted when the deletion is done.**>

-	method removeCategories {

-		in {

-			<** @description : List of categories to be removed.**>

-			CategoryID[] categories				

-		}

-	}

-

-	<**	@description : Adds a list of POIs to a category. Because of required time to add it to the database, a signal is emitted when the update is done, that gives the id of the elements added**>

-	method addPOIs {

-		in {

-			<** @description : Category unique id.**>

-			CategoryID unique_id	

-

-			<** @description : List of POIs and all their content. Note that there's no id sent, because it's up to the component to give it**>

-			PoiAddedDetails[] poiList			

-		}	

-		

-	}

-	

-	<**	@description : Removes a list of POIs to a category. Because of required time to remove it from the database, a signal is emitted when the update is done.**>

-	method removePOIs {

-		in {

-			<** @description : List of unique ids of POIs to remove.**>

-			POI_ID[] ids				

-		}

-	}

-

-	<**	@description : This method is sent by the POI service component to inform all the CAM that a new POI search was started.

-        It provides all the relevant search parameters. Of course the CAM will only be aware of the search if it registers one of the search categories.**>

-	method poiSearchStarted {

-		in {

-			<** @description : poi search unique handle. It must be used by the CAM to send the list of results to the component.**>

-			Handle poiSearchHandle	

-			<** @description : max size of the results list.**>

-			UInt16 maxSize				

-			<** @description: struct(lat,lon,alt).**>			

-			Coordinate3D location									

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

-			CategoryAndRadius[] poiCategories

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

-			AttributeDetails[] poiAttributes

-			<** @description : contains the name of the poi that is searched. It could be a partial name or an empty string.**>

-			String inputString				

-			<** @description : enum(SORT_DEFAULT,SORT_BY_DISTANCE,SORT_BY_TIME,ATTRIBUTE_CUSTOM, ... )

-            If more than one category was defined for this search, the sort criteria should be compliant with all categories.**>

-			UInt16 sortOption				

-		}	

-	}

-

-	<**	@description : This method cancels the search for the current id.**>

-	method poiSearchCanceled {

-		in {

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

-			Handle poiSearchHandle				

-		}	

-	}

-

-	<**	@description : This method provides the poi results list found by the CAM.

-        As the POI unique id is managed by the POI component, the CAM only provides the POI name, the category and coordinates as well as all the relevant detailed information.**>

-	method resultListRequested {

-		in {

-			<** @description : Content access module unique id as known by the POI service component.**>

-			ContentAccessModuleID camId				

-			<** @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				

-		}	

-		out {

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

-			SearchStatusState statusValue

-			<** @description : Number of items of the results list.**>

-			UInt16 resultListSize

-			<** @description : array[struct(source_id, name, category, location, distance, attributes)].**>

-			PoiCAMDetails[] resultList

-		}

-	}

-	

-	<**	@description : This method retrieves the details associated to one or more POI.

-        It contains the name, the parent categories, the list of attributes, the icons, ... .**>

-	method poiDetailsRequested {

-		in {

-			<** @description : array[unique_poi_id].**>

-			POI_ID[] source_id				

-		}	

-		out {

-			<** @description : array[(details, categories, attributes)] .**>

-			SearchResultDetails[] results				

-		}	

-	}

-	

-	<**	@description : ConfigurationChanged = This signal is sent to the clients when one or more configuration settings changes.**>

-	broadcast ConfigurationChanged {

-		out {

-			<**	@description : changedSettings array[setting].**>

-			UInt16[] changedSettings

-		}

-	}

-

-	<**	@description : CategoriesRemoved = This signal is emitted when a list of categories and associated content has been removed from the database.**>

-	broadcast CategoriesRemoved {

-		out {

-			<**	@description : List of categories removed.**>

-			CategoryID[] categories

-		}

-	}

-

-	<**	@description : POIAdded = This signal is emitted when a list of POIs and associated content has been added to the database. It returns the ids.**>

-	broadcast POIAdded {

-		out {

-			<**	@description : List of unique ids of POIs added. The order is the same as the order in the AddPOIs method.**>

-			POI_ID[] pois

-		}

-	}

-

-	<**	@description : POIRemoved = This signal is emitted when a list of POIs and associated content has been removed from the database.**>

-	broadcast POIRemoved {

-		out {

-			<**	@description : List of unique ids of POIs removed.**>

-			POI_ID[] pois

-		}

-	}

-

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

-	broadcast SearchStatusChanged {

-		out {

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

-			Handle poiSearchHandle				

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

-			SearchStatusState statusValue		

-			<** @description : List of pois that match the search (only valid if status is set to SEARCHING or FINISHED, by default empty list).**>

-			POI_ID[] pois		

-		}

-	}

-

-}
\ No newline at end of file
diff --git a/api/franca/navigation/poiservice/POISearch.fidl b/api/franca/navigation/poiservice/POISearch.fidl
index 5566862..11dbe2b 100644
--- a/api/franca/navigation/poiservice/POISearch.fidl
+++ b/api/franca/navigation/poiservice/POISearch.fidl
@@ -1,13 +1,12 @@
-/* 

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

-*/

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

 

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

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

 import org.genivi.navigation.poiservice.POIServiceTypes.* from "POIServiceTypes.fidl"

 

diff --git a/api/franca/navigation/poiservice/POIServiceTypes.fidl b/api/franca/navigation/poiservice/POIServiceTypes.fidl
index 2743f79..ef36ecd 100644
--- a/api/franca/navigation/poiservice/POIServiceTypes.fidl
+++ b/api/franca/navigation/poiservice/POIServiceTypes.fidl
@@ -1,10 +1,8 @@
-/* 

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

-*/

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

 

diff --git a/api/franca/navigation/poiservice/ServiceContentAccess.fidl b/api/franca/navigation/poiservice/ServiceContentAccess.fidl
index c5cbb12..de17169 100644
--- a/api/franca/navigation/poiservice/ServiceContentAccess.fidl
+++ b/api/franca/navigation/poiservice/ServiceContentAccess.fidl
@@ -1,10 +1,8 @@
-/* 

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

-*/

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