diff options
| author | <philippe colliot> | 2016-02-02 15:26:53 +0100 |
|---|---|---|
| committer | <philippe colliot> | 2016-02-02 15:26:53 +0100 |
| commit | 2bb6f1632992213886aaad2fa7be5b8f034511e5 (patch) | |
| tree | 17aa50d1f385b28786d6212029a2ceae491cee99 /api | |
| parent | 61fd86539acf19d009a0fc472b203387fd6cd817 (diff) | |
| download | poi-service-2bb6f1632992213886aaad2fa7be5b8f034511e5.tar.gz | |
Alignment of the DBus xml files, some fix (not tested yet)
Diffstat (limited to 'api')
18 files changed, 437 insertions, 250 deletions
diff --git a/api/franca/CommonTypes.fidl b/api/franca/CommonTypes.fidl index 89fba01..7517aa8 100755 --- a/api/franca/CommonTypes.fidl +++ b/api/franca/CommonTypes.fidl @@ -20,4 +20,7 @@ typeCollection CommonTypes { String date
}
+ <** @description:Unique ID for a POI Categories**>
+ typedef CategoryID is UInt32
+
}
\ No newline at end of file diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl index 629ddcf..56c7a59 100755 --- a/api/franca/navigation/mapviewer/MapViewerControl.fidl +++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl @@ -17,7 +17,7 @@ interface MapViewerControl { major 1
minor 0
}
-
+
enumeration MapViewType extends BasicEnum { //Base 0x0010
MAIN_MAP = 16
SPLIT_SCREEN = 17
@@ -109,6 +109,12 @@ interface MapViewerControl { LEVEL_5 = 84
}
+ enumeration HeadingType extends BasicEnum { //Base 0x0130
+ CONSTANT_ANGLE = 304
+ TRACK_UP = 305
+ TOWARDS_TARGET = 306
+ }
+
enumeration MapTheme extends BasicEnum {
THEME_BMW_CLASSIC_DAY
THEME_BMW_CLASSIC_NIGHT
@@ -435,6 +441,24 @@ interface MapViewerControl { }
<**
+ @description : followCarModeChanged = This signal is emitted when the follow-car-mode changes
+ **>
+ broadcast followCarModeChanged {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+
+ <**
+ @description : followCarMode = If true, the current car position is interpreted as position of the point the camera must look at
+ **>
+ Boolean followCarMode
+ }
+ }
+
+ <**
@description : setCameraPosition = This method sets the coordinates of the point at which the camera must be positioned
**>
method setCameraPosition {
@@ -471,6 +495,24 @@ interface MapViewerControl { }
<**
+ @description : cameraPositionChanged = This signal is emitted when the position of the camera changes
+ **>
+ broadcast cameraPositionChanged {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+
+ <**
+ @description : followCarMode = If true, the current car position is interpreted as position of the point the camera must look at
+ **>
+ Coordinate3D targetPoint
+ }
+ }
+
+ <**
@description : setCameraHeadingAngle = This method sets the map view heading angle
**>
method setCameraHeadingAngle {
@@ -547,7 +589,7 @@ interface MapViewerControl { <**
@description : headingType = enum(INVALID,CONSTANT_ANGLE,TRACK_UP,TOWARDS_TARGET, ... )
**>
- UInt16 headingType
+ HeadingType headingType
<**
@description : headingAngle = heading angle in degrees measured from the North axis clockwise. Range[0:360]
@@ -602,6 +644,25 @@ interface MapViewerControl { }
<**
+ @description : cameraTiltAngleChanged = This signal is emitted when the camera tilt angle changes
+ **>
+ broadcast cameraTiltAngleChanged {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+
+ <**
+ @description : tilt = tilt angle in degrees. Range [-180:180]
+ **>
+ Int32 tilt
+ }
+ }
+
+
+ <**
@description : setCameraRollAngle = This method sets the camera roll angle
**>
method setCameraRollAngle {
@@ -688,6 +749,24 @@ interface MapViewerControl { }
<**
+ @description : cameraDistanceFromTargetPointChanged = This signal is emitted when the camera distance from the target point changes
+ **>
+ broadcast cameraDistanceFromTargetPointChanged {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+
+ <**
+ @description : distance = distance from the view point in meters
+ **>
+ UInt32 distance
+ }
+ }
+
+ <**
@description : setMapViewScaleMode = This method sets the scaling mode.
**>
method setMapViewScaleMode {
@@ -731,6 +810,29 @@ interface MapViewerControl { }
<**
+ @description : mapViewScaleChanged = This signal is emitted when the mapview scale changes
+ **>
+ broadcast mapViewScaleChanged {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+
+ <**
+ @description : scaleID = scale identifier. Range[0:256]
+ **>
+ Int8 scaleID
+
+ <**
+ @description : isMinMax = enum(INVALID,MIN,MAX,MID, ... )
+ **>
+ MapScaleType isMinMax
+ }
+ }
+
+ <**
@description : getSupportedMapViewScaleModes = This method gets the supported scaling modes.
**>
method getSupportedMapViewScaleModes {
@@ -890,6 +992,24 @@ interface MapViewerControl { }
<**
+ @description : mapViewObjectVisibilityChanged = This signal is emitted when the type of objects shown on the map changes
+ **>
+ broadcast mapViewObjectVisibilityChanged {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+
+ <**
+ @description : objectVisibilityList = if true the objects are shown else they are not shown
+ **>
+ MapObjectVisibility objectVisibilityList
+ }
+ }
+
+ <**
@description : getSupportedMapViewObjectVisibilities = This method gets the supported object visibilities.
**>
method getSupportedMapViewObjectVisibilities {
@@ -1052,8 +1172,23 @@ interface MapViewerControl { }
<**
+ @description : mapViewBoundingBoxChanged = This signal is emitted when the bounding box of a map instance changes
+ **>
+ broadcast mapViewBoundingBoxChanged {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+
+ Rectangle boundingBox
+ }
+ }
+
+ <**
@description : setMapViewSaveArea = This methods defines the area that the HMI guarantees not to -cover with other windows or user interface elements
+ cover with other windows or user interface elements
**>
method setMapViewSaveArea {
in {
@@ -1074,7 +1209,7 @@ cover with other windows or user interface elements <**
@description : setMapViewSaveArea = This methods defines the area that the HMI guarantees not to -cover with other windows or user interface elements
+ cover with other windows or user interface elements
**>
method getMapViewSaveArea {
in {
@@ -1090,6 +1225,21 @@ cover with other windows or user interface elements }
<**
+ @description : mapViewSaveAreaChanged = This signal is emitted when the area that the HMI guarantees not to cover with other windows or user interface elements chnages
+ **>
+ broadcast mapViewSaveAreaChanged {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+
+ MapViewArea saveArea
+ }
+ }
+
+ <**
@description : setMapViewPan = This method pans a given map instance
**>
method setMapViewPan {
@@ -1231,6 +1381,24 @@ cover with other windows or user interface elements }
<**
+ @description : mapViewVisibilityChanged = This signal is emitted when the MapView visibility changes
+ **>
+ broadcast mapViewVisibilityChanged {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+
+ <**
+ @description : visibilityMode = enum(INVALID,VISIBLE,INVISIBLE,FROZEN, ... )
+ **>
+ Visibility visibilityMode
+ }
+ }
+
+ <**
@description : getSupportedMapViewVisibilityModes = This method retrieves the supported mapview visibility modes
**>
method getSupportedMapViewVisibilityModes {
@@ -1283,6 +1451,24 @@ cover with other windows or user interface elements }
<**
+ @description : mapViewPerformanceLevelChanged = This signal is emitted when the perfomance level of a map instance changes
+ **>
+ broadcast mapViewPerformanceLevelChanged {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+
+ <**
+ @description : performanceLevel = enum(INVALID,LEVEL1,LEVEL2,LEVEL3,LEVEL4,LEVEL5, ... )
+ **>
+ Level performanceLevel
+ }
+ }
+
+ <**
@description : getSupportedMapViewPerformanceLevels = This method retrieves the supported perfomance levels
**>
method getSupportedMapViewPerformanceLevels {
@@ -1343,6 +1529,20 @@ cover with other windows or user interface elements }
<**
+ @description : displayedRoutes = This signal is emitted when the list of displayed routes change
+ **>
+ broadcast displayedRoutes {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+ DisplayedRoute [] displayedRoutes
+ }
+ }
+
+ <**
@description : getDisplayedRoutes = This method returns a list of displayed routes
**>
method getDisplayedRoutes {
@@ -1370,7 +1570,7 @@ cover with other windows or user interface elements Handle mapViewInstanceHandle
}
out {
- UInt16 [] poiCategoryIds
+ CategoryID[] poiCategoryIds
}
}
@@ -1390,7 +1590,8 @@ cover with other windows or user interface elements @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
Handle mapViewInstanceHandle
- UInt16 [] poiCategoryIds
+
+ CategoryID[] poiCategoryIds
}
}
@@ -1410,7 +1611,8 @@ cover with other windows or user interface elements @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
Handle mapViewInstanceHandle
- UInt16 [] poiCategoryIds
+
+ CategoryID[] poiCategoryIds
<**
@description : minScaleID = minimun scale on which the POI categories are displayed
@@ -1439,7 +1641,38 @@ cover with other windows or user interface elements @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
Handle mapViewInstanceHandle
- UInt16 [] poiCategoryIds
+
+ CategoryID[] poiCategoryIds
+ }
+ }
+
+ <**
+ @description : poiCategoriesVisibilityChanged = This signal is emitted when the visibility of POI categories on a map instance changes
+ **>
+ broadcast poiCategoriesVisibilityChanged {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+
+ CategoryID[] poiCategoryIds
+
+ <**
+ @description : visible = TRUE means that the POI categories are visible
+ **>
+ Boolean visible
+
+ <**
+ @description : minScaleID = minimun scale on which the POI categories are displayed
+ **>
+ Int8 minScaleID
+
+ <**
+ @description : maxScaleID = maximum scale on which the POI categories are displayed
+ **>
+ Int8 maxScaleID
}
}
@@ -1510,6 +1743,24 @@ cover with other windows or user interface elements }
<**
+ @description : mapViewThemeChanged = This signal is emitted when the theme of a map view instance changes
+ **>
+ broadcast mapViewThemeChanged {
+ out {
+
+ <**
+ @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+ **>
+ Handle mapViewInstanceHandle
+
+ <**
+ @description : mapViewTheme = enum(INVALID,THEME_1,THEME_2,THEME_3, ... )
+ **>
+ MapTheme mapViewTheme
+ }
+ }
+
+ <**
@description : getSupportedMapViewThemes = This method retrieves the supported mapview themes
**>
method getSupportedMapViewThemes {
@@ -1649,61 +1900,4 @@ cover with other windows or user interface elements }
}
- <**
- @description : mapViewScaleChanged = This signal is emitted when the mapview scale changes
- **>
- broadcast mapViewScaleChanged {
- out {
-
- <**
- @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
- **>
- Handle mapViewInstanceHandle
-
- <**
- @description : scaleID = scale identifier. Range[0:256]
- **>
- Int8 scaleID
-
- <**
- @description : isMinMax = enum(INVALID,MIN,MAX,MID, ... )
- **>
- MapScaleType isMinMax
- }
- }
-
- <**
- @description : mapViewVisibilityChanged = This signal is emitted when the MapView visibility changes
- **>
- broadcast mapViewVisibilityChanged {
- out {
-
- <**
- @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
- **>
- Handle mapViewInstanceHandle
-
- <**
- @description : visibilityMode = enum(INVALID,VISIBLE,INVISIBLE,FROZEN, ... )
- **>
- Visibility visibilityMode
- }
- }
-
- <**
- @description : displayedRoutes = This signal is emitted when the list of displayed routes change
- **>
- broadcast displayedRoutes {
- out {
-
- <**
- @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
- **>
- Handle mapViewInstanceHandle
- DisplayedRoute [] displayedRoutes
- }
- }
-
-
-
}
\ No newline at end of file diff --git a/api/franca/navigation/mapviewer/MapViewerSession.fidl b/api/franca/navigation/mapviewer/MapViewerSession.fidl index 9657f0b..af1f229 100644 --- a/api/franca/navigation/mapviewer/MapViewerSession.fidl +++ b/api/franca/navigation/mapviewer/MapViewerSession.fidl @@ -40,10 +40,6 @@ interface MapViewerSession { <** @description : sessionHandle **> Handle sessionHandle } - error { - <** @description: This error is generated if no more session handles are available **> - NoMoreSessionHandles - } } <** @description : deleteSession = This method deletes a session and its associated resources .**> @@ -52,10 +48,6 @@ interface MapViewerSession { <** @description : sessionHandle **> Handle sessionHandle } - error { - <** @description: This error is generated if an application tries to delete a session handle that is not available **> - SessionNotAvailable - } } <** @description : This method returns whether a given session handle is available or not (for example because it was deleted) .**> diff --git a/api/franca/navigation/navigationcore/Guidance.fidl b/api/franca/navigation/navigationcore/Guidance.fidl index ad8c776..5d5362e 100644 --- a/api/franca/navigation/navigationcore/Guidance.fidl +++ b/api/franca/navigation/navigationcore/Guidance.fidl @@ -25,10 +25,6 @@ interface Guidance { NOT_AVAILABLE = 2
}
-// enumeration RoadProperty extends BasicEnum {
-
-// }
-
enumeration LaneType extends BasicEnum {
LANE_INFO_BITMASK_STRAIGHT = 1
LANE_INFO_BITMASK_SLIGHTRIGHT = 2
@@ -114,7 +110,36 @@ interface Guidance { DIVIDER_INTERRUPTEDSOLID = 598
}
- struct tWaypointStruct {
+ enumeration ManeuverDataAttribute extends BasicEnum { //Base 0x260
+ LENGTH = 608
+ DIRECTION = 609
+ EXIT_NUMBER = 610
+ ROAD_FORM = 611
+ LANE_INFO = 612
+ LATITUDE = 613
+ LONGITUDE = 614
+ ALTITUDE = 615
+ }
+
+ union ManeuverDataValue {
+ UInt16 uint16Value
+ String stringValue
+ LaneInfo[] laneInfoValue
+ Coordinate3D coordinate3DValue
+ }
+
+ map ManeuverData {
+ ManeuverDataAttribute to ManeuverDataValue
+ }
+
+ struct LaneInfo {
+ UInt32 laneIndex
+ ByteBuffer laneDirections
+ LaneType directionToFollow
+ LaneDivider divider
+ }
+
+ struct WaypointStruct {
UInt32 waypointOffset
UInt32 travelTime
Int32 direction
@@ -126,30 +151,14 @@ interface Guidance { }
<**
- @description : struct generated for DBus argument GetManeuversList_maneuversListElem6Elem4
- **>
- struct ManeuverSegment {
- ManeuverType maneuver
- UInt16 maneuverLength
- }
-
- <**
- @description : struct generated for DBus argument GetManeuversList_maneuversListElem6Elem5
- **>
- struct ManeuverTurn {
- ManeuverDirection maneuverDirection
- String exitNumber
- }
-
- <**
@description : struct generated for DBus argument GetManeuversList_maneuversListElem6
**>
- struct tManeuverItem {
+ struct ManeuverItem {
UInt32 offsetOfManeuver
UInt32 travelTime
Int32 direction
- ManeuverSegment segment
- ManeuverTurn turnTo
+ ManeuverType maneuver
+ ManeuverData maneuverData
}
<**
@@ -161,7 +170,7 @@ interface Guidance { UInt16 roadPropertyAfterManeuver
Side drivingSide
UInt32 offsetOfNextManeuver
- tManeuverItem[] items
+ ManeuverItem[] items
}
<**
@@ -273,7 +282,7 @@ interface Guidance { @description : numberOfWaypoints = the number of retrieved waypoints(NOTE: the number corresponds to the number of elements in the array)
**>
UInt16 numberOfWaypoints
- tWaypointStruct [] waypointsList
+ WaypointStruct [] waypointsList
}
}
@@ -301,7 +310,7 @@ interface Guidance { <**
@description : side = enum(LEFT,RIGHT,NOT_AVAILABLE)
**>
- UInt16 side
+ Side side
<**
@description : timeZone = time zone of the destination. It is expressed as the time difference from the UTC in minutes
diff --git a/api/franca/navigation/navigationcore/LocationInput.fidl b/api/franca/navigation/navigationcore/LocationInput.fidl index 2fc5ccc..aa52438 100644 --- a/api/franca/navigation/navigationcore/LocationInput.fidl +++ b/api/franca/navigation/navigationcore/LocationInput.fidl @@ -57,7 +57,7 @@ interface LocationInput { Int32 intValue
Double doubleValue
String stringValue
- Coordinate3D coordinateValue
+ Coordinate3D coordinate3DValue
ByteBuffer internalData
}
@@ -96,9 +96,6 @@ interface LocationInput { **>
LocationHandle locationInputHandle
}
- error {
- NoMoreLocationInputHandles
- }
}
<**
diff --git a/api/franca/navigation/navigationcore/NavigationCoreSession.fidl b/api/franca/navigation/navigationcore/NavigationCoreSession.fidl index 2bb4292..5d4b029 100644 --- a/api/franca/navigation/navigationcore/NavigationCoreSession.fidl +++ b/api/franca/navigation/navigationcore/NavigationCoreSession.fidl @@ -40,10 +40,6 @@ interface NavigationCoreSession { <** @description : sessionHandle **> Handle sessionHandle } - error { - <** @description: This error is generated if no more session handles are available **> - NoMoreSessionHandles - } } <** @description : deleteSession = This method deletes a session and its associated resources .**> @@ -52,10 +48,6 @@ interface NavigationCoreSession { <** @description : sessionHandle **> Handle sessionHandle } - error { - <** @description: This error is generated if an application tries to delete a session handle that is not available **> - SessionNotAvailable - } } <** @description : This method returns whether a given session handle is available or not (for example because it was deleted) .**> diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl index ca6f97e..590e4a9 100644 --- a/api/franca/navigation/navigationcore/Routing.fidl +++ b/api/franca/navigation/navigationcore/Routing.fidl @@ -86,14 +86,16 @@ interface Routing { }
- <**
- @description : struct generated for DBus argument SetRoutePreferences_roadPreferenceList
- **>
+ map UnfullfilledRoutePreference {
+ PreferenceMode to RoutePreferenceSource
+ }
+
struct RoutePreference {
PreferenceMode mode
RoutePreferenceSource source
}
+
<**
@description : struct generated for DBus argument SetRoutePreferences_conditionPreferenceList
**>
@@ -102,7 +104,6 @@ interface Routing { ConditionPreferenceSource source
}
-
map RouteSchedule {
Schedule to UInt32
}
@@ -728,7 +729,7 @@ interface Routing { **>
Handle routeHandle
- RoutePreference unfullfilledPreferences
+ UnfullfilledRoutePreference unfullfilledPreferences
}
}
@@ -748,7 +749,7 @@ interface Routing { **>
CalculationError errorCode
- RoutePreference unfullfilledPreferences
+ UnfullfilledRoutePreference unfullfilledPreferences
}
}
diff --git a/api/franca/navigation/poiservice/POIServiceTypes.fidl b/api/franca/navigation/poiservice/POIServiceTypes.fidl index 4186bf7..fbafed0 100644 --- a/api/franca/navigation/poiservice/POIServiceTypes.fidl +++ b/api/franca/navigation/poiservice/POIServiceTypes.fidl @@ -6,6 +6,7 @@ package org.genivi.navigation.poiservice
+import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"
import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
typeCollection POIServiceTypes {
@@ -17,9 +18,6 @@ typeCollection POIServiceTypes { <** @description:Unique ID for a POI results**>
typedef POI_ID is UInt32
- <** @description:Unique ID for a POI Categories**>
- typedef CategoryID is UInt32
-
<** @description:Unique ID for a POI Icon Resource**>
typedef ResourceID is UInt32
diff --git a/api/franca/navigation/poiservice/ServiceContentAccess.fidl b/api/franca/navigation/poiservice/ServiceContentAccess.fidl index de17169..bad62c2 100644 --- a/api/franca/navigation/poiservice/ServiceContentAccess.fidl +++ b/api/franca/navigation/poiservice/ServiceContentAccess.fidl @@ -6,6 +6,7 @@ package org.genivi.navigation.poiservice
+import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"
import org.genivi.navigation.poiservice.POIServiceTypes.* from "POIServiceTypes.fidl"
diff --git a/api/map-viewer/genivi-mapviewer-configuration.xml b/api/map-viewer/genivi-mapviewer-configuration.xml index 39254bc..0176e71 100644 --- a/api/map-viewer/genivi-mapviewer-configuration.xml +++ b/api/map-viewer/genivi-mapviewer-configuration.xml @@ -30,7 +30,7 @@ <doc> <line>SetUnitsOfMeasurement = This method sets the units of measurement</line> </doc> - <arg name="unitsOfMeasurementList" type="a{qv}" direction="in"> + <arg name="unitsOfMeasurementList" type="a{i(yv)}" direction="in"> <doc> <line>unitsOfMeasurementList = array[unitsOfMeasurement]</line> <line>unitsOfMeasurement = tuple (key,value)</line> @@ -43,7 +43,7 @@ <doc> <line>GetUnitsOfMeasurement = This method retrieves the units of measurement</line> </doc> - <arg name="unitsOfMeasurementList" type="a{qv}" direction="out"> + <arg name="unitsOfMeasurementList" type="a{i(yv)}" direction="out"> <doc> <line>unitsOfMeasurementList = array[unitsOfMeasurement]</line> <line>unitsOfMeasurement = tuple (key,value)</line> @@ -56,7 +56,7 @@ <doc> <line>GetSupportedUnitsOfMeasurement = This method retrieves the supported units of measurement</line> </doc> - <arg name="unitsOfMeasurementList" type="a{qv}" direction="out"> + <arg name="unitsOfMeasurementList" type="a{i(yv)}" direction="out"> <doc> <line>unitsOfMeasurementList = array[unitsOfMeasurement]</line> <line>unitsOfMeasurement = dictionary[key,value]</line> @@ -70,7 +70,7 @@ <doc> <line>SetTimeFormat = This method sets the time format</line> </doc> - <arg name="timeFormat" type="q" direction="in"> + <arg name="timeFormat" type="i" direction="in"> <doc> <line>timeFormat = enum(INVALID,12H,24H, ... )</line> </doc> @@ -80,7 +80,7 @@ <doc> <line>GetTimeFormat = This method retrieves the time format</line> </doc> - <arg name="timeFormat" type="q" direction="out"> + <arg name="timeFormat" type="i" direction="out"> <doc> <line>timeFormat = enum(INVALID,12H,24H, ... )</line> </doc> @@ -90,7 +90,7 @@ <doc> <line>GetSupportedTimeFormats = This method retrieves the supported time formats</line> </doc> - <arg name="timeFormatList" type="aq" direction="out"> + <arg name="timeFormatList" type="ai" direction="out"> <doc> <line>timeFormatList = array[timeFormat]</line> <line>timeFormat = enum(INVALID,12H,24H, ... )</line> @@ -101,7 +101,7 @@ <doc> <line>SetCoordinatesFormat = This method sets the coordinates format</line> </doc> - <arg name="coordinatesFormat" type="q" direction="in"> + <arg name="coordinatesFormat" type="i" direction="in"> <doc> <line>coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )</line> <line>DEGREES format = d.dº</line> @@ -114,7 +114,7 @@ <doc> <line>GetCoordinatesFormat = This method retrieves the coordinates format</line> </doc> - <arg name="coordinatesFormat" type="q" direction="out"> + <arg name="coordinatesFormat" type="i" direction="out"> <doc> <line>coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )</line> <line>DEGREES format = d.dº</line> @@ -127,7 +127,7 @@ <doc> <line>GetSupportedCoordinatesFormats = This method retrieves the supported coordinates formats</line> </doc> - <arg name="coordinatesFormatList" type="aq" direction="out"> + <arg name="coordinatesFormatList" type="ai" direction="out"> <doc> <line>coordinatesFormatList = array[coordinatesFormat]</line> <line>coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )</line> @@ -194,7 +194,7 @@ <doc> <line>ConfigurationChanged = This signal is sent to the clients when one or more configuration settings changes</line> </doc> - <arg name="changedSettings" type="aq"> + <arg name="changedSettings" type="ai"> <doc> <line>changedSettings = array[setting]</line> <line>setting = enum(INVALID,UNITS_OF_MEASUREMENT,LOCALE,TIME_FORMAT,COORDINATES_FORMAT, ... )</line> diff --git a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml index a41ce76..e400238 100644 --- a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml +++ b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml @@ -43,7 +43,7 @@ <line>verticalSize = vertical size of the map instance in pixels</line> </doc> </arg> - <arg name="mapViewType" type="q" direction="in"> + <arg name="mapViewType" type="i" direction="in"> <doc> <line>mapViewType = enum(INVALID,MAIN_MAP,SPLIT_SCREEN, ... )</line> <line>Note: to be used in case that a specific position of the map instance with respect to the display viewport is required</line> @@ -91,7 +91,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="mapViewType" type="q" direction="out"> + <arg name="mapViewType" type="i" direction="out"> <doc> <line>mapViewType = enum(INVALID,MAIN_MAP,SPLIT_SCREEN, ... )</line> </doc> @@ -101,7 +101,7 @@ <doc> <line>GetSupportedMapViewTypes = This method retrieves the supported map view types</line> </doc> - <arg name="mapViewTypeList" type="aq" direction="out"> + <arg name="mapViewTypeList" type="ai" direction="out"> <doc> <line>mapViewTypeList = array[mapViewType]</line> <line>mapViewType = enum(INVALID,MAIN_MAP,SPLIT_SCREEN, ... )</line> @@ -123,7 +123,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="targetPoint" type="(ddi)" direction="in"> + <arg name="targetPoint" type="(ddd)" direction="in"> <doc> <line>targetPoint = (lat,lon,alt)</line> <line>lat = latitude in format %3.6f. Range[-90:+90]</line> @@ -142,7 +142,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="targetPoint" type="(ddi)" direction="out"> + <arg name="targetPoint" type="(ddd)" direction="out"> <doc> <line>targetPoint = (lat,lon,alt)</line> <line>lat = latitude in format %3.6f. Range[-90:+90]</line> @@ -217,7 +217,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="position" type="(ddi)" direction="in"> + <arg name="position" type="(ddd)" direction="in"> <doc> <line>position = (lat,lon,alt)</line> <line>lat = latitude in format %3.6f. Range[-90:+90]</line> @@ -235,7 +235,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="position" type="(ddi)" direction="out"> + <arg name="position" type="(ddd)" direction="out"> <doc> <line>position = (lat,lon,alt)</line> <line>lat = latitude in format %3.6f. Range[-90:+90]</line> @@ -253,7 +253,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="targetPoint" type="(ddi)"> + <arg name="targetPoint" type="(ddd)"> <doc> <line>targetPoint = (lat,lon,alt)</line> <line>lat = latitude in format %3.6f. Range[-90:+90]</line> @@ -333,7 +333,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="headingType" type="q" direction="out"> + <arg name="headingType" type="i" direction="out"> <doc> <line>headingType = enum(INVALID,CONSTANT_ANGLE,TRACK_UP,TOWARDS_TARGET, ... )</line> </doc> @@ -400,7 +400,7 @@ </method> <method name="GetCameraTiltAngle"> <doc> - <line>GetMapViewTiltAngle = This method returns the camera tilt angle</line> + <line>GetCameraTiltAngle = This method returns the camera tilt angle</line> </doc> <arg name="mapViewInstanceHandle" type="u" direction="in"> <doc> @@ -534,7 +534,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="scaleMode" type="q" direction="in"> + <arg name="scaleMode" type="i" direction="in"> <doc> <line>scaleMode = enum(AUTOMATIC,MANUAL,HYBRID)</line> <line>scaleMode = AUTOMATIC, adjusts the camera distance automatically (e.g. depending on the speed)</line> @@ -552,7 +552,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="scaleMode" type="q" direction="out"> + <arg name="scaleMode" type="i" direction="out"> <doc> <line>scaleMode = enum(AUTOMATIC,MANUAL,HYBRID)</line> <line>scaleMode = AUTOMATIC, adjusts the camera distance automatically (e.g. depending on the speed)</line> @@ -570,7 +570,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="scaleModeList" type="aq" direction="out"> + <arg name="scaleModeList" type="ai" direction="out"> <doc> <line>scaleModeList = array[scaleMode]</line> <line>scaleMode = enum(AUTOMATIC,MANUAL,HYBRID)</line> @@ -594,7 +594,7 @@ <line>scaleID = scale identifier. Range[0:256]</line> </doc> </arg> - <arg name="isMinMax" type="q"> + <arg name="isMinMax" type="i"> <doc> <line>isMinMax = enum(INVALID,MIN,MAX,MID, ... )</line> <line>MIN = scale ID minimal value</line> @@ -664,7 +664,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="perspective" type="q" direction="in"> + <arg name="perspective" type="i" direction="in"> <doc> <line>perspective = enum(INVALID,2D,3D, ... )</line> </doc> @@ -679,7 +679,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="perspective" type="q" direction="out"> + <arg name="perspective" type="i" direction="out"> <doc> <line>perspective = enum(INVALID,2D,3D, ... )</line> </doc> @@ -704,7 +704,7 @@ <doc> <line>GetSupportedMapViewPerspectives = This method retrieves the supported mapview perspectives</line> </doc> - <arg name="perspectiveList" type="aq" direction="out"> + <arg name="perspectiveList" type="ai" direction="out"> <doc> <line>perspectiveList = array[perspective]</line> <line>perspective = enum(INVALID,2D,3D, ... )</line> @@ -725,7 +725,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="objectVisibilityList" type="a{qb}" direction="in"> + <arg name="objectVisibilityList" type="a{ib}" direction="in"> <doc> <line> objectVisibilityList = array[objectVisibility]</line> <line> objectVisibility = dictionary[key,value]</line> @@ -743,7 +743,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="objectVisibilityList" type="a{qb}" direction="out"> + <arg name="objectVisibilityList" type="a{ib}" direction="out"> <doc> <line> objectVisibilityList = array[objectVisibility]</line> <line> objectVisibility = dictionary[key,value]</line> @@ -761,7 +761,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="objectVisibilityList" type="a{qb}"> + <arg name="objectVisibilityList" type="a{ib}"> <doc> <line> objectVisibilityList = array[objectVisibility]</line> <line> objectVisibility = dictionary[key,value]</line> @@ -779,7 +779,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="objectVisibilityList" type="aq" direction="out"> + <arg name="objectVisibilityList" type="ai" direction="out"> <doc> <line> objectVisibilityList = array[objectVisibility]</line> <line> objectVisibility = enum[BUILDINGS,TERRAIN, ...]</line> @@ -796,7 +796,7 @@ <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="scaleList" type="a(qqqu)" direction="out"> + <arg name="scaleList" type="a(qqiu)" direction="out"> <doc> <line>scaleList = array[struct(scaleId,scaleValue,scaleUnit,millimetersPerPixel)]</line> <line>scaleId = scale identifier. Range [0:256]</line> @@ -881,7 +881,7 @@ <line>scaleID = scale identifier. Range[0:256]</line> </doc> </arg> - <arg name="isMinMax" type="q" direction="out"> + <arg name="isMinMax" type="i" direction="out"> <doc> <line>isMinMax = enum(INVALID,MIN,MAX,MID, ... )</line> <line>MIN = scale ID minimal value</line> @@ -1036,7 +1036,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="panningAction" type="q" direction="in"> + <arg name="panningAction" type="i" direction="in"> <doc> <line>panningAction = enum(PAN_START,PAN_TO,PAN_END)</line> <line>PAN_START, start panning the map at the specified screen coordinate identified by the arguments 'x' and 'y'</line> @@ -1062,7 +1062,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="valueToReturn" type="q" direction="in"> + <arg name="valueToReturn" type="i" direction="in"> <doc> <line>valueToReturn = enum(PAN_START,PAN_TO,PAN_END)</line> </doc> @@ -1136,7 +1136,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="visibilityMode" type="q" direction="in"> + <arg name="visibilityMode" type="i" direction="in"> <doc> <line>visibilityMode = enum(INVALID,VISIBLE,INVISIBLE,FROZEN, ... )</line> </doc> @@ -1151,7 +1151,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="visibilityMode" type="q" direction="out"> + <arg name="visibilityMode" type="i" direction="out"> <doc> <line>visibilityMode = enum(INVALID,VISIBLE,INVISIBLE,FROZEN, ... )</line> </doc> @@ -1161,7 +1161,7 @@ cover with other windows or user interface elements</line> <doc> <line>GetSupportedMapViewVisibilityModes = This method retrieves the supported mapview visibility modes</line> </doc> - <arg name="visibilityModeList" type="aq" direction="out"> + <arg name="visibilityModeList" type="ai" direction="out"> <doc> <line>visibilityModeList = array[visibilityMode]</line> <line>visibilityMode = enum(INVALID,VISIBLE,INVISIBLE,FROZEN, ... )</line> @@ -1177,7 +1177,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="visibilityMode" type="q"> + <arg name="visibilityMode" type="i"> <doc> <line>visibilityMode = enum(INVALID,VISIBLE,INVISIBLE,FROZEN, ... )</line> </doc> @@ -1198,7 +1198,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="performanceLevel" type="q" direction="in"> + <arg name="performanceLevel" type="i" direction="in"> <doc> <line>performanceLevel = enum(INVALID,LEVEL1,LEVEL2,LEVEL3,LEVEL4,LEVEL5, ... )</line> <line>Note: performance levels are application specific</line> @@ -1214,7 +1214,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="performanceLevel" type="q" direction="out"> + <arg name="performanceLevel" type="i" direction="out"> <doc> <line>performanceLevel = enum(INVALID,LEVEL1,LEVEL2,LEVEL3,LEVEL4,LEVEL5, ... )</line> </doc> @@ -1229,7 +1229,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="performanceLevel" type="q"> + <arg name="performanceLevel" type="i"> <doc> <line>performanceLevel = enum(INVALID,LEVEL1,LEVEL2,LEVEL3,LEVEL4,LEVEL5, ... )</line> </doc> @@ -1239,7 +1239,7 @@ cover with other windows or user interface elements</line> <doc> <line>GetSupportedMapViewPerformanceLevels = This method retrieves the supported perfomance levels</line> </doc> - <arg name="performanceLevelList" type="aq" direction="out"> + <arg name="performanceLevelList" type="ai" direction="out"> <doc> <line>performanceLevelList = array[performanceLevel]</line> <line>performanceLevel = enum(INVALID,LEVEL1,LEVEL2,LEVEL3,LEVEL4,LEVEL5, ... )</line> @@ -1336,7 +1336,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="poiCategoryIds" type="aq" direction="out"> + <arg name="poiCategoryIds" type="au" direction="out"> <doc> <line>poiCategoryIds = array[poiCategoryId]</line> <line>poiCategoryId = a POI category as defined in the 'GENIVI POIService API'.</line> @@ -1358,7 +1358,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="poiCategoryIds" type="aq" direction="in"> + <arg name="poiCategoryIds" type="au" direction="in"> <doc> <line>poiCategoryIds = array[poiCategoryId]</line> <line>poiCategoryId = a POI category as defined in the 'GENIVI POIService API'.</line> @@ -1380,7 +1380,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="poiCategoryIds" type="aq" direction="in"> + <arg name="poiCategoryIds" type="au" direction="in"> <doc> <line>poiCategoryIds = array[poiCategoryId]</line> <line>poiCategoryId = a POI category as defined in the 'GENIVI POIService API'.</line> @@ -1411,7 +1411,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="poiCategoryIds" type="aq" direction="in"> + <arg name="poiCategoryIds" type="au" direction="in"> <doc> <line>poiCategoryIds = array[poiCategoryId]</line> <line>poiCategoryId = a POI category as defined in the 'GENIVI POIService API'.</line> @@ -1427,7 +1427,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="poiCategoryIds" type="aq"> + <arg name="poiCategoryIds" type="au"> <doc> <line>poiCategoryIds = array[poiCategoryId]</line> <line>poiCategoryId = a POI category as defined in the 'GENIVI POIService API'.</line> @@ -1483,7 +1483,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="mapViewTheme" type="q" direction="in"> + <arg name="mapViewTheme" type="i" direction="in"> <doc> <line>mapViewTheme = enum(INVALID,THEME_1,THEME_2,THEME_3, ... )</line> <line>Note: Themes are implementation specific. Example: THEME_1 = day color, THEME_2 = night color</line> @@ -1499,7 +1499,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="mapViewTheme" type="q" direction="out"> + <arg name="mapViewTheme" type="i" direction="out"> <doc> <line>mapViewTheme = enum(INVALID,THEME_1,THEME_2,THEME_3, ... )</line> <line>Note: Themes are implementation specific. Example: THEME_1 = day color, THEME_2 = night color</line> @@ -1515,7 +1515,7 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="mapViewTheme" type="q"> + <arg name="mapViewTheme" type="i"> <doc> <line>mapViewTheme = enum(INVALID,THEME_1,THEME_2,THEME_3, ... )</line> <line>Note: Themes are implementation specific. Example: THEME_1 = day color, THEME_2 = night color</line> @@ -1526,7 +1526,7 @@ cover with other windows or user interface elements</line> <doc> <line>GetSupportedMapViewThemes = This method retrieves the supported mapview themes</line> </doc> - <arg name="mapViewThemeList" type="aq" direction="out"> + <arg name="mapViewThemeList" type="ai" direction="out"> <doc> <line>mapViewThemeList = array[mapViewTheme]</line> <line>mapViewTheme = enum(INVALID,THEME_1,THEME_2,THEME_3, ... )</line> @@ -1696,7 +1696,7 @@ cover with other windows or user interface elements</line> <line>y = y-coordinate of the position on the map view specified by user input (y=0 indicates the first top pixel of the map view)</line> </doc> </arg> - <arg name="selectableTypes" type="aq" direction="in"> + <arg name="selectableTypes" type="ai" direction="in"> <doc> <line>selectableTypes = array[selectableType]</line> <line>selectableType = enum(INVALID,CUSTOM_ELEMENT,CURRENT_POSITION,WAYPOINT,POI,TRAFFIC_INCIDENT,ROUTE,GEOCOORDINATES)</line> @@ -1708,7 +1708,7 @@ cover with other windows or user interface elements</line> <line>maxNumberOfSelectedElements = maximum number of selected elements to return. If 0, all possible elements which can be selected will be returned</line> </doc> </arg> - <arg name="selectedElements" type="a(q(dd)v)" direction="out"> + <arg name="selectedElements" type="a(i(dd)(yv))" direction="out"> <doc> <line>selectedElements = array[selectableType,struct(lat,lon),value]</line> <line>selectableType = enum(INVALID,CUSTOM_ELEMENT,CURRENT_POSITION,WAYPOINT,POI,TRAFFIC_INCIDENT,ROUTE,GEOCOORDINATES)</line> diff --git a/api/map-viewer/genivi-mapviewer-session.xml b/api/map-viewer/genivi-mapviewer-session.xml index 2c74e29..604c509 100644 --- a/api/map-viewer/genivi-mapviewer-session.xml +++ b/api/map-viewer/genivi-mapviewer-session.xml @@ -72,7 +72,7 @@ <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="sessionStatus" type="q" direction="out"> + <arg name="sessionStatus" type="i" direction="out"> <doc> <line>sessionStatus = enum(INVALID,AVAILABLE,NOT_AVAILABLE)</line> </doc> diff --git a/api/navigation-core/genivi-navigationcore-configuration.xml b/api/navigation-core/genivi-navigationcore-configuration.xml index bb45f32..8f11d3a 100644 --- a/api/navigation-core/genivi-navigationcore-configuration.xml +++ b/api/navigation-core/genivi-navigationcore-configuration.xml @@ -30,7 +30,7 @@ <doc> <line>SetUnitsOfMeasurement = This method sets the units of measurement</line> </doc> - <arg name="unitsOfMeasurementList" type="a{qv}" direction="in"> + <arg name="unitsOfMeasurementList" type="a{i(yv)}" direction="in"> <doc> <line>unitsOfMeasurementList = array[unitsOfMeasurement]</line> <line>unitsOfMeasurement = tuple (key,value)</line> @@ -43,7 +43,7 @@ <doc> <line>GetUnitsOfMeasurement = This method retrieves the units of measurement</line> </doc> - <arg name="unitsOfMeasurementList" type="a{qv}" direction="out"> + <arg name="unitsOfMeasurementList" type="a{i(yv)}" direction="out"> <doc> <line>unitsOfMeasurementList = array[unitsOfMeasurement]</line> <line>unitsOfMeasurement = tuple (key,value)</line> @@ -56,7 +56,7 @@ <doc> <line>GetSupportedUnitsOfMeasurement = This method retrieves the supported units of measurement</line> </doc> - <arg name="unitsOfMeasurementList" type="a{qv}" direction="out"> + <arg name="unitsOfMeasurementList" type="a{i(yv)}" direction="out"> <doc> <line>unitsOfMeasurementList = array[unitsOfMeasurement]</line> <line>unitsOfMeasurement = dictionary[key,value]</line> @@ -70,7 +70,7 @@ <doc> <line>SetTimeFormat = This method sets the time format</line> </doc> - <arg name="timeFormat" type="q" direction="in"> + <arg name="timeFormat" type="i" direction="in"> <doc> <line>timeFormat = enum(INVALID,12H,24H, ... )</line> </doc> @@ -80,7 +80,7 @@ <doc> <line>GetTimeFormat = This method retrieves the time format</line> </doc> - <arg name="timeFormat" type="q" direction="out"> + <arg name="timeFormat" type="i" direction="out"> <doc> <line>timeFormat = enum(INVALID,12H,24H, ... )</line> </doc> @@ -90,7 +90,7 @@ <doc> <line>GetSupportedTimeFormats = This method retrieves the supported time formats</line> </doc> - <arg name="timeFormatList" type="aq" direction="out"> + <arg name="timeFormatList" type="ai" direction="out"> <doc> <line>timeFormatList = array[timeFormat]</line> <line>timeFormat = enum(INVALID,12H,24H, ... )</line> @@ -101,7 +101,7 @@ <doc> <line>SetCoordinatesFormat = This method sets the coordinates format</line> </doc> - <arg name="coordinatesFormat" type="q" direction="in"> + <arg name="coordinatesFormat" type="i" direction="in"> <doc> <line>coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )</line> <line>DEGREES format = d.dº</line> @@ -114,7 +114,7 @@ <doc> <line>GetCoordinatesFormat = This method retrieves the coordinates format</line> </doc> - <arg name="coordinatesFormat" type="q" direction="out"> + <arg name="coordinatesFormat" type="i" direction="out"> <doc> <line>coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )</line> <line>DEGREES format = d.dº</line> @@ -127,7 +127,7 @@ <doc> <line>GetSupportedCoordinatesFormats = This method retrieves the supported coordinates formats</line> </doc> - <arg name="coordinatesFormatList" type="aq" direction="out"> + <arg name="coordinatesFormatList" type="ai" direction="out"> <doc> <line>coordinatesFormatList = array[coordinatesFormat]</line> <line>coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )</line> @@ -194,7 +194,7 @@ <doc> <line>ConfigurationChanged = This signal is sent to the clients when one or more configuration settings changes</line> </doc> - <arg name="changedSettings" type="aq"> + <arg name="changedSettings" type="ai"> <doc> <line>changedSettings = array[setting]</line> <line>setting = enum(INVALID,UNITS_OF_MEASUREMENT,LOCALE,TIME_FORMAT,COORDINATES_FORMAT, ... )</line> diff --git a/api/navigation-core/genivi-navigationcore-guidance.xml b/api/navigation-core/genivi-navigationcore-guidance.xml index e03fc45..f3fb951 100644 --- a/api/navigation-core/genivi-navigationcore-guidance.xml +++ b/api/navigation-core/genivi-navigationcore-guidance.xml @@ -92,7 +92,7 @@ <line>isDestinationReached = if TRUE the destination has been reached</line> </doc> </arg> - <arg name="maneuver" type="q" direction="out"> + <arg name="maneuver" type="i" direction="out"> <doc> <line>maneuver = enum(INVALID,CRUISE,MANEUVER_APPEARED,PRE_ADVICE,ADVICE,PASSED, ... )</line> </doc> @@ -122,7 +122,7 @@ <line>numberOfWaypoints = the number of retrieved waypoints(NOTE: the number corresponds to the number of elements in the array)</line> </doc> </arg> - <arg name="waypointsList" type="a(uuiqnnbq)" direction="out"> + <arg name="waypointsList" type="a(uuiinnbq)" direction="out"> <doc> <line>array[struct(waypointOffset,travelTime,direction,side,timeZone,daylightSavingTime,isDestination,number)]</line> <line>waypointOffset = the offset of the way point in meters from the beginning of the route</line> @@ -155,7 +155,7 @@ <line>direction = direction of the destination in degree relatively to the North. Range [0:360]</line> </doc> </arg> - <arg name="side" type="q" direction="out"> + <arg name="side" type="i" direction="out"> <doc> <line>side = enum(LEFT,RIGHT,NOT_AVAILABLE)</line> </doc> @@ -180,7 +180,7 @@ <doc> <line>GuidanceStatusChanged = This signal is emitted when the guidance status changes</line> </doc> - <arg name="guidanceStatus" type="q"> + <arg name="guidanceStatus" type="i"> <doc> <line>guidanceStatus = enum(INVALID,ACTIVE,INACTIVE)</line> <line>ACTIVE means that NavigationCore is providing guidance information</line> @@ -207,7 +207,7 @@ <doc> <line>This signal is emitted each time a maneuver event is going</line> </doc> - <arg name="maneuver" type="q"> + <arg name="maneuver" type="i"> <doc> <line>maneuver = enum(INVALID,CRUISE,MANEUVER_APPEARED,PRE_ADVICE,ADVICE,PASSED, ... )</line> </doc> @@ -243,7 +243,7 @@ <line>Note: the number corresponds to the number of elements in the array</line> </doc> </arg> - <arg name="maneuversList" type="a(ssqqua(uuiqa(qv)))" direction="out"> + <arg name="maneuversList" type="a(ssqiua(uuiia{i(yv)}))" direction="out"> <doc> <line>maneuversList = array[struct(roadNumberAfterManeuver,roadNameAfterManeuver,roadPropertyAfterManeuver,drivingSide,offsetOfNextManeuver,maneuverDetails)]</line> <line>roadNumberAfterManeuver = the number of the road after the maneuver (if a road has multiple road numbers, they will be separated by slashes ('/') and combined into one string)</line> @@ -296,7 +296,7 @@ <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="routeCalculationMode" type="q" direction="in"> + <arg name="routeCalculationMode" type="i" direction="in"> <doc> <line>routeCalculationMode = enum(INVALID,ALL_MANUAL,ALL_AUTOMATIC,TRAFFIC_MANUAL,OFF_ROUTE_MANUAL)</line> </doc> @@ -321,7 +321,7 @@ <doc> <line>GetGuidanceStatus = This method retrieves the guidance status</line> </doc> - <arg name="guidanceStatus" type="q" direction="out"> + <arg name="guidanceStatus" type="i" direction="out"> <doc> <line>guidanceStatus = enum(INVALID,ACTIVE,INACTIVE)</line> <line>ACTIVE means that NavigationCore is providing guidance information</line> @@ -338,7 +338,7 @@ <doc> <line>SetVoiceGuidanceSettings = This method sets the voice guidance settings</line> </doc> - <arg name="promptMode" type="q" direction="in"> + <arg name="promptMode" type="i" direction="in"> <doc> <line>mode = enum(INVALID,DISABLED_PROMPT,AUTOMATIC_PROMPT,MANUAL_PROMPT, ... )</line> <line>MANUAL_PROMPT means that a client application can ask the NavigationCore to play the voice prompts</line> @@ -351,7 +351,7 @@ <doc> <line>GetVoiceGuidanceSettings = This method returns the used voice guidance settings</line> </doc> - <arg name="promptMode" type="q" direction="out"> + <arg name="promptMode" type="i" direction="out"> <doc> <line>mode = enum(INVALID,DISABLED_PROMPT,AUTOMATIC_PROMPT,MANUAL_PROMPT, ... )</line> <line>MANUAL_PROMPT means that a client application can ask the NavigationCore to play the voice prompts</line> @@ -379,7 +379,7 @@ <doc> <line>ActiveRouteChanged = This signal is emitted when the active route changes</line> </doc> - <arg name="changeCause" type="q"> + <arg name="changeCause" type="i"> <doc> <line>changeCause = enum(INVALID,TRAFFIC,OFF_ROUTE,MANUAL,...)</line> </doc> diff --git a/api/navigation-core/genivi-navigationcore-locationinput.xml b/api/navigation-core/genivi-navigationcore-locationinput.xml index ddecb39..113f53c 100644 --- a/api/navigation-core/genivi-navigationcore-locationinput.xml +++ b/api/navigation-core/genivi-navigationcore-locationinput.xml @@ -70,7 +70,7 @@ <doc> <line>GetSupportedAddressAttributes = This method retrieves the supported address attributes</line> </doc> - <arg name="addressAttributesList" type="aq" direction="out"> + <arg name="addressAttributesList" type="ai" direction="out"> <doc> <line>addressAttributesList = array[attribute]</line> <line>attribute = enum(INVALID,LATITUDE,LONGITUDE,ALTITUDE,FULL_ADDRESS,COUNTRY,STATE,CITY,ZIPCODE,STREET,HOUSENUMBER,CROSSING,DISTRICT,PHONENUMBER,POINAME,TOWNCENTER, ... )</line> @@ -91,7 +91,7 @@ <line>locationInputHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="address" type="a{qv}" direction="in"> + <arg name="address" type="a{i(yv)}" direction="in"> <doc> <line>address = array[attribute]</line> <line>attribute = tuple(key,value)</line> @@ -127,7 +127,7 @@ <line>locationInputHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="selectionCriterion" type="q" direction="in"> + <arg name="selectionCriterion" type="i" direction="in"> <doc> <line>selectionCriterion = enum(INVALID,LATITUDE,LONGITUDE,ALTITUDE,FULL_ADDRESS,COUNTRY,COUNTRYCODE,STATE,CITY,ZIPCODE,STREET,ROAD_NUMBER,HOUSENUMBER,HOUSENAME,CROSSING,DISTRICT,PHONENUMBER,POINAME,TOWNCENTER, ... )</line> </doc> @@ -195,7 +195,7 @@ <line>locationInputHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="selectionCriterion" type="q"> + <arg name="selectionCriterion" type="i"> <doc> <line>selectionCriterion = enum(INVALID,LATITUDE,LONGITUDE,ALTITUDE,FULL_ADDRESS,COUNTRY,COUNTRYCODE,STATE,CITY,ZIPCODE,STREET,ROAD_NUMBER,HOUSENUMBER,HOUSENAME,CROSSING,DISTRICT,PHONENUMBER,POINAME,TOWNCENTER, ... )</line> </doc> @@ -210,7 +210,7 @@ <line>locationInputHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="statusValue" type="q"> + <arg name="statusValue" type="i"> <doc> <line>statusValue = enum(INVALID,NOT_STARTED,SEARCHING,FINISHED, ... )</line> </doc> @@ -290,7 +290,7 @@ <line>windowSize = size of the provided window</line> </doc> </arg> - <arg name="resultListWindow" type="aa{qv}"> + <arg name="resultListWindow" type="aa{i(yv)}"> <doc> <line>resultListWindow = array[address]</line> <line>address = array[attribute]</line> @@ -363,7 +363,7 @@ <line>index = list index of the entry to be returned</line> </doc> </arg> - <arg name="address" type="a{qv}" direction="out"> + <arg name="address" type="a{i(yv)}" direction="out"> <doc> <line>address = array[attribute]</line> <line>attribute = tuple(key,value)</line> @@ -399,13 +399,13 @@ <line>guidable = flag indicating whether the current address is guidable</line> </doc> </arg> - <arg name="availableSelectionCriteria" type="aq"> + <arg name="availableSelectionCriteria" type="ai"> <doc> <line>availableSelectionCriteria = array of enum(INVALID,LATITUDE,LONGITUDE,ALTITUDE,FULL_ADDRESS,COUNTRY,COUNTRYCODE,STATE,CITY,ZIPCODE,STREET,ROAD_NUMBER,HOUSENUMBER,HOUSENAME,CROSSING,DISTRICT,PHONENUMBER,POINAME,TOWNCENTER, ... )</line> <line>Note: availableSelectionCriteria indicates the parts of the address that can be changed</line> </doc> </arg> - <arg name="address" type="a{qv}"> + <arg name="address" type="a{i(yv)}"> <doc> <line>address = array[attribute]</line> <line>attribute = tuple(key,value)</line> @@ -441,7 +441,7 @@ <line>locationInputHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="inputAddress" type="a{qv}" direction="in"> + <arg name="inputAddress" type="a{i(yv)}" direction="in"> <doc> <line>inputAddress = array[attribute]</line> <line>attribute = tuple(key,value)</line> @@ -472,7 +472,7 @@ <line>locationInputHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="validatedAddressList" type="aa{qv}"> + <arg name="validatedAddressList" type="aa{i(yv)}"> <doc> <line>validatedAddressList = array[validatedAddress]</line> <line>validatedAddress = array[attribute]</line> @@ -494,7 +494,7 @@ <line>key = POINAME, value = value of type ´s´, that identifies a POI name</line> </doc> </arg> - <arg name="validationStatusList" type="aa{qq}"> + <arg name="validationStatusList" type="aa{ii}"> <doc> <line>validationStatusList = array[validationStatus]</line> <line>validationStatus = array[item]</line> diff --git a/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml b/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml index 880d577..60b5541 100644 --- a/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml +++ b/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml @@ -56,7 +56,7 @@ <doc> <line>GetSimulationStatus = This method retrieves the simulation status</line> </doc> - <arg name="simulationStatus" type="q" direction="out"> + <arg name="simulationStatus" type="i" direction="out"> <doc> <line>simulationStatus = enum(SIMULATION_STATUS_NO_SIMULATION, SIMULATION_STATUS_RUNNING, SIMULATION_STATUS_PAUSED, SIMULATION_STATUS_FIXED_POSITION)</line> <line>SIMULATION_STATUS_NO_SIMULATION means that NavigationCore is using the EnhancedPosition</line> @@ -81,7 +81,7 @@ <doc> <line>SimulationStatusChanged = This signal is emitted when the Simulation Status has changed</line> </doc> - <arg name="simulationStatus" type="q"> + <arg name="simulationStatus" type="i"> <doc> <line>simulationStatus = enum(SIMULATION_STATUS_NO_SIMULATION, SIMULATION_STATUS_RUNNING, SIMULATION_STATUS_PAUSED, SIMULATION_STATUS_FIXED_POSITION)</line> <line>SIMULATION_STATUS_NO_SIMULATION means that NavigationCore is using the EnhancedPosition</line> @@ -169,13 +169,13 @@ <doc> <line>GetPosition = This method returns the current position</line> </doc> - <arg name="valuesToReturn" type="aq" direction="in"> + <arg name="valuesToReturn" type="ai" direction="in"> <doc> <line>valuesToReturn= array[key]</line> <line>key = enum(INVALID,TIMESTAMP,LATITUDE,LONGITUDE,ALTITUDE,HEADING,SPEED,CLIMB,GNSS_FIX_STATUS,DR_STATUS,MM_STATUS,SIMULATION_MODE, ... ,ALL)</line> </doc> </arg> - <arg name="position" type="a{qv}" direction="out"> + <arg name="position" type="a{i(yv)}" direction="out"> <doc> <line>position = dictionary[key,value]</line> <line>dictionary = array of tuples (key,value)</line> @@ -211,7 +211,7 @@ <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="position" type="a{qv}" direction="in"> + <arg name="position" type="a{i(yv)}" direction="in"> <doc> <line>position = dictionary[key,value]</line> <line>dictionary = array of tuples (key,value)</line> @@ -234,7 +234,7 @@ <doc> <line>PositionUpdate = This signal is called to notify a client application of a position change. The update frequency is implementation specific. The maximal allowed frequency is 10Hz</line> </doc> - <arg name="changedValues" type="aq"> + <arg name="changedValues" type="ai"> <doc> <line>changedValues = array[value]</line> <line>value = enum(INVALID,TIMESTAMP,LATITUDE,LONGITUDE,ALTITUDE,HEADING,SPEED,CLIMB,GNSS_FIX_STATUS,DR_STATUS,MM_STATUS,SIMULATION_MODE, ... )</line> @@ -245,13 +245,13 @@ <doc> <line>GetAddress = This method returns the current address</line> </doc> - <arg name="valuesToReturn" type="aq" direction="in"> + <arg name="valuesToReturn" type="ai" direction="in"> <doc> <line>valuesToReturn= array[fieldType]</line> <line>key = enum(INVALID,TIMESTAMP,COUNTRY,COUNTRYCODE,CITY,STREET,ROAD_NUMBER,HOUSENUMBER,HOUSENAME,CROSSING,DISTRICT,TIMEZONE_OFFSET,DAYLIGHT_OFFSET,MATCH_TYPE, ... ,ALL)</line> </doc> </arg> - <arg name="address" type="a{qv}" direction="out"> + <arg name="address" type="a{i(yv)}" direction="out"> <doc> <line>address = dictionary[key,value]</line> <line>dictionary = array of tuples (key,value)</line> @@ -286,7 +286,7 @@ <doc> <line>AddressUpdate = This signal is called to notify a client application that the current address changed</line> </doc> - <arg name="changedValues" type="aq"> + <arg name="changedValues" type="ai"> <doc> <line>changedValues = array[value]</line> <line>value = enum(INVALID,TIMESTAMP,COUNTRY,COUNTRYCODE,CITY,STREET,ROAD_NUMBER,HOUSENUMBER,HOUSENAME,CROSSING,DISTRICT,TIMEZONE_OFFSET,DAYLIGHT_OFFSET,MATCH_TYPE, ... )</line> @@ -297,13 +297,13 @@ <doc> <line>positionOnSegment = This method returns the vehicle position on a route segment</line> </doc> - <arg name="valuesToReturn" type="aq" direction="in"> + <arg name="valuesToReturn" type="ai" direction="in"> <doc> <line>valuesToReturn= array[fieldType]</line> <line>key = enum(INVALID,TIMESTAMP,SEGMENT_ID,DIRECTION_ON_SEGMENT,DISTANCE_ON_SEGMENT, ... ,ALL)</line> </doc> </arg> - <arg name="positionOnSegment" type="a{qv}" direction="out"> + <arg name="positionOnSegment" type="a{i(yv)}" direction="out"> <doc> <line>positionOnSegment = dictionary[key,value]</line> <line>dictionary = array of tuples (key,value)</line> @@ -319,7 +319,7 @@ <doc> <line>PositionOnSegmentUpdate = This signal is called to notify the client that the vehicle position on the route segment changed</line> </doc> - <arg name="changedValues" type="aq"> + <arg name="changedValues" type="ai"> <doc> <line>changedValues = array[value]</line> <line>value = enum(INVALID,TIMESTAMP,SEGMENT_ID,DIRECTION_ON_SEGMENT,DISTANCE_ON_SEGMENT, ... )</line> @@ -330,13 +330,13 @@ <doc> <line>GetStatus = This method returns the current status</line> </doc> - <arg name="valuesToReturn" type="aq" direction="in"> + <arg name="valuesToReturn" type="ai" direction="in"> <doc> <line>valuesToReturn = array[fieldType]</line> <line>key = enum(INVALID,TIMESTAMP,GNSS_FIX_STATUS,DR_STATUS,MM_STATUS,SIMULATION_MODE, ... ,ALL)</line> </doc> </arg> - <arg name="status" type="a{qv}" direction="out"> + <arg name="status" type="a{i(yv)}" direction="out"> <doc> <line>status = dictionary[key,value]</line> <line>dictionary = array of tuples (key,value)</line> @@ -353,7 +353,7 @@ <doc> <line>StatusUpdate = This signal is emitted to notifiy a client application that the current status changed</line> </doc> - <arg name="changedValues" type="aq"> + <arg name="changedValues" type="ai"> <doc> <line>changedValues = array[value]</line> <line>value = enum(INVALID,TIMESTAMP,GNSS_FIX_STATUS,DR_STATUS,MM_STATUS,SIMULATION_MODE, ... )</line> diff --git a/api/navigation-core/genivi-navigationcore-routing.xml b/api/navigation-core/genivi-navigationcore-routing.xml index 74bfe80..59e1a09 100644 --- a/api/navigation-core/genivi-navigationcore-routing.xml +++ b/api/navigation-core/genivi-navigationcore-routing.xml @@ -95,7 +95,7 @@ <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="costModel" type="q" direction="in"> + <arg name="costModel" type="i" direction="in"> <doc> <line>costModel = enum(INVALID,FASTEST,SHORTEST,ECOLOGICAL,SCENIC,EASY,OFF_ROAD,BALANCED,CHEAPEST, ... )</line> <line>FASTEST = least time to reach the destination </line> @@ -123,7 +123,7 @@ <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="costModel" type="q" direction="out"> + <arg name="costModel" type="i" direction="out"> <doc> <line>costModel = enum(INVALID,FASTEST,SHORTEST,ECOLOGICAL,SCENIC,EASY,OFF_ROAD,BALANCED,CHEAPEST, ... )</line> <line>FASTEST = least time to reach the destination </line> @@ -141,7 +141,7 @@ <doc> <line>GetSupportedCostModels = This method retrieves a list of supported cost models</line> </doc> - <arg name="costModelsList" type="aq" direction="out"> + <arg name="costModelsList" type="ai" direction="out"> <doc> <line>costModelsList = array[costModel]</line> <line>costModel = enum(INVALID,FASTEST,SHORTEST,ECOLOGICAL,SCENIC,EASY,OFF_ROAD,BALANCED,CHEAPEST, ... )</line> @@ -176,7 +176,7 @@ <line>If this argument is an empty string, it means that the preferences apply to all countries</line> </doc> </arg> - <arg name="roadPreferenceList" type="a(qq)" direction="in"> + <arg name="roadPreferenceList" type="a(ii)" direction="in"> <doc> <line>roadPreferenceList = array[preference]</line> <line>preference = struct(preferenceMode,preferenceSource)</line> @@ -188,7 +188,7 @@ <line>preferenceSource = enum(FERRY,TOLL_ROADS,TUNNELS,HIGHWAYS_MOTORWAYS,VEHICLE_SIZE_LIMIT,CRIME_AREAS)</line> </doc> </arg> - <arg name="conditionPreferenceList" type="a(qq)" direction="in"> + <arg name="conditionPreferenceList" type="a(ii)" direction="in"> <doc> <line>conditionPreferenceList = array[preference]</line> <line>preference = struct(preferenceMode,preferenceSource)</line> @@ -222,7 +222,7 @@ <line>If this argument is an empty string, it means that the preferences apply to all countries</line> </doc> </arg> - <arg name="roadPreferenceList" type="a(qq)" direction="out"> + <arg name="roadPreferenceList" type="a(ii)" direction="out"> <doc> <line>roadPreferenceList = array[preference]</line> <line>preference = struct(preferenceMode,preferenceSource)</line> @@ -234,7 +234,7 @@ <line>preferenceSource = enum(FERRY,TOLL_ROADS,TUNNELS,HIGHWAYS_MOTORWAYS,VEHICLE_SIZE_LIMIT,CRIME_AREAS)</line> </doc> </arg> - <arg name="conditionPreferenceList" type="a(qq)" direction="out"> + <arg name="conditionPreferenceList" type="a(ii)" direction="out"> <doc> <line>conditionPreferenceList = array[preference]</line> <line>preference = struct(preferenceMode,preferenceSource)</line> @@ -247,7 +247,7 @@ <doc> <line>GetSupportedRoutePreferences = This method retrieves a list of supported route preferences</line> </doc> - <arg name="routePreferencesList" type="a(qq)" direction="out"> + <arg name="routePreferencesList" type="a(ii)" direction="out"> <doc> <line>routePreferencesList = array[preference]</line> <line>preference = struct(preferenceMode,preferenceSource)</line> @@ -259,7 +259,7 @@ <line>preferenceSource = enum(FERRY,TOLL_ROADS,TUNNELS,HIGHWAYS_MOTORWAYS,VEHICLE_SIZE_LIMIT,CRIME_AREAS)</line> </doc> </arg> - <arg name="conditionPreferenceList" type="a(qq)" direction="out"> + <arg name="conditionPreferenceList" type="a(ii)" direction="out"> <doc> <line>conditionPreferenceList = array[preference]</line> <line>preference = struct(preferenceMode,preferenceSource)</line> @@ -282,7 +282,7 @@ <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="routeSchedule" type="a{qu}" direction="in"> + <arg name="routeSchedule" type="a{iu}" direction="in"> <doc> <line>routeSchedule = array[detail]</line> <line>detail = dictionary[key,value]</line> @@ -304,13 +304,13 @@ <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="valuesToReturn" type="aq" direction="in"> + <arg name="valuesToReturn" type="ai" direction="in"> <doc> <line>valuesToReturn= array[value]</line> <line>value= enum(ARRIVAL_TIME, ARRIVAL_DATE,DEPARTURE_TIME, DEPARTURE_DATE)</line> </doc> </arg> - <arg name="routeSchedule" type="a{qu}" direction="out"> + <arg name="routeSchedule" type="a{iu}" direction="out"> <doc> <line> routeSchedule = array[detail]</line> <line>detail = dictionary[key,value]</line> @@ -337,7 +337,7 @@ <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="transportationMeansList" type="aq" direction="in"> + <arg name="transportationMeansList" type="ai" direction="in"> <doc> <line>transportationMeansList = array[transportationMeans]</line> <line>transportationMeans = enum(INVALID,BY_CAR,ON_FOOT,LONG_RANGE_TRAINS,PUBLIC_TRANSPORTATION,BY_BICYCLE,BY_TRUCK, ... )</line> @@ -358,7 +358,7 @@ <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="transportationMeansList" type="aq" direction="out"> + <arg name="transportationMeansList" type="ai" direction="out"> <doc> <line>transportationMeansList = array[transportationMeans]</line> <line>transportationMeans = enum(INVALID,BY_CAR,ON_FOOT,LONG_RANGE_TRAINS,PUBLIC_TRANSPORTATION,BY_BICYCLE,BY_TRUCK, ... )</line> @@ -369,7 +369,7 @@ <doc> <line>GetSupportedTransportationMeans = This method retrieves a list of supported means of transportation</line> </doc> - <arg name="transportationMeansList" type="aq" direction="out"> + <arg name="transportationMeansList" type="ai" direction="out"> <doc> <line>transportationMeansList = array[transportationMeans]</line> <line>transportationMeans = enum(INVALID,BY_CAR,ON_FOOT,LONG_RANGE_TRAINS,PUBLIC_TRANSPORTATION,BY_BICYCLE,BY_TRUCK, ... )</line> @@ -445,7 +445,7 @@ <line>startFromCurrentPosition = flag indicating if the current position is used as starting point</line> </doc> </arg> - <arg name="waypointsList" type="aa{qv}" direction="in"> + <arg name="waypointsList" type="aa{i(yv)}" direction="in"> <doc> <line>waypointsList = array[waypoint]</line> <line>waypoint = tuple (key,value)</line> @@ -489,7 +489,7 @@ <line>startFromCurrentPosition = flag indicating if the current position is used as starting point</line> </doc> </arg> - <arg name="waypointsList" type="aa{qv}" direction="out"> + <arg name="waypointsList" type="aa{i(yv)}" direction="out"> <doc> <line>waypointsList = array[waypoint]</line> <line>waypoint = tuple (key,value)</line> @@ -556,7 +556,7 @@ <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="unfullfilledPreferences" type="a{qq}"> + <arg name="unfullfilledPreferences" type="a{ii}"> <doc> <line>unfullfilledPreferences = array[preference]</line> <line>preference = tuple(preferenceMode,preferenceSource)</line> @@ -578,13 +578,13 @@ <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="errorCode" type="q"> + <arg name="errorCode" type="i"> <doc> <line>errorCode = enum(INVALID,UNMATCHED_POSITION,UNREACHABLE_DESTINATION,UNFULFILLED_PREFERENCE_MODE, ... )</line> <line>errorCode = UNFULFILLED_PREFERENCE_MODE. Refer to unfullfilledPreferences to see which routing preferences could not be met causing routing calculation to fail; for any other value the argument unfulfilledPreferences should be ignored. </line> </doc> </arg> - <arg name="unfullfilledPreferences" type="a{qq}"> + <arg name="unfullfilledPreferences" type="a{ii}"> <doc> <line>unfullfilledPreferences = array[preference]</line> <line>preference = tuple(preferenceMode,preferenceSource)</line> @@ -606,7 +606,7 @@ <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="status" type="q"> + <arg name="status" type="i"> <doc> <line>status = enum(INVALID,CALCULATION_OK,NO_POSITION, ... )</line> </doc> @@ -658,7 +658,7 @@ <line>detailLevel = detail level</line> </doc> </arg> - <arg name="valuesToReturn" type="aq" direction="in"> + <arg name="valuesToReturn" type="ai" direction="in"> <doc> <line>valuesToReturn= array[key]</line> <line>key = enum(INVALID,LINK-ID,INTERMEDIATE_POINTS,START_LATITUDE,START_LONGITUDE,START_ALTITUDE,</line> @@ -681,7 +681,7 @@ <line>totalNumberOfSegments = total number of segments</line> </doc> </arg> - <arg name="routeSegments" type="aa{qv}" direction="out"> + <arg name="routeSegments" type="aa{i(yv)}" direction="out"> <doc> <line>routeSegments = array[segment]</line> <line>segment = tuple(key,value)</line> @@ -725,13 +725,13 @@ <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="valuesToReturn" type="aq" direction="in"> + <arg name="valuesToReturn" type="ai" direction="in"> <doc> <line>valuesToReturn = array[key]</line> <line>key = enum(ARRIVAL_TIME,ARRIVAL_DATE,DEPARTURE_TIME,DEPARTURE_DATE,TOTAL_DISTANCE,TOTAL_TIME, ... ,ALL)</line> </doc> </arg> - <arg name="routeOverview" type="a{qv}" direction="out"> + <arg name="routeOverview" type="a{i(yv)}" direction="out"> <doc> <line>routeOverview = array[detail]</line> <line>detail = tuple(key,value)</line> diff --git a/api/navigation-core/genivi-navigationcore-session.xml b/api/navigation-core/genivi-navigationcore-session.xml index 2d3da24..26ffe8c 100644 --- a/api/navigation-core/genivi-navigationcore-session.xml +++ b/api/navigation-core/genivi-navigationcore-session.xml @@ -72,7 +72,7 @@ <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="sessionStatus" type="q" direction="out"> + <arg name="sessionStatus" type="i" direction="out"> <doc> <line>sessionStatus = enum(INVALID,AVAILABLE,NOT_AVAILABLE)</line> </doc> |