improve franca fidl files

5 files changed, 218 insertions, 240 deletions

diff --git a/enhanced-position-service/api/franca/Configuration.fidl b/enhanced-position-service/api/franca/Configuration.fidl
index 5ae1525..022d0c8 100755
--- a/enhanced-position-service/api/franca/Configuration.fidl
+++ b/enhanced-position-service/api/franca/Configuration.fidl
@@ -8,9 +8,9 @@
     this file, You can obtain one at http://mozilla.org/MPL/2.0/.

 */

 

-package org.genivi.positioning.EnhancedPositionService

+package org.genivi.EnhancedPositionService

 

-import org.genivi.positioning.EnhancedPositionService.EnhancedPositionServiceTypes.* from "EnhancedPositionServiceTypes.fidl"

+import org.genivi.EnhancedPositionService.EnhancedPositionServiceTypes.* from "EnhancedPositionServiceTypes.fidl"

 

 <**

 	@description : Configuration = This interface allows a client application to set and retrieve configuration options

diff --git a/enhanced-position-service/api/franca/EnhancedPosition.fidl b/enhanced-position-service/api/franca/EnhancedPosition.fidl
index f629ec5..5f47b07 100755
--- a/enhanced-position-service/api/franca/EnhancedPosition.fidl
+++ b/enhanced-position-service/api/franca/EnhancedPosition.fidl
@@ -8,10 +8,9 @@
     this file, You can obtain one at http://mozilla.org/MPL/2.0/.

 */

 

-package org.genivi.positioning.EnhancedPositionService

+package org.genivi.EnhancedPositionService

 

-import org.genivi.positioning.EnhancedPositionService.EnhancedPositionServiceTypes.* from "EnhancedPositionServiceTypes.fidl"

-import org.genivi.positioning.EnhancedPositionService.EnhancedPositionTypes.* from "EnhancedPositionTypes.fidl"

+import org.genivi.EnhancedPositionService.EnhancedPositionServiceTypes.* from "EnhancedPositionServiceTypes.fidl"

 

 <**

 	@description : EnhancedPosition = This interface offers functionalities to retrieve the enhanced position of the vehicle

@@ -37,10 +36,10 @@ interface EnhancedPosition {
 	**>

 	method GetData {

 		in {

-			DataType[] valuesToReturn

+			PositionDataKey[] valuesToReturn

 		}

 		out {

-			Data data

+			PositionData data

 		}

 	}

 

@@ -109,7 +108,7 @@ interface EnhancedPosition {
 	**>

 	broadcast PositionUpdate {

 		out {

-			DataType[] changedValues

+			PositionDataKey[] changedValues

 		}

 	}

 

@@ -118,7 +117,7 @@ interface EnhancedPosition {
 	**>

 	broadcast RotationRateUpdate {

 		out {

-			RotationRateType[] changedValues

+			RotationRateKey[] changedValues

 		}

 	}

 

@@ -127,7 +126,7 @@ interface EnhancedPosition {
 	**>

 	broadcast AccuracyUpdate {

 		out {

-			AccuracyInfoType[] changedValues

+			AccuracyInfoKey[] changedValues

 		}

 	}

 

@@ -136,7 +135,7 @@ interface EnhancedPosition {
 	**>

 	broadcast SatelliteInfoUpdate {

 		out {

-			SatelliteInfoType[] changedValues

+			SatelliteInfoKey[] changedValues

 		}

 	}

 

@@ -145,7 +144,7 @@ interface EnhancedPosition {
 	**>

 	broadcast StatusUpdate {

 		out {

-			StatusKey[] changedValues

+			StatusInfoKey[] changedValues

 		}

 	}

 

diff --git a/enhanced-position-service/api/franca/EnhancedPositionServiceTypes.fidl b/enhanced-position-service/api/franca/EnhancedPositionServiceTypes.fidl
index 1b692a2..a16cb07 100755
--- a/enhanced-position-service/api/franca/EnhancedPositionServiceTypes.fidl
+++ b/enhanced-position-service/api/franca/EnhancedPositionServiceTypes.fidl
@@ -8,21 +8,12 @@
     this file, You can obtain one at http://mozilla.org/MPL/2.0/.

 */

 

-package org.genivi.positioning.EnhancedPositionService

+package org.genivi.EnhancedPositionService

 

 typeCollection EnhancedPositionServiceTypes {

 	

-	<** @description : A template to generate a dbus 'v'.**>

-	union Value {

-		UInt32 uInt32Value	

-	}

-

-	enumeration BasicEnum {

-		INVALID = 0x0000

-	}

+	typedef Handle is UInt32

 	

-    typedef Handle is UInt32

-

 	<** @description: version.**>			

 	struct Version {

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

@@ -34,7 +25,16 @@ typeCollection EnhancedPositionServiceTypes {
 		<** @description : release date (e.g. 21-06-2011).**>

 		String date

 	}

-

+	

+	<** @description : genereic value (mapped to a dbus variant ('v') data type.**>

+	union Value {

+		UInt32 uInt32Value

+		String stringValue

+	}

+    

+	enumeration BasicEnum {

+		INVALID = 0x0000

+	}

 

     <** @description: 2D geocoordinate.**>	

 	struct Coordinate2D {

@@ -50,6 +50,199 @@ typeCollection EnhancedPositionServiceTypes {
 		Int32 altitude

 	}

 	

+	enumeration PositionDataKey extends BasicEnum {

+		TIMESTAMP       = 0x0001

+		LATITUDE        = 0x0020

+		LONGITUDE       = 0x0021

+		ALTITUDE        = 0x0022

+		HEADING         = 0x0030

+		SPEED           = 0x0031

+		CLIMB           = 0x0032

+		ROLL_RATE       = 0x0060

+		PITCH_RATE      = 0x0061

+		YAW_RATE        = 0x0062

+		PDOP            = 0x0080

+		HDOP            = 0x0081

+		VDOP            = 0x0082

+		SIGMA_LATITUDE  = 0x0083

+		SIGMA_LONGITUDE = 0x0084

+		SIGMA_ALTITUDE  = 0x0085

+		SIGMA_HEADING   = 0x0086

+		ALL             = 0xffff

+	} 

+	

+	<**	  

+       @description : PositioningData = array of tuples (key,value)

+	      key = enumeration PositionDataKey

+          key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms

+          key = LATITUDE, value = value of type 'Double', that expresses the latitude of the current position. Range [-90:+90]. Example: 48.053250

+          key = LONGITUDE, value = value of type 'Double', that expresses the longitude of the current position. Range [-180:+180]. Example: 8.324500

+          key = ALTITUDE, value = value of type 'Int32', that expresses the altitude above the sea level of the current position in meters

+          key = HEADING, value = value of type 'Int32', that expresses the course angle in degree. Range [0:360]. 0 = north, 90 = east, 180 = south, 270 = west

+          key = SPEED, value = value of type 'Double', that expresses speed measured in m/s. A negative value indicates that the vehicle is moving backwards

+          key = CLIMB, value = value of type 'Int32', that expresses the road gradient in degrees

+          key = ROLL_RATE, value = value of type 'Int32', rotation rate around the X-axis in degrees/s. Range [-100:+100]

+          key = PITCH_RATE, value = value of type 'Int32', rotation rate around the Y-axis in degrees/s. Range [-100:+100]

+          key = YAW_RATE, value = value of type 'Int32', rotation rate around the Z-axis in degrees/s. Range [-100:+100]

+          key = PDOP, value = value of type 'Double', that represents the positional (3D) dilution of precision

+          key = HDOP, value = value of type 'Double', that represents the horizontal (2D) dilution of precision

+          key = VDOP, value = value of type 'Double', that represents vertical (altitude) dilution of precision

+          key = SIGMA_LATITUDE, value = value of type 'Double', that represents the standard deviation for latitude in m

+          key = SIGMA_LONGITUDE, value = value of type 'Double', that represents the standard deviation for longitude in m

+          key = SIGMA_ALTITUDE, value = value of type 'Double', that represents the standard deviation for altitude in m

+          key = SIGMA_HEADING, value = value of type 'Double', that represents the standard deviation for altitude in degrees

+    **>

+	map PositionData {

+		PositionDataKey to Value

+	}

+	

+	enumeration PositionInfoKey extends BasicEnum {

+		TIMESTAMP       = 0x0001

+		LATITUDE        = 0x0020

+		LONGITUDE       = 0x0021

+		ALTITUDE        = 0x0022

+		HEADING         = 0x0030

+		SPEED           = 0x0031

+		CLIMB           = 0x0032

+	} 

+	

+	<**	  

+       @description : PositionInfo = array of tuples (key,value)

+          key = enumeration PositionInfoKey

+          key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms

+          key = LATITUDE, value = value of type 'Double', that expresses the latitude of the current position. Range [-90:+90]. Example: 48.053250

+          key = LONGITUDE, value = value of type 'Double', that expresses the longitude of the current position. Range [-180:+180]. Example: 8.324500 

+          key = ALTITUDE, value = value of type 'Int32', that expresses the altitude above the sea level of the current position in meters

+          key = HEADING, value = value of type 'Int32', that expresses the course angle in degree. Range [0:360]. 0 = north, 90 = east, 180 = south, 270 = west

+          key = SPEED, value = value of type 'Double', that expresses speed measured in m/s. A negative value indicates that the vehicle is moving backwards

+          key = CLIMB, value = value of type 'Int32', that expresses the road gradient in degrees

+    **>   

+	map PositionInfo {

+		PositionInfoKey to Value

+	}

+	

+	enumeration RotationRateKey extends BasicEnum {

+		TIMESTAMP       = 0x0001

+		ROLL_RATE       = 0x0060

+		PITCH_RATE      = 0x0061

+		YAW_RATE        = 0x0062

+	}

+	

+	<**	  

+       @description : RotationRate = array of tuples (key,value)

+          key = enumeration RotationRateKey

+          key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms

+          key = ROLL_RATE, value = rotation rate around the X-axis in degrees/s. Range [-100:+100]

+          key = PITCH_RATE, value = rotation rate around the Y-axis in degrees/s. Range [-100:+100]

+          key = YAW_RATE, value = rotation rate around the Z-axis in degrees/s. Range [-100:+100]

+    **>

+	map RotationRate {

+		RotationRateKey to Value

+	}

+	

+	enumeration AccuracyInfoKey extends BasicEnum {

+		TIMESTAMP       = 0x0001

+		PDOP            = 0x0080

+		HDOP            = 0x0081

+		VDOP            = 0x0082

+		SIGMA_LATITUDE  = 0x0083

+		SIGMA_LONGITUDE = 0x0084

+		SIGMA_ALTITUDE  = 0x0085

+		SIGMA_HEADING   = 0x0086

+	}	

+		

+    <**	  

+       @description : AccuracyInfo = array of tuples (key,value)

+          key = enumeration AccuracyInfoKey

+          key = TIMESTAMP, value = value of type 't', that represents a timestamp in ms

+          key = PDOP, value = value of type 'd', that represents the positional (3D) dilution of precision

+          key = HDOP, value = value of type 'd', that represents the horizontal (2D) dilution of precision

+          key = VDOP, value = value of type 'd', that represents vertical (altitude) dilution of precision

+          key = SIGMA_LATITUDE, value = value of type 'd', that represents the standard deviation for latitude in m

+          key = SIGMA_LONGITUDE, value = value of type 'd', that represents the standard deviation for longitude in m

+          key = SIGMA_ALTITUDE, value = value of type 'd', that represents the standard deviation for altitude in m

+          key = SIGMA_HEADING, value = value of type 'd', that represents the standard deviation for altitude in degrees

+    **>    

+	map AccuracyInfo {

+		AccuracyInfoKey to Value

+	}

+	

+	enumeration SatelliteInfoKey extends BasicEnum {

+	    TIMESTAMP           = 0x0001

+	    USED_SATELLITES     = 0x00c0

+	    TRACKED_SATELLITES  = 0x00c1

+	    VISIBLE_SATELLITES  = 0x00c2

+	    SATELLITE_DETAILS   = 0x00c3

+	}

+	

+	struct SatelliteDetails {

+		UInt32 satId

+		Boolean inUse

+		UInt32 elevation

+		UInt32 azimuth

+		UInt32 snr

+	}

+	

+	<**	

+	   @description : SatelliteInfo = array of tuples (key,value)

+          key = enumeration SatelliteInfoKey

+          key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms

+          key = USED_SATELLITES, value = value of type 'UInt8', that represents the number of used satellites

+          key = TRACKED_SATELLITES, value = value of type 'UInt8', that represents the number of tracked satellites 

+          key = VISIBLE_SATELLITES, value = value of type 'UInt8', that represents the number of visible satellites

+          key = SATELLITE_DETAILS, value = value of type SatelliteDetails[], that represents an array(struct(satId,inUse,elevation,azimuth,snr))

+                The satID numbering scheme shall be as defined by NMEA-0183 (v3.01 or later) for the GSV sentence:

+                1..32: GPS satellites (by PRN), 33..64: SBAS/WAAS satellites, 65..96: Glonass satellites

+                Note: Later NMEA-0183 versions probably already have Galileo support 

+    **>

+	map SatelliteInfo {

+		SatelliteInfoKey to Value

+	}

+	

+	enumeration StatusInfoKey extends BasicEnum {

+		TIMESTAMP       = 0x0001

+		GNSS_FIX_STATUS = 0x0070

+		DR_STATUS       = 0x0071

+	}

+	

+    <**	  

+       @description : StatusInfo = array of tuples (key,value)

+          key = enumeration StatusInfoKey

+          key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms

+          key = GNSS_FIX_STATUS, value = value of type 'UInt16', that represents an enum(INVALID(0x00),NO_FIX(0x01),TIME_FIX(0x02),2D_FIX(0x03),3D_FIX(0x04), ... )

+          key = DR_STATUS, value = value of type 'Boolean', where TRUE means that a dead-reckoning algorithm has been used to calculate the current position

+    **>    

+	map StatusInfo {

+		StatusInfoKey to Value

+	}

+	

+	enumeration TimeInfoKey extends BasicEnum {

+		TIMESTAMP       = 0x0001

+	    YEAR            = 0x00a0

+	    MONTH           = 0x00a1

+	    DAY             = 0x00a2

+	    HOUR            = 0x00a3

+	    MINUTE          = 0x00a4

+	    SECOND          = 0x00a5

+	    MS              = 0x00a6

+	}

+

+    <**	  

+       @description : TimeInfo = array of tuples (key,value)

+          key = enumeration TimeInfoKey

+          key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms

+          key = YEAR, value = value of type 'UInt16', 4 digits number that indicates the year. Example: 2012

+          key = MONTH, value = value of type 'UInt8', 2 digits number that indicates the month. Example: 03 means March

+          key = DAY, value = value of type 'UInt8', 2 digits number that indicates the day. Range [0:31]. Example: 07

+          key = HOUR, value = value of type 'UInt8', 2 digits number that indicates the hour. Range [0:23].  Example: 01

+          key = MINUTE, value = value of type 'UInt8', 2 digits number that represents the minutes. Range [0:59]. Example: 01

+          key = SECOND, value = value of type 'UInt8', 2 digits number that represents the seconds. Range [0:59]. Example: 01

+          key = MS, value = value of type 'UInt16', 3 digits number that represents the milliseconds. Range [0:999]. Example: 007

+	**>

+	map TimeInfo {

+		TimeInfoKey to Value

+	}

+	

 }

 

 

diff --git a/enhanced-position-service/api/franca/EnhancedPositionTypes.fidl b/enhanced-position-service/api/franca/EnhancedPositionTypes.fidl
deleted file mode 100755
index 2d97075..0000000
--- a/enhanced-position-service/api/franca/EnhancedPositionTypes.fidl
+++ /dev/null
@@ -1,214 +0,0 @@
-/*  SPDX-License-Identifier: MPL-2.0
-    Component Name: EnhancedPositionService
-    Compliance Level: Abstract Component
-    Copyright (C) 2012, BMW Car IT GmbH, Continental Automotive GmbH, PCA Peugeot Citroën, XS Embedded 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.positioning.EnhancedPositionService
-
-import org.genivi.positioning.EnhancedPositionService.EnhancedPositionServiceTypes.* from "EnhancedPositionServiceTypes.fidl"
-
-typeCollection EnhancedPositionTypes {
-	version {
-		 major 0 
-		 minor 1 
-	}
-	
-	enumeration DataType extends BasicEnum {
-		TIMESTAMP       = 0x0001
-		LATITUDE        = 0x0020
-		LONGITUDE       = 0x0021
-		ALTITUDE        = 0x0022
-		HEADING         = 0x0030
-		SPEED           = 0x0031
-		CLIMB           = 0x0032
-		ROLL_RATE       = 0x0060
-		PITCH_RATE      = 0x0061
-		YAW_RATE        = 0x0062
-		PDOP            = 0x0080
-		HDOP            = 0x0081
-		VDOP            = 0x0082
-		SIGMA_LATITUDE  = 0x0083
-		SIGMA_LONGITUDE = 0x0084
-		SIGMA_ALTITUDE  = 0x0085
-		SIGMA_HEADING   = 0x0086
-		ALL             = 0xffff
-	} 
-	
-	<**	  
-       @description : PositioningData = array of tuples (key,value)
-	      key = enumeration DataType
-          key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms
-          key = LATITUDE, value = value of type 'Double', that expresses the latitude of the current position. Range [-90:+90]. Example: 48.053250
-          key = LONGITUDE, value = value of type 'Double', that expresses the longitude of the current position. Range [-180:+180]. Example: 8.324500
-          key = ALTITUDE, value = value of type 'Int32', that expresses the altitude above the sea level of the current position in meters
-          key = HEADING, value = value of type 'Int32', that expresses the course angle in degree. Range [0:360]. 0 = north, 90 = east, 180 = south, 270 = west
-          key = SPEED, value = value of type 'Double', that expresses speed measured in m/s. A negative value indicates that the vehicle is moving backwards
-          key = CLIMB, value = value of type 'Int32', that expresses the road gradient in degrees
-          key = ROLL_RATE, value = value of type 'Int32', rotation rate around the X-axis in degrees/s. Range [-100:+100]
-          key = PITCH_RATE, value = value of type 'Int32', rotation rate around the Y-axis in degrees/s. Range [-100:+100]
-          key = YAW_RATE, value = value of type 'Int32', rotation rate around the Z-axis in degrees/s. Range [-100:+100]
-          key = PDOP, value = value of type 'Double', that represents the positional (3D) dilution of precision
-          key = HDOP, value = value of type 'Double', that represents the horizontal (2D) dilution of precision
-          key = VDOP, value = value of type 'Double', that represents vertical (altitude) dilution of precision
-          key = SIGMA_LATITUDE, value = value of type 'Double', that represents the standard deviation for latitude in m
-          key = SIGMA_LONGITUDE, value = value of type 'Double', that represents the standard deviation for longitude in m
-          key = SIGMA_ALTITUDE, value = value of type 'Double', that represents the standard deviation for altitude in m
-          key = SIGMA_HEADING, value = value of type 'Double', that represents the standard deviation for altitude in degrees
-    **>
-	map Data {
-		DataType to Value
-	}
-	
-	enumeration PositionInfoType extends BasicEnum {
-		TIMESTAMP       = 0x0001
-		LATITUDE        = 0x0020
-		LONGITUDE       = 0x0021
-		ALTITUDE        = 0x0022
-		HEADING         = 0x0030
-		SPEED           = 0x0031
-		CLIMB           = 0x0032
-	} 
-	
-	<**	  
-       @description : PositionInfo = array of tuples (key,value)
-          key = enumeration PositioningInfoKey
-          key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms
-          key = LATITUDE, value = value of type 'Double', that expresses the latitude of the current position. Range [-90:+90]. Example: 48.053250
-          key = LONGITUDE, value = value of type 'Double', that expresses the longitude of the current position. Range [-180:+180]. Example: 8.324500 
-          key = ALTITUDE, value = value of type 'Int32', that expresses the altitude above the sea level of the current position in meters
-          key = HEADING, value = value of type 'Int32', that expresses the course angle in degree. Range [0:360]. 0 = north, 90 = east, 180 = south, 270 = west
-          key = SPEED, value = value of type 'Double', that expresses speed measured in m/s. A negative value indicates that the vehicle is moving backwards
-          key = CLIMB, value = value of type 'Int32', that expresses the road gradient in degrees
-    **>   
-	map PositionInfo {
-		PositionInfoType to Value
-	}
-	
-	enumeration RotationRateType extends BasicEnum {
-		TIMESTAMP       = 0x0001
-		ROLL_RATE       = 0x0060
-		PITCH_RATE      = 0x0061
-		YAW_RATE        = 0x0062
-	}
-	
-	<**	  
-       @description : RotationRate = array of tuples (key,value)
-          key = enumeration RotationRateType
-          key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms
-          key = ROLL_RATE, value = rotation rate around the X-axis in degrees/s. Range [-100:+100]
-          key = PITCH_RATE, value = rotation rate around the Y-axis in degrees/s. Range [-100:+100]
-          key = YAW_RATE, value = rotation rate around the Z-axis in degrees/s. Range [-100:+100]
-    **>
-	map RotationRate {
-		RotationRateType to Value
-	}
-	
-	enumeration AccuracyInfoType extends BasicEnum {
-		TIMESTAMP       = 0x0001
-		PDOP            = 0x0080
-		HDOP            = 0x0081
-		VDOP            = 0x0082
-		SIGMA_LATITUDE  = 0x0083
-		SIGMA_LONGITUDE = 0x0084
-		SIGMA_ALTITUDE  = 0x0085
-		SIGMA_HEADING   = 0x0086
-	}	
-		
-    <**	  
-       @description : AccuracyInfo = array of tuples (key,value)
-          key = enumeration AccuracyInfoType
-          key = TIMESTAMP, value = value of type 't', that represents a timestamp in ms
-          key = PDOP, value = value of type 'd', that represents the positional (3D) dilution of precision
-          key = HDOP, value = value of type 'd', that represents the horizontal (2D) dilution of precision
-          key = VDOP, value = value of type 'd', that represents vertical (altitude) dilution of precision
-          key = SIGMA_LATITUDE, value = value of type 'd', that represents the standard deviation for latitude in m
-          key = SIGMA_LONGITUDE, value = value of type 'd', that represents the standard deviation for longitude in m
-          key = SIGMA_ALTITUDE, value = value of type 'd', that represents the standard deviation for altitude in m
-          key = SIGMA_HEADING, value = value of type 'd', that represents the standard deviation for altitude in degrees
-    **>    
-	map AccuracyInfo {
-		AccuracyInfoType to Value
-	}
-	
-	enumeration SatelliteInfoType extends BasicEnum {
-	    TIMESTAMP           = 0x0001
-	    USED_SATELLITES     = 0x00c0
-	    TRACKED_SATELLITES  = 0x00c1
-	    VISIBLE_SATELLITES  = 0x00c2
-	    SATELLITE_DETAILS   = 0x00c3
-	}
-	
-	struct SatelliteDetails {
-		UInt32 satId
-		Boolean inUse
-		UInt32 elevation
-		UInt32 azimuth
-		UInt32 snr
-	}
-	
-	<**	
-	   @description : SatelliteInfo = array of tuples (key,value)
-          key = enumeration SatelliteInfoType
-          key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms
-          key = USED_SATELLITES, value = value of type 'UInt8', that represents the number of used satellites
-          key = TRACKED_SATELLITES, value = value of type 'UInt8', that represents the number of tracked satellites 
-          key = VISIBLE_SATELLITES, value = value of type 'UInt8', that represents the number of visible satellites
-          key = SATELLITE_DETAILS, value = value of type SatelliteDetails[], that represents an array(struct(satId,inUse,elevation,azimuth,snr))
-                The satID numbering scheme shall be as defined by NMEA-0183 (v3.01 or later) for the GSV sentence:
-                1..32: GPS satellites (by PRN), 33..64: SBAS/WAAS satellites, 65..96: Glonass satellites
-                Note: Later NMEA-0183 versions probably already have Galileo support 
-    **>
-	map SatelliteInfo {
-		SatelliteInfoType to Value
-	}
-	
-	enumeration StatusKey extends BasicEnum {
-		TIMESTAMP       = 0x0001
-		GNSS_FIX_STATUS = 0x0070
-		DR_STATUS       = 0x0071
-	}
-	
-    <**	  
-       @description : StatusInfo = array of tuples (key,value)
-          key = enumeration StatusInfoKey
-          key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms
-          key = GNSS_FIX_STATUS, value = value of type 'UInt16', that represents an enum(INVALID(0x00),NO_FIX(0x01),TIME_FIX(0x02),2D_FIX(0x03),3D_FIX(0x04), ... )
-          key = DR_STATUS, value = value of type 'Boolean', where TRUE means that a dead-reckoning algorithm has been used to calculate the current position
-    **>    
-	map StatusInfo {
-		StatusKey to Value
-	}
-	
-	enumeration TimeInfoType extends BasicEnum {
-		TIMESTAMP       = 0x0001
-	    YEAR            = 0x00a0
-	    MONTH           = 0x00a1
-	    DAY             = 0x00a2
-	    HOUR            = 0x00a3
-	    MINUTE          = 0x00a4
-	    SECOND          = 0x00a5
-	    MS              = 0x00a6
-	}
-
-    <**	  
-       @description : TimeInfo = array of tuples (key,value)
-          key = enumeration TimeInfoType
-          key = TIMESTAMP, value = value of type 'UInt64', that represents a timestamp in ms
-          key = YEAR, value = value of type 'UInt16', 4 digits number that indicates the year. Example: 2012
-          key = MONTH, value = value of type 'UInt8', 2 digits number that indicates the month. Example: 03 means March
-          key = DAY, value = value of type 'UInt8', 2 digits number that indicates the day. Range [0:31]. Example: 07
-          key = HOUR, value = value of type 'UInt8', 2 digits number that indicates the hour. Range [0:23].  Example: 01
-          key = MINUTE, value = value of type 'UInt8', 2 digits number that represents the minutes. Range [0:59]. Example: 01
-          key = SECOND, value = value of type 'UInt8', 2 digits number that represents the seconds. Range [0:59]. Example: 01
-          key = MS, value = value of type 'UInt16', 3 digits number that represents the milliseconds. Range [0:999]. Example: 007
-	**>
-	map TimeInfo {
-		TimeInfoType to Value
-	}
-	
-}
diff --git a/enhanced-position-service/api/franca/PositionFeedback.fidl b/enhanced-position-service/api/franca/PositionFeedback.fidl
index 73fc1e6..a4a4131 100755
--- a/enhanced-position-service/api/franca/PositionFeedback.fidl
+++ b/enhanced-position-service/api/franca/PositionFeedback.fidl
@@ -8,9 +8,9 @@
     this file, You can obtain one at http://mozilla.org/MPL/2.0/.

 */

 

-package org.genivi.positioning.EnhancedPositionService

+package org.genivi.EnhancedPositionService

 

-import org.genivi.positioning.EnhancedPositionService.EnhancedPositionServiceTypes.* from "EnhancedPositionServiceTypes.fidl"

+import org.genivi.EnhancedPositionService.EnhancedPositionServiceTypes.* from "EnhancedPositionServiceTypes.fidl"

 

 <**

 	@description : PositionFeedback = This interface allows the application implementing the map-matching algorithm to provide a position feedback to the EnahncedPositionService