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 | |
| parent | 61fd86539acf19d009a0fc472b203387fd6cd817 (diff) | |
| download | poi-service-2bb6f1632992213886aaad2fa7be5b8f034511e5.tar.gz | |
Alignment of the DBus xml files, some fix (not tested yet)
34 files changed, 850 insertions, 2454 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> diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt index 4ebd592..ef9e54b 100644 --- a/src/navigation/CMakeLists.txt +++ b/src/navigation/CMakeLists.txt @@ -57,6 +57,7 @@ set(vehicle/null "${NAVIT_NULL_VEHICLE}") set(graphics/qt_qpainter "${NAVIT_QTPAINTER}") set(API_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../api") +set(NAVIGATION_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navigation-common") if(NOT ${YOCTO_CONFIG}) set(NAVIT_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navit/navit/cmake") diff --git a/src/navigation/map-viewer/CMakeLists.txt b/src/navigation/map-viewer/CMakeLists.txt index b6e2f67..538f3d1 100644 --- a/src/navigation/map-viewer/CMakeLists.txt +++ b/src/navigation/map-viewer/CMakeLists.txt @@ -39,6 +39,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${NAVIT_CONFIG_H_DIR}) # this one contains config.h that is generated +include_directories(${NAVIGATION_COMMON_DIR}) + find_program(XSLTPROC xsltproc REQUIRED) # Generate the config file for navit/mapviewer diff --git a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx index 16b0841..bfdc649 100644 --- a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx +++ b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx @@ -36,6 +36,7 @@ #include "debug.h" #include "plugin.h" #include "event.h" +#include "navigation-common-dbus.h" #if (!DEBUG_ENABLED) #undef dbg @@ -119,7 +120,7 @@ country_2_to_3(const char *in) } -std::map< uint16_t, ::DBus::Variant > unitsOfMeasurement; +std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > unitsOfMeasurement; class Configuration : public org::genivi::mapviewer::Configuration_adaptor, @@ -144,44 +145,44 @@ class Configuration } void - SetUnitsOfMeasurement(const std::map< uint16_t, ::DBus::Variant >& unitsOfMeasurementList) + SetUnitsOfMeasurement(const std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant >& unitsOfMeasurementList) { unitsOfMeasurement=unitsOfMeasurementList; - std::vector< uint16_t > changed; + std::vector< DBusCommonAPIEnumeration > changed; changed.push_back(GENIVI_MAPVIEWER_UNITS_OF_MEASUREMENT); ConfigurationChanged(changed); } - std::map< uint16_t, ::DBus::Variant > + std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > GetUnitsOfMeasurement() { return unitsOfMeasurement; } - std::map< uint16_t, ::DBus::Variant > + std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > GetSupportedUnitsOfMeasurement() { - std::map< uint16_t, ::DBus::Variant > ret; - std::vector< uint16_t > length; - length.push_back(GENIVI_MAPVIEWER_MILE); - length.push_back(GENIVI_MAPVIEWER_METER); - ret[GENIVI_MAPVIEWER_LENGTH]=variant_array_uint16(length); - return ret; + std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > ret; + std::vector< uint16_t > length; + length.push_back(GENIVI_MAPVIEWER_MILE); + length.push_back(GENIVI_MAPVIEWER_METER); + ret[GENIVI_MAPVIEWER_LENGTH]=variant_array_uint16(length); + return ret; } void - SetTimeFormat(const uint16_t& timeFormat) + SetTimeFormat(const DBusCommonAPIEnumeration& timeFormat) { throw DBus::ErrorNotSupported("Not yet supported"); } - uint16_t + DBusCommonAPIEnumeration GetTimeFormat() { throw DBus::ErrorNotSupported("Not yet supported"); } - std::vector< uint16_t > + std::vector< DBusCommonAPIEnumeration > GetSupportedTimeFormats() { throw DBus::ErrorNotSupported("Not yet supported"); @@ -194,7 +195,7 @@ class Configuration setenv("LANG",lang,1); setlocale(LC_ALL,""); scriptCode = script; - std::vector< uint16_t > changed; + std::vector< DBusCommonAPIEnumeration > changed; changed.push_back(GENIVI_MAPVIEWER_LOCALE); ConfigurationChanged(changed); } @@ -234,18 +235,18 @@ class Configuration } void - SetCoordinatesFormat(const uint16_t& coordinatesFormat) + SetCoordinatesFormat(const DBusCommonAPIEnumeration& coordinatesFormat) { throw DBus::ErrorNotSupported("Not yet supported"); } - uint16_t + DBusCommonAPIEnumeration GetCoordinatesFormat() { throw DBus::ErrorNotSupported("Not yet supported"); } - std::vector< uint16_t > + std::vector< DBusCommonAPIEnumeration > GetSupportedCoordinatesFormats() { throw DBus::ErrorNotSupported("Not yet supported"); diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx index dfe48c8..828806a 100644 --- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx +++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx @@ -64,6 +64,8 @@ #include "xmlconfig.h" #include "layout.h" +#include "navigation-common-dbus.h" + #if (!DEBUG_ENABLED) #undef dbg #define dbg(level,...) ; @@ -95,7 +97,7 @@ class DisplayedRoute void AddGeoCoordinateD(double lat, double lon); void AddGeoCoordinate(DBus::Variant lat, DBus::Variant lon); - bool AddSegment(std::map< uint16_t, ::DBus::Variant > map); + bool AddSegment(std::map<DBusCommonAPIEnumeration, DBusCommonAPIVariant> map); void WriteSegment(FILE *out); public: uint32_t m_handle; @@ -143,15 +145,15 @@ class MapViewerControlObj void SetCameraHeadingTrackUp(uint32_t sessionHandle); void SetMapViewPerspective(uint32_t SessionHandle, uint16_t MapViewPerspectiveMode); void GetMapViewPerspective(uint16_t &MapViewPerspectiveMode); - void GetScaleList(std::vector< ::DBus::Struct< uint16_t, uint16_t, uint16_t, uint32_t > >& ScalesList); + void GetScaleList(std::vector< ::DBus::Struct< uint16_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > >& ScalesList); void SetMapViewScale(uint32_t SessionHandle, uint32_t ScaleID); void SetMapViewScaleByDelta(uint32_t SessionHandle, int16_t ScaleDelta); - void GetMapViewScale(uint8_t& ScaleID, uint16_t& IsMinMax); + void GetMapViewScale(uint8_t& ScaleID, DBusCommonAPIEnumeration &IsMinMax); void GetMapViewType(uint16_t& MapViewType); void SetMapViewTheme(uint32_t sessionHandle, uint16_t mapViewTheme); void GetMapViewTheme(uint16_t& mapViewTheme); - void SetTargetPoint(uint32_t SessionHandle, ::DBus::Struct< double, double, int32_t >target); - void GetTargetPoint(::DBus::Struct< double, double, int32_t >&target); + void SetTargetPoint(uint32_t SessionHandle, ::DBus::Struct<double, double, double> target); + void GetTargetPoint(::DBus::Struct<double, double, double> &target); void SetMapViewPan(uint32_t SessionHandle, uint16_t panningAction, ::DBus::Struct< uint16_t, uint16_t >p); void GetMapViewPan(const uint16_t& panningAction, ::DBus::Struct< uint16_t, uint16_t > &p); void SetMapViewRotation(uint32_t sessionHandle, double rotationAngle, double rotationAnglePerFrame); @@ -192,7 +194,7 @@ class Routing { } - void RouteCalculationFailed(const uint32_t& routeHandle, const uint16_t& errorCode, const std::map< uint16_t, uint16_t >& unfullfilledPreferences) + void RouteCalculationFailed(const uint32_t& routeHandle, const DBusCommonAPIEnumeration& errorCode, const std::map< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration >& unfullfilledPreferences) { std::vector<DisplayedRoute *>::iterator it; @@ -203,7 +205,7 @@ class Routing } } - void RouteCalculationSuccessful(const uint32_t& RouteHandle, const std::map< uint16_t, uint16_t >& unfullfilledPreferences) + void RouteCalculationSuccessful(const uint32_t& RouteHandle, const std::map< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration >& unfullfilledPreferences) { std::vector<DisplayedRoute *>::iterator it; @@ -217,7 +219,7 @@ class Routing } } - void RouteCalculationProgressUpdate(const uint32_t& routeHandle, const uint16_t& status, const uint8_t& percentage) + void RouteCalculationProgressUpdate(const uint32_t& routeHandle, const DBusCommonAPIEnumeration& status, const uint8_t& percentage) { } @@ -256,25 +258,25 @@ class MapMatchedPosition cb=callback_new_2(callback_cast(position_update), this, v); } - void PositionUpdate(const std::vector< uint16_t >& changedValues) + void PositionUpdate(const std::vector< DBusCommonAPIEnumeration >& changedValues) { event_add_timeout(0, 0, cb); } - void AddressUpdate(const std::vector< uint16_t >& changedValues) + void AddressUpdate(const std::vector< DBusCommonAPIEnumeration >& changedValues) { } - void PositionOnSegmentUpdate(const std::vector< uint16_t >& changedValues) + void PositionOnSegmentUpdate(const std::vector< DBusCommonAPIEnumeration >& changedValues) { } - void StatusUpdate(const std::vector< uint16_t >& changedValues) + void StatusUpdate(const std::vector< DBusCommonAPIEnumeration >& changedValues) { } void - SimulationStatusChanged(const uint16_t& simulationStatus) + SimulationStatusChanged(const DBusCommonAPIEnumeration& simulationStatus) { } @@ -292,34 +294,34 @@ class MapMatchedPosition static void position_update(MapMatchedPosition *pos, struct vehicle *v) { - std::vector< uint16_t > valuesToReturn; + std::vector< DBusCommonAPIEnumeration > valuesToReturn; valuesToReturn.push_back(GENIVI_NAVIGATIONCORE_LATITUDE); valuesToReturn.push_back(GENIVI_NAVIGATIONCORE_LONGITUDE); valuesToReturn.push_back(GENIVI_NAVIGATIONCORE_SPEED); valuesToReturn.push_back(GENIVI_NAVIGATIONCORE_HEADING); - std::map< uint16_t, ::DBus::Variant> map=pos->GetPosition(valuesToReturn); + std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant> map=pos->GetPosition(valuesToReturn); if (map.find(GENIVI_NAVIGATIONCORE_SPEED) != map.end()) { struct attr position_speed={attr_position_speed}; double speed; position_speed.u.numd=&speed; - speed=double_variant(map[GENIVI_NAVIGATIONCORE_SPEED]); + speed=double_variant(map[GENIVI_NAVIGATIONCORE_SPEED]._2); vehicle_set_attr(v, &position_speed); } if (map.find(GENIVI_NAVIGATIONCORE_HEADING) != map.end()) { struct attr position_direction={attr_position_direction}; double direction; position_direction.u.numd=&direction; - direction=double_variant(map[GENIVI_NAVIGATIONCORE_HEADING]); + direction=double_variant(map[GENIVI_NAVIGATIONCORE_HEADING]._2); vehicle_set_attr(v, &position_direction); } if (map.find(GENIVI_NAVIGATIONCORE_LATITUDE) != map.end() && map.find(GENIVI_NAVIGATIONCORE_LONGITUDE) != map.end()) { struct attr position_coord_geo={attr_position_coord_geo}; struct coord_geo g; position_coord_geo.u.coord_geo=&g; - g.lat=double_variant(map[GENIVI_NAVIGATIONCORE_LATITUDE]); - g.lng=double_variant(map[GENIVI_NAVIGATIONCORE_LONGITUDE]); + g.lat=double_variant(map[GENIVI_NAVIGATIONCORE_LATITUDE]._2); + g.lng=double_variant(map[GENIVI_NAVIGATIONCORE_LONGITUDE]._2); dbg(lvl_debug,"update %f %f\n",g.lat,g.lng); vehicle_set_attr(v, &position_coord_geo); } @@ -337,7 +339,7 @@ class MapViewerControl } uint32_t - CreateMapViewInstance(const uint32_t& sessionHandle, const ::DBus::Struct< uint16_t, uint16_t >& mapViewSize, const uint16_t& mapViewType) + CreateMapViewInstance(const uint32_t& sessionHandle, const ::DBus::Struct< uint16_t, uint16_t >& mapViewSize, const DBusCommonAPIEnumeration& mapViewType) { dbg(lvl_debug,"enter\n"); if (mapViewType != GENIVI_MAPVIEWER_MAIN_MAP) @@ -363,7 +365,7 @@ class MapViewerControl } void - SetMapViewPerspective(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const uint16_t& perspective) + SetMapViewPerspective(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const DBusCommonAPIEnumeration& perspective) { MapViewerControlObj *obj=handles[mapViewInstanceHandle]; if (!obj) @@ -371,7 +373,7 @@ class MapViewerControl obj->SetMapViewPerspective(sessionHandle, perspective); } - uint16_t + DBusCommonAPIEnumeration GetMapViewPerspective(const uint32_t& mapViewInstanceHandle) { uint16_t MapViewPerspectiveMode; @@ -382,7 +384,7 @@ class MapViewerControl return MapViewPerspectiveMode; } - std::vector< uint16_t > + std::vector< DBusCommonAPIEnumeration > GetSupportedMapViewPerspectives() { throw DBus::ErrorNotSupported("Not yet supported"); @@ -408,7 +410,7 @@ class MapViewerControl } void - GetMapViewScale(const uint32_t& MapViewInstanceHandle, uint8_t& ScaleID, uint16_t& IsMinMax) + GetMapViewScale(const uint32_t& MapViewInstanceHandle, uint8_t& ScaleID, DBusCommonAPIEnumeration& IsMinMax) { MapViewerControlObj *obj=handles[MapViewInstanceHandle]; if (!obj) @@ -417,7 +419,7 @@ class MapViewerControl } void - SetMapViewPan(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const uint16_t& panningAction, const std::vector< ::DBus::Struct< uint16_t, uint16_t > >& pixelCoordinates) + SetMapViewPan(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const DBusCommonAPIEnumeration& panningAction, const std::vector< ::DBus::Struct< uint16_t, uint16_t > >& pixelCoordinates) { ::DBus::Struct< uint16_t, uint16_t > pixel; MapViewerControlObj *obj=handles[mapViewInstanceHandle]; @@ -431,7 +433,7 @@ class MapViewerControl } void - GetMapViewPan(const uint32_t& mapViewInstanceHandle, const uint16_t& valueToReturn, const std::vector< ::DBus::Struct< uint16_t, uint16_t > >& pixelCoordinates) + GetMapViewPan(const uint32_t& mapViewInstanceHandle, const DBusCommonAPIEnumeration& valueToReturn, const std::vector< ::DBus::Struct< uint16_t, uint16_t > >& pixelCoordinates) { ::DBus::Struct< uint16_t, uint16_t > pixel; MapViewerControlObj *obj=handles[mapViewInstanceHandle]; @@ -472,7 +474,7 @@ class MapViewerControl return ret; } - uint16_t + DBusCommonAPIEnumeration GetMapViewType(const uint32_t& mapViewInstanceHandle) { uint16_t ret; @@ -483,14 +485,14 @@ class MapViewerControl return ret; } - std::vector< uint16_t > + std::vector< DBusCommonAPIEnumeration > GetSupportedMapViewTypes() { throw DBus::ErrorNotSupported("Not yet supported"); } void - SetTargetPoint(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const ::DBus::Struct< double, double, int32_t >& targetPoint) + SetTargetPoint(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const ::DBus::Struct< double, double, double >& targetPoint) { MapViewerControlObj *obj=handles[mapViewInstanceHandle]; if (!obj) @@ -498,10 +500,10 @@ class MapViewerControl obj->SetTargetPoint(sessionHandle, targetPoint); } - ::DBus::Struct< double, double, int32_t > + ::DBus::Struct< double, double, double > GetTargetPoint(const uint32_t& mapViewInstanceHandle) { - ::DBus::Struct< double, double, int32_t > ret; + ::DBus::Struct< double, double, double > ret; MapViewerControlObj *obj=handles[mapViewInstanceHandle]; if (!obj) throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle"); @@ -530,12 +532,12 @@ class MapViewerControl } void - SetCameraPosition(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const ::DBus::Struct< double, double, int32_t >& position) + SetCameraPosition(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const ::DBus::Struct< double, double, double >& position) { throw DBus::ErrorNotSupported("Not yet supported"); } - ::DBus::Struct< double, double, int32_t > + ::DBus::Struct< double, double, double > GetCameraPosition(const uint32_t& mapViewInstanceHandle) { throw DBus::ErrorNotSupported("Not yet supported"); @@ -618,18 +620,18 @@ class MapViewerControl } void - SetMapViewScaleMode(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const uint16_t& scaleMode) + SetMapViewScaleMode(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const DBusCommonAPIEnumeration& scaleMode) { throw DBus::ErrorNotSupported("Not yet supported"); } - uint16_t + DBusCommonAPIEnumeration GetMapViewScaleMode(const uint32_t& mapViewInstanceHandle) { throw DBus::ErrorNotSupported("Not yet supported"); } - std::vector< uint16_t > + std::vector< DBusCommonAPIEnumeration > GetSupportedMapViewScaleModes(const uint32_t& mapViewInstanceHandle) { throw DBus::ErrorNotSupported("Not yet supported"); @@ -655,10 +657,10 @@ class MapViewerControl return ret; } - std::vector< ::DBus::Struct< uint16_t, uint16_t, uint16_t, uint32_t > > + std::vector< ::DBus::Struct< uint16_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > > GetScaleList(const uint32_t& mapViewInstanceHandle) { - std::vector< ::DBus::Struct< uint16_t, uint16_t, uint16_t, uint32_t > > ret; + std::vector< ::DBus::Struct< uint16_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > > ret; MapViewerControlObj *obj=handles[mapViewInstanceHandle]; if (!obj) throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle"); @@ -711,54 +713,54 @@ class MapViewerControl } void - SetMapViewVisibilityMode(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const uint16_t& visibilityMode) + SetMapViewVisibilityMode(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const DBusCommonAPIEnumeration& visibilityMode) { throw DBus::ErrorNotSupported("Not yet supported"); } - uint16_t + DBusCommonAPIEnumeration GetMapViewVisibilityMode(const uint32_t& mapViewInstanceHandle) { throw DBus::ErrorNotSupported("Not yet supported"); } - std::vector< uint16_t > + std::vector< DBusCommonAPIEnumeration > GetSupportedMapViewVisibilityModes() { throw DBus::ErrorNotSupported("Not yet supported"); } void - SetMapViewObjectVisibility(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::map< uint16_t, bool >& objectVisibilityList) + SetMapViewObjectVisibility(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::map< DBusCommonAPIEnumeration, bool >& objectVisibilityList) { throw DBus::ErrorNotSupported("Not yet supported"); } - std::map< uint16_t, bool > + std::map< DBusCommonAPIEnumeration, bool > GetMapViewObjectVisibility(const uint32_t& mapViewInstanceHandle) { throw DBus::ErrorNotSupported("Not yet supported"); } - std::vector< uint16_t > + std::vector< DBusCommonAPIEnumeration > GetSupportedMapViewObjectVisibilities(const uint32_t& mapViewInstanceHandle) { throw DBus::ErrorNotSupported("Not yet supported"); } void - SetMapViewPerformanceLevel(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const uint16_t& performanceLevel) + SetMapViewPerformanceLevel(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const DBusCommonAPIEnumeration& performanceLevel) { throw DBus::ErrorNotSupported("Not yet supported"); } - uint16_t + DBusCommonAPIEnumeration GetMapViewPerformanceLevel(const uint32_t& mapViewInstanceHandle) { throw DBus::ErrorNotSupported("Not yet supported"); } - std::vector< uint16_t > + std::vector< DBusCommonAPIEnumeration > GetSupportedMapViewPerformanceLevels() { throw DBus::ErrorNotSupported("Not yet supported"); @@ -776,7 +778,7 @@ class MapViewerControl } void - SetMapViewTheme(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const uint16_t& mapViewTheme) + SetMapViewTheme(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const DBusCommonAPIEnumeration& mapViewTheme) { MapViewerControlObj *obj=handles[mapViewInstanceHandle]; if (!obj) @@ -784,7 +786,7 @@ class MapViewerControl obj->SetMapViewTheme(sessionHandle, mapViewTheme); } - uint16_t + DBusCommonAPIEnumeration GetMapViewTheme(const uint32_t& mapViewInstanceHandle) { uint16_t ret; @@ -795,7 +797,7 @@ class MapViewerControl return ret; } - std::vector< uint16_t > + std::vector< DBusCommonAPIEnumeration > GetSupportedMapViewThemes() { throw DBus::ErrorNotSupported("Not yet supported"); @@ -845,7 +847,7 @@ class MapViewerControl } void - GetCameraHeading(const uint32_t& mapViewInstanceHandle, uint16_t& headingType, int32_t& headingAngle, ::DBus::Struct< double, double >& target) + GetCameraHeading(const uint32_t& mapViewInstanceHandle, DBusCommonAPIEnumeration& headingType, int32_t& headingAngle, ::DBus::Struct< double, double >& target) { throw DBus::ErrorNotSupported("Not yet supported"); } @@ -881,7 +883,7 @@ class MapViewerControl void - SetPoiCategoriesNotVisible(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< uint16_t >& poiCategoryIds) + SetPoiCategoriesNotVisible(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< uint32_t >& poiCategoryIds) { throw DBus::ErrorNotSupported("Not yet supported"); } @@ -892,26 +894,26 @@ class MapViewerControl throw DBus::ErrorNotSupported("Not yet supported"); } - std::vector< uint16_t > + std::vector< uint32_t > GetPoiCategoriesVisible(const uint32_t& mapViewInstanceHandle) { throw DBus::ErrorNotSupported("Not yet supported"); } - std::vector< ::DBus::Struct< uint16_t, ::DBus::Struct< double, double >, ::DBus::Variant > > - SelectElementsOnMap(const uint32_t& mapViewInstanceHandle, const ::DBus::Struct< uint16_t, uint16_t >& pixelCoordinate, const std::vector< uint16_t >& selectableTypes, const uint16_t& maxNumberOfSelectedElements) + std::vector< ::DBus::Struct< int32_t, ::DBus::Struct< double, double >, ::DBus::Struct< uint8_t, ::DBus::Variant > > > + SelectElementsOnMap(const uint32_t& mapViewInstanceHandle, const ::DBus::Struct< uint16_t, uint16_t >& pixelCoordinate, const std::vector< int32_t >& selectableTypes, const uint16_t& maxNumberOfSelectedElements) { throw DBus::ErrorNotSupported("Not yet supported"); } void - SetPoiCategoriesVisible(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< uint16_t >& poiCategoryIds) + SetPoiCategoriesVisible(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< uint32_t >& poiCategoryIds) { throw DBus::ErrorNotSupported("Not yet supported"); } void - SetPoiCategoriesVisibleWithinLimits(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< uint16_t >& poiCategoryIds, const uint8_t& minScaleID, const uint8_t& maxScaleID) + SetPoiCategoriesVisibleWithinLimits(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< uint32_t >& poiCategoryIds, const uint8_t& minScaleID, const uint8_t& maxScaleID) { throw DBus::ErrorNotSupported("Not yet supported"); } @@ -942,7 +944,7 @@ MapViewerControlObj::GetMapViewPerspective(uint16_t& MapViewPerspectiveMode) } void -MapViewerControlObj::GetScaleList(std::vector< ::DBus::Struct< uint16_t, uint16_t, uint16_t, uint32_t > >& ScalesList) +MapViewerControlObj::GetScaleList(std::vector< ::DBus::Struct< uint16_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > >& ScalesList) { throw DBus::ErrorNotSupported("Not yet supported"); } @@ -968,7 +970,7 @@ MapViewerControlObj::SetMapViewScaleByDelta(uint32_t SessionHandle, int16_t Scal } void -MapViewerControlObj::GetMapViewScale(uint8_t& ScaleID, uint16_t& IsMinMax) +MapViewerControlObj::GetMapViewScale(uint8_t& ScaleID, DBusCommonAPIEnumeration& IsMinMax) { struct transformation *trans=navit_get_trans(m_navit.u.navit); long scale=transform_get_scale(trans); @@ -1159,7 +1161,7 @@ MapViewerControlObj::SetCameraHeadingTrackUp(uint32_t sessionHandle) } void -MapViewerControlObj::SetTargetPoint(uint32_t SessionHandle, ::DBus::Struct< double, double, int32_t >target) +MapViewerControlObj::SetTargetPoint(uint32_t SessionHandle, ::DBus::Struct< double, double, double >target) { struct coord_geo g; struct attr center={attr_center}; @@ -1171,7 +1173,7 @@ MapViewerControlObj::SetTargetPoint(uint32_t SessionHandle, ::DBus::Struct< doub } void -MapViewerControlObj::GetTargetPoint(::DBus::Struct< double, double, int32_t >&target) +MapViewerControlObj::GetTargetPoint(::DBus::Struct< double, double, double >&target) { struct attr center; if (!navit_get_attr(m_navit.u.navit, attr_center, ¢er, NULL) || !center.u.coord_geo) @@ -1600,12 +1602,12 @@ DisplayedRoute::AddGeoCoordinate(DBus::Variant lat, DBus::Variant lon) } bool -DisplayedRoute::AddSegment(std::map< uint16_t, ::DBus::Variant > map) +DisplayedRoute::AddSegment(std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > map) { if (map.find(GENIVI_NAVIGATIONCORE_START_LATITUDE) != map.end() && map.find(GENIVI_NAVIGATIONCORE_START_LONGITUDE) != map.end()) - AddGeoCoordinate(map[GENIVI_NAVIGATIONCORE_START_LATITUDE],map[GENIVI_NAVIGATIONCORE_START_LONGITUDE]); + AddGeoCoordinate(map[GENIVI_NAVIGATIONCORE_START_LATITUDE]._2,map[GENIVI_NAVIGATIONCORE_START_LONGITUDE]._2); if (map.find(GENIVI_NAVIGATIONCORE_INTERMEDIATE_POINTS) != map.end()) { - ::DBus::Variant variant=map[GENIVI_NAVIGATIONCORE_INTERMEDIATE_POINTS]; + ::DBus::Variant variant=map[GENIVI_NAVIGATIONCORE_INTERMEDIATE_POINTS]._2; std::vector<DBus::Struct<uint16_t, double, double, double> >intermediate_points; DBus::MessageIter iter=variant.reader(); iter >> intermediate_points; @@ -1614,7 +1616,7 @@ DisplayedRoute::AddSegment(std::map< uint16_t, ::DBus::Variant > map) } } if (map.find(GENIVI_NAVIGATIONCORE_END_LATITUDE) != map.end() && map.find(GENIVI_NAVIGATIONCORE_END_LONGITUDE) != map.end()) { - AddGeoCoordinate(map[GENIVI_NAVIGATIONCORE_END_LATITUDE],map[GENIVI_NAVIGATIONCORE_END_LONGITUDE]); + AddGeoCoordinate(map[GENIVI_NAVIGATIONCORE_END_LATITUDE]._2,map[GENIVI_NAVIGATIONCORE_END_LONGITUDE]._2); return true; } return false; @@ -1635,8 +1637,8 @@ DisplayedRoute::WriteSegment(FILE *out) DisplayedRoute::DisplayedRoute(class MapViewerControlObj *mapviewer, uint8_t RouteSession, uint32_t RouteHandle, struct mapset *mapset) { dbg(lvl_debug,"enter\n"); - std::vector< std::map< uint16_t, ::DBus::Variant > > RouteShape; - std::vector< uint16_t > valuesToReturn; + std::vector< std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > > RouteShape; + std::vector< DBusCommonAPIEnumeration > valuesToReturn; valuesToReturn.push_back(GENIVI_NAVIGATIONCORE_START_LATITUDE); valuesToReturn.push_back(GENIVI_NAVIGATIONCORE_START_LONGITUDE); valuesToReturn.push_back(GENIVI_NAVIGATIONCORE_END_LATITUDE); @@ -1655,10 +1657,10 @@ DisplayedRoute::DisplayedRoute(class MapViewerControlObj *mapviewer, uint8_t Rou int count=RouteShape.size(); bool complete=true; for (int i = 0 ; i < count ; i++) { - std::map< uint16_t, ::DBus::Variant > map = RouteShape[i]; + std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > map = RouteShape[i]; if (!complete) { if (map.find(GENIVI_NAVIGATIONCORE_START_LATITUDE) != map.end() && map.find(GENIVI_NAVIGATIONCORE_START_LONGITUDE) != map.end()) - AddGeoCoordinate(map[GENIVI_NAVIGATIONCORE_START_LATITUDE],map[GENIVI_NAVIGATIONCORE_START_LONGITUDE]); + AddGeoCoordinate(map[GENIVI_NAVIGATIONCORE_START_LATITUDE]._2,map[GENIVI_NAVIGATIONCORE_START_LONGITUDE]._2); else dbg(lvl_debug,"previous segment is missing end, but current segment is missing start also"); WriteSegment(f); diff --git a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx index 0d4353b..fd1dcc3 100644 --- a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx +++ b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx @@ -34,6 +34,8 @@ #include "plugin.h" #include "event.h" +#include "navigation-common-dbus.h" + #if (!DEBUG_ENABLED) #undef dbg #define dbg(level,...) ; @@ -79,7 +81,7 @@ class Session return SessionHandle; } - uint16_t GetSessionStatus(const uint32_t& SessionHandle) + DBusCommonAPIEnumeration GetSessionStatus(const uint32_t& SessionHandle) { if (handles[SessionHandle]) return GENIVI_MAPVIEWER_AVAILABLE; diff --git a/src/navigation/navigation-common/navigation-common-dbus.h b/src/navigation/navigation-common/navigation-common-dbus.h new file mode 100644 index 0000000..b3e4639 --- /dev/null +++ b/src/navigation/navigation-common/navigation-common-dbus.h @@ -0,0 +1,37 @@ +/** +* @licence app begin@ +* SPDX-License-Identifier: MPL-2.0 +* +* \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen +* +* \file poi-common-dbus-data-model.h +* +* \brief This file is part of the poi proof of concept. +* +* \author Philippe Colliot <philippe.colliot@mpsa.com> +* +* \version 1.1 +* +* This Source Code Form is subject to the terms of the +* Mozilla Public License (MPL), 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/. +* +* For further information see http://www.genivi.org/. +* +* List of changes: +* 10-02-2014, Philippe Colliot, refinement and migration to the new repository +* <date>, <name>, <description of change> +* +* @licence end@ +*/ +#ifndef __NAVIGATIONCOMMONDBUS_H__ +#define __NAVIGATIONCOMMONDBUS_H__ + +#include <stdint.h> +#include <dbus-c++/dbus.h> + +typedef ::DBus::Struct< uint8_t, ::DBus::Variant > DBusCommonAPIVariant; +typedef int32_t DBusCommonAPIEnumeration; + +#endif diff --git a/src/navigation/navigation-core/CMakeLists.txt b/src/navigation/navigation-core/CMakeLists.txt index 6278c71..c9fad47 100644 --- a/src/navigation/navigation-core/CMakeLists.txt +++ b/src/navigation/navigation-core/CMakeLists.txt @@ -39,6 +39,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${NAVIT_CONFIG_H_DIR}) # this one contains config.h that is generated +include_directories(${NAVIGATION_COMMON_DIR}) + find_program(XSLTPROC xsltproc REQUIRED) # Generate the config file for navit/navigation-core diff --git a/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx b/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx index 3622cd0..036a1a3 100644 --- a/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx +++ b/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx @@ -37,6 +37,8 @@ #include "plugin.h" #include "event.h" +#include "navigation-common-dbus.h" + #if (!DEBUG_ENABLED) #undef dbg #define dbg(level,...) ; @@ -119,7 +121,7 @@ country_2_to_3(const char *in) } -std::map< uint16_t, ::DBus::Variant > unitsOfMeasurement; +std::map< int32_t, DBusCommonAPIVariant > unitsOfMeasurement; class Configuration : public org::genivi::navigationcore::Configuration_adaptor, @@ -144,24 +146,24 @@ class Configuration } void - SetUnitsOfMeasurement(const std::map< uint16_t, ::DBus::Variant >& unitsOfMeasurementList) + SetUnitsOfMeasurement(const std::map< int32_t, DBusCommonAPIVariant >& unitsOfMeasurementList) { unitsOfMeasurement=unitsOfMeasurementList; - std::vector< uint16_t > changed; + std::vector< int32_t > changed; changed.push_back(GENIVI_NAVIGATIONCORE_UNITS_OF_MEASUREMENT); ConfigurationChanged(changed); } - std::map< uint16_t, ::DBus::Variant > + std::map< int32_t, DBusCommonAPIVariant > GetUnitsOfMeasurement() { return unitsOfMeasurement; } - std::map< uint16_t, ::DBus::Variant > + std::map< int32_t, DBusCommonAPIVariant > GetSupportedUnitsOfMeasurement() { - std::map< uint16_t, ::DBus::Variant > ret; + std::map< int32_t, DBusCommonAPIVariant > ret; std::vector< uint16_t > length; length.push_back(GENIVI_NAVIGATIONCORE_MILE); length.push_back(GENIVI_NAVIGATIONCORE_METER); @@ -170,18 +172,18 @@ class Configuration } void - SetTimeFormat(const uint16_t& timeFormat) + SetTimeFormat(const int32_t& timeFormat) { throw DBus::ErrorNotSupported("Not yet supported"); } - uint16_t + int32_t GetTimeFormat() { throw DBus::ErrorNotSupported("Not yet supported"); } - std::vector< uint16_t > + std::vector< int32_t > GetSupportedTimeFormats() { throw DBus::ErrorNotSupported("Not yet supported"); @@ -194,7 +196,7 @@ class Configuration setenv("LANG",lang,1); setlocale(LC_ALL,""); scriptCode = script; - std::vector< uint16_t > changed; + std::vector< int32_t > changed; changed.push_back(GENIVI_NAVIGATIONCORE_LOCALE); ConfigurationChanged(changed); } @@ -246,18 +248,18 @@ class Configuration } void - SetCoordinatesFormat(const uint16_t& coordinatesFormat) + SetCoordinatesFormat(const int32_t& coordinatesFormat) { throw DBus::ErrorNotSupported("Not yet supported"); } - uint16_t + int32_t GetCoordinatesFormat() { throw DBus::ErrorNotSupported("Not yet supported"); } - std::vector< uint16_t > + std::vector< int32_t > GetSupportedCoordinatesFormats() { throw DBus::ErrorNotSupported("Not yet supported"); diff --git a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx index f0d105c..881f72e 100644 --- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx +++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx @@ -48,6 +48,8 @@ #include "vehicle.h" #include "route.h" +#include "navigation-common-dbus.h" + #if (!DEBUG_ENABLED) #undef dbg #define dbg(level,...) ; @@ -118,11 +120,11 @@ class GuidanceObj void SetVoiceGuidanceSettings(const uint16_t& promptMode); uint16_t GetVoiceGuidanceSettings(); void PlayVoiceManeuver(); - void GetGuidanceStatus(uint16_t& guidanceStatus, uint32_t& routeHandle); + void GetGuidanceStatus(int32_t& guidanceStatus, uint32_t& routeHandle); void GetDestinationInformation(uint32_t& offset, uint32_t& TravelTime, int32_t& Direction, int16_t& TimeZone); - void GetManeuver(struct item *item, uint32_t& DistanceToManeuver, uint16_t& Maneuver, std::string& RoadAfterManeuver, ::DBus::Struct< uint16_t, ::DBus::Variant >& ManeuverData); - void GetManeuversList(const uint16_t& requestedNumberOfManeuvers, const uint32_t& maneuverOffset, uint16_t& numberOfManeuvers, std::vector< ::DBus::Struct< std::string, std::string, uint16_t, uint16_t, uint32_t, std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, uint16_t, std::vector< ::DBus::Struct< uint16_t, ::DBus::Variant > > > > > >& maneuversList); - void GetGuidanceDetails(bool& voiceGuidance, bool& vehicleOnTheRoad, bool& isDestinationReached, uint16_t& maneuver); + void GetManeuver(struct item *item, uint32_t& DistanceToManeuver, int32_t &Maneuver, std::string& RoadAfterManeuver, std::pair<int32_t, DBusCommonAPIVariant> &ManeuverData); + void GetManeuversList(const uint16_t& requestedNumberOfManeuvers, const uint32_t& maneuverOffset, uint16_t& numberOfManeuvers, std::vector< ::DBus::Struct< std::string, std::string, uint16_t, int32_t, uint32_t, std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, int32_t, std::map< int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > > >& maneuversList); + void GetGuidanceDetails(bool& voiceGuidance, bool& vehicleOnTheRoad, bool& isDestinationReached, int32_t &maneuver); GuidanceObj(class Guidance *guidance, uint32_t SessionHandle, uint32_t RouteHandle); ~GuidanceObj(); }; @@ -255,7 +257,7 @@ class Guidance } void - GetDestinationInformation(uint32_t& offset, uint32_t& travelTime, int32_t& direction, uint16_t& side, int16_t& timeZone, int16_t& daylightSavingTime) + GetDestinationInformation(uint32_t& offset, uint32_t& travelTime, int32_t& direction, int32_t& side, int16_t& timeZone, int16_t& daylightSavingTime) { dbg(lvl_debug,"enter\n"); if (!guidance) { @@ -317,7 +319,7 @@ class Guidance } void - GetGuidanceDetails(bool& voiceGuidance, bool& vehicleOnTheRoad, bool& isDestinationReached, uint16_t& maneuver) + GetGuidanceDetails(bool& voiceGuidance, bool& vehicleOnTheRoad, bool& isDestinationReached, int32_t& maneuver) { if (!guidance) { dbg(lvl_debug,"no guidance active\n"); @@ -336,15 +338,14 @@ class Guidance guidance->PlayVoiceManeuver(); } - void - GetWaypointInformation(const uint16_t& requestedNumberOfWaypoints, uint16_t& numberOfWaypoints, std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, uint16_t, int16_t, int16_t, bool, uint16_t > >& waypointsList) + GetWaypointInformation(const uint16_t& requestedNumberOfWaypoints, uint16_t& numberOfWaypoints, std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, int32_t, int16_t, int16_t, bool, uint16_t > >& waypointsList) { throw DBus::ErrorNotSupported("Not yet supported"); } void - GetManeuversList(const uint16_t& requestedNumberOfManeuvers, const uint32_t& maneuverOffset, uint16_t& numberOfManeuvers, std::vector< ::DBus::Struct< std::string, std::string, uint16_t, uint16_t, uint32_t, std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, uint16_t, std::vector< ::DBus::Struct< uint16_t, ::DBus::Variant > > > > > >& maneuversList) + GetManeuversList(const uint16_t& requestedNumberOfManeuvers, const uint32_t& maneuverOffset, uint16_t& numberOfManeuvers, std::vector< ::DBus::Struct< std::string, std::string, uint16_t, int32_t, uint32_t, std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, int32_t, std::map< int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > > >& maneuversList) { if (!guidance) { dbg(lvl_debug,"no guidance active\n"); @@ -354,7 +355,7 @@ class Guidance } void - SetRouteCalculationMode(const uint32_t& sessionHandle, const uint16_t& routeCalculationMode) + SetRouteCalculationMode(const uint32_t& sessionHandle, const int32_t& routeCalculationMode) { throw DBus::ErrorNotSupported("Not yet supported"); } @@ -366,7 +367,7 @@ class Guidance } void - GetGuidanceStatus(uint16_t& guidanceStatus, uint32_t& routeHandle) + GetGuidanceStatus(int32_t& guidanceStatus, uint32_t& routeHandle) { if (guidance) { guidance->GetGuidanceStatus(guidanceStatus, routeHandle); @@ -377,12 +378,12 @@ class Guidance } void - SetVoiceGuidanceSettings(const uint16_t& promptMode) + SetVoiceGuidanceSettings(const int32_t& promptMode) { guidance->SetVoiceGuidanceSettings(promptMode); } - uint16_t + int32_t GetVoiceGuidanceSettings() { return guidance->GetVoiceGuidanceSettings(); @@ -437,136 +438,143 @@ GuidanceObj::GetDestinationInformation(uint32_t& Distance, uint32_t& TravelTime, } void -GuidanceObj::GetManeuver(struct item *item, uint32_t& DistanceToManeuver, uint16_t& Maneuver, std::string& RoadAfterManeuver, ::DBus::Struct< uint16_t, ::DBus::Variant >& ManeuverData) +GuidanceObj::GetManeuver(struct item *item, uint32_t& DistanceToManeuver, int32_t& Maneuver, std::string& RoadAfterManeuver, std::pair< int32_t, DBusCommonAPIVariant >& ManeuverData) { struct attr length, street_name; - if (item_attr_get(item, attr_length, &length)) { + int32_t index; + DBusCommonAPIVariant data; + + if (item_attr_get(item, attr_length, &length)) { DistanceToManeuver=length.u.num; } if (item_attr_get(item, attr_street_name, &street_name)) { RoadAfterManeuver=std::string(street_name.u.str); } - ManeuverData._1 = GENIVI_NAVIGATIONCORE_DIRECTION; + + index = GENIVI_NAVIGATIONCORE_DIRECTION; switch (item->type) { case type_nav_straight: Maneuver=GENIVI_NAVIGATIONCORE_CROSSROAD; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_STRAIGHT_ON); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_STRAIGHT_ON); break; case type_nav_turnaround: Maneuver=GENIVI_NAVIGATIONCORE_CROSSROAD; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_UTURN_LEFT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_UTURN_LEFT); break; case type_nav_right_1: Maneuver=GENIVI_NAVIGATIONCORE_CROSSROAD; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_SLIGHT_RIGHT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_SLIGHT_RIGHT); break; case type_nav_right_2: Maneuver=GENIVI_NAVIGATIONCORE_CROSSROAD; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_RIGHT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_RIGHT); break; case type_nav_right_3: Maneuver=GENIVI_NAVIGATIONCORE_CROSSROAD; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_HARD_RIGHT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_HARD_RIGHT); break; case type_nav_left_1: Maneuver=GENIVI_NAVIGATIONCORE_CROSSROAD; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_SLIGHT_LEFT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_SLIGHT_LEFT); break; case type_nav_left_2: Maneuver=GENIVI_NAVIGATIONCORE_CROSSROAD; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_LEFT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_LEFT); break; case type_nav_left_3: Maneuver=GENIVI_NAVIGATIONCORE_CROSSROAD; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_HARD_LEFT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_HARD_LEFT); break; // FIXME: Are ManeuverDirection values right here? case type_nav_roundabout_r1: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_HARD_RIGHT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_HARD_RIGHT); break; case type_nav_roundabout_r2: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_RIGHT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_RIGHT); break; case type_nav_roundabout_r3: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_SLIGHT_RIGHT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_SLIGHT_RIGHT); break; case type_nav_roundabout_r4: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_STRAIGHT_ON); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_STRAIGHT_ON); break; case type_nav_roundabout_r5: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_SLIGHT_LEFT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_SLIGHT_LEFT); break; case type_nav_roundabout_r6: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_LEFT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_LEFT); break; case type_nav_roundabout_r7: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_HARD_LEFT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_HARD_LEFT); break; case type_nav_roundabout_r8: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_UTURN_LEFT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_UTURN_LEFT); break; // FIXME: Distinguish between clockwise and counterclockwise roundabout? case type_nav_roundabout_l1: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_HARD_LEFT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_HARD_LEFT); break; case type_nav_roundabout_l2: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_LEFT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_LEFT); break; case type_nav_roundabout_l3: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_SLIGHT_LEFT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_SLIGHT_LEFT); break; case type_nav_roundabout_l4: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_STRAIGHT_ON); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_STRAIGHT_ON); break; case type_nav_roundabout_l5: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_SLIGHT_RIGHT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_SLIGHT_RIGHT); break; case type_nav_roundabout_l6: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_RIGHT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_RIGHT); break; case type_nav_roundabout_l7: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_HARD_RIGHT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_HARD_RIGHT); break; case type_nav_roundabout_l8: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_UTURN_RIGHT); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_UTURN_RIGHT); break; case type_nav_destination: Maneuver=GENIVI_NAVIGATIONCORE_DESTINATION; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_STRAIGHT_ON); + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_STRAIGHT_ON); break; default: dbg(lvl_error,"Unable to convert type %s\n",item_to_name(item->type)); Maneuver=GENIVI_NAVIGATIONCORE_INVALID; - ManeuverData._2=variant_uint16(GENIVI_NAVIGATIONCORE_INVALID); + index = GENIVI_NAVIGATIONCORE_INVALID; + data._2=variant_uint16(GENIVI_NAVIGATIONCORE_INVALID); } + std::pair< int32_t, DBusCommonAPIVariant > ret(index,data); + ManeuverData=ret; } void -GuidanceObj::GetGuidanceDetails(bool& voiceGuidance, bool& vehicleOnTheRoad, bool& isDestinationReached, uint16_t& maneuver) +GuidanceObj::GetGuidanceDetails(bool& voiceGuidance, bool& vehicleOnTheRoad, bool& isDestinationReached, int32_t& maneuver) { struct map_rect *mr=get_map_rect(); struct item *item; item=get_item(mr); std::string road_name_after_maneuver; uint32_t offset_maneuver; - ::DBus::Struct< uint16_t, ::DBus::Variant > maneuver_data; + std::pair< int32_t, DBusCommonAPIVariant > maneuver_data; voiceGuidance = m_voice_guidance; vehicleOnTheRoad = true; //by default, no off-road managed @@ -577,24 +585,26 @@ GuidanceObj::GetGuidanceDetails(bool& voiceGuidance, bool& vehicleOnTheRoad, boo } void -GuidanceObj::GetManeuversList(const uint16_t& requestedNumberOfManeuvers, const uint32_t& maneuverOffset, uint16_t& numberOfManeuvers, std::vector< ::DBus::Struct< std::string, std::string, uint16_t, uint16_t, uint32_t, std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, uint16_t, std::vector< ::DBus::Struct< uint16_t, ::DBus::Variant > > > > > >& maneuversList) +GuidanceObj::GetManeuversList(const uint16_t& requestedNumberOfManeuvers, const uint32_t& maneuverOffset, uint16_t& numberOfManeuvers, std::vector< ::DBus::Struct< std::string, std::string, uint16_t, int32_t, uint32_t, std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, int32_t, std::map< int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > > >& maneuversList) { struct map_rect *mr=get_map_rect(); struct item *item; uint16_t maneuverIndex; + std::map< int32_t, DBusCommonAPIVariant >::iterator it; + numberOfManeuvers = 0; maneuverIndex = 0; while (item=get_item(mr)) { //scan the list of maneuvers of the route if (maneuverIndex >= maneuverOffset && maneuverIndex < maneuverOffset+requestedNumberOfManeuvers) { - ::DBus::Struct< std::string, std::string, uint16_t, uint16_t, uint32_t, std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, uint16_t, std::vector< ::DBus::Struct< uint16_t, ::DBus::Variant > > > > >maneuver; - ::DBus::Struct< uint32_t, uint32_t, int32_t, uint16_t, std::vector< ::DBus::Struct< uint16_t, ::DBus::Variant > > > sub_maneuver; - ::DBus::Struct< uint16_t, ::DBus::Variant > maneuver_data; + ::DBus::Struct< std::string, std::string, uint16_t, int32_t, uint32_t, std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, int32_t, std::map< int32_t, DBusCommonAPIVariant > > > > maneuver; + ::DBus::Struct< uint32_t, uint32_t, int32_t, int32_t, std::map< int32_t, DBusCommonAPIVariant > > sub_maneuver; + std::pair< int32_t, DBusCommonAPIVariant > maneuver_data; maneuver._1 = ""; //roadNumberAfterManeuver maneuver._3 = GENIVI_NAVIGATIONCORE_DEFAULT; //roadPropertyAfterManeuver maneuver._4 = GENIVI_NAVIGATIONCORE_RIGHT; //drivingSide maneuver._5 = 0; //offsetOfNextManeuver GetManeuver(item, sub_maneuver._1, sub_maneuver._4, maneuver._2, maneuver_data); - sub_maneuver._5.push_back(maneuver_data); + sub_maneuver._5.insert(maneuver_data); maneuver._6.push_back(sub_maneuver); if (maneuversList.size()) maneuversList.back()._5 = sub_maneuver._1; //offsetOfNextManeuver of the last record is the offsetOfManeuver of this one @@ -666,7 +676,7 @@ uint16_t GuidanceObj::GetVoiceGuidanceSettings() } void -GuidanceObj::GetGuidanceStatus(uint16_t& guidanceStatus, uint32_t& routeHandle) +GuidanceObj::GetGuidanceStatus(int32_t &guidanceStatus, uint32_t& routeHandle) { if (m_paused) guidanceStatus = GENIVI_NAVIGATIONCORE_INACTIVE; diff --git a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx index 0e02552..94057c9 100644 --- a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx +++ b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx @@ -41,6 +41,8 @@ #include "coord.h" #include "transform.h" +#include "navigation-common-dbus.h" + #if (!DEBUG_ENABLED) #undef dbg #define dbg(level,...) ; @@ -65,7 +67,7 @@ class LocationInputObj struct event_idle *m_event; bool m_spell; bool m_spell_backspace; - std::vector< std::vector< std::map< uint16_t, ::DBus::Variant > > > m_data; + std::vector< std::vector< std::map< int32_t, DBusCommonAPIVariant > > > m_data; int m_chunk; int m_count; void SetSelectionCriterion(uint32_t SessionHandle, uint32_t SelectionCriterion); @@ -77,8 +79,8 @@ class LocationInputObj void Idle(void); void Spell(uint32_t SessionHandle, const std::string& InputCharacter, uint32_t MaxWindowSize); void RequestListUpdate(uint32_t sessionHandle, const uint16_t& offset, uint16_t maxWindowSize); - void GetEntry(uint16_t index, std::map< uint16_t, ::DBus::Variant >& entry); - void ValidateAddress(uint32_t sessionHandle, const std::map< uint16_t, ::DBus::Variant >& inputAddress); + void GetEntry(uint16_t index, std::map<int32_t, DBusCommonAPIVariant> &entry); + void ValidateAddress(uint32_t sessionHandle, const std::map<int32_t, DBusCommonAPIVariant> &inputAddress); LocationInputObj(LocationInput *locationinput, uint32_t handle); ~LocationInputObj(); }; @@ -122,9 +124,9 @@ class LocationInput handles[LocationInputHandle]=NULL; } - std::vector< uint16_t > GetSupportedAddressAttributes() + std::vector< int32_t > GetSupportedAddressAttributes() { - std::vector< uint16_t > AddressAttributes; + std::vector< int32_t > AddressAttributes; AddressAttributes.resize(5); AddressAttributes[0]=GENIVI_NAVIGATIONCORE_COUNTRY; AddressAttributes[1]=GENIVI_NAVIGATIONCORE_CITY; @@ -134,22 +136,22 @@ class LocationInput return AddressAttributes; } - void SetAddress(const uint32_t& SessionHandle, const uint32_t& LocationInputHandle, const std::map< uint16_t, ::DBus::Variant >& Address) + void SetAddress(const uint32_t& sessionHandle, const uint32_t& locationInputHandle, const std::map< int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > >& address) { dbg(lvl_debug,"enter\n"); - LocationInputObj *obj=handles[LocationInputHandle]; + LocationInputObj *obj=handles[locationInputHandle]; if (!obj) throw DBus::ErrorInvalidArgs("location handle invalid"); throw DBus::ErrorNotSupported("Not yet supported"); } - void SetSelectionCriterion(const uint32_t& SessionHandle, const uint32_t& LocationInputHandle, const uint16_t& SelectionCriterion) + void SetSelectionCriterion(const uint32_t& sessionHandle, const uint32_t& locationInputHandle, const int32_t& selectionCriterion) { dbg(lvl_debug,"enter\n"); - LocationInputObj *obj=handles[LocationInputHandle]; + LocationInputObj *obj=handles[locationInputHandle]; if (!obj) throw DBus::ErrorInvalidArgs("location handle invalid"); - obj->SetSelectionCriterion(SessionHandle, SelectionCriterion); + obj->SetSelectionCriterion(sessionHandle, selectionCriterion); } void Search(const uint32_t& SessionHandle, const uint32_t& LocationInputHandle, const std::string& InputString, const uint16_t& MaxWindowSize) @@ -197,9 +199,9 @@ class LocationInput obj->RequestListUpdate(sessionHandle, offset, maxWindowSize); } - std::map< uint16_t, ::DBus::Variant > GetEntry(const uint32_t& locationInputHandle, const uint16_t& index) + std::map< int32_t, DBusCommonAPIVariant > GetEntry(const uint32_t& locationInputHandle, const uint16_t& index) { - std::map< uint16_t, ::DBus::Variant > ret; + std::map< int32_t, DBusCommonAPIVariant > ret; LocationInputObj *obj=handles[locationInputHandle]; if (!obj) throw DBus::ErrorInvalidArgs("location handle invalid"); @@ -207,7 +209,7 @@ class LocationInput return ret; } - void ValidateAddress(const uint32_t& sessionHandle, const uint32_t& locationInputHandle, const std::map< uint16_t, ::DBus::Variant >& inputAddress) + void ValidateAddress(const uint32_t& sessionHandle, const uint32_t& locationInputHandle, const std::map< int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > >& inputAddress) { LocationInputObj *obj=handles[locationInputHandle]; if (!obj) @@ -349,8 +351,8 @@ LocationInputObj::RequestListUpdate(uint32_t sessionHandle, const uint16_t& offs void LocationInputObj::SelectEntry(const uint32_t& SessionHandle, const uint32_t& Index) { - std::map< uint16_t, ::DBus::Variant > *res=NULL; - std::vector< uint16_t> next; + std::map< int32_t, DBusCommonAPIVariant > *res=NULL; + std::vector< int32_t> next; int window=0; bool guidable=false; for (int i = 0 ; i < m_data.size() ; i++) { @@ -424,7 +426,7 @@ LocationInputObj::Idle(void) m_data.resize(0); m_data.resize(1); while ((res=search_list_get_result(m_sl))) { - std::map< uint16_t, ::DBus::Variant> entry; + std::map< int32_t, DBusCommonAPIVariant> entry; if (res->country && res->country->name) { dbg(lvl_debug,"country %s\n",res->country->name); entry[GENIVI_NAVIGATIONCORE_COUNTRY]=variant_string(std::string(res->country->name)); @@ -494,12 +496,12 @@ LocationInputObj_Idle(LocationInputObj *obj) } void -LocationInputObj::GetEntry(uint16_t index, std::map< uint16_t, ::DBus::Variant >& entry) +LocationInputObj::GetEntry(uint16_t index, std::map<int32_t, DBusCommonAPIVariant> &entry) { } void -LocationInputObj::ValidateAddress(uint32_t sessionHandle, const std::map< uint16_t, ::DBus::Variant >& inputAddress) +LocationInputObj::ValidateAddress(uint32_t sessionHandle, const std::map< int32_t, DBusCommonAPIVariant >& inputAddress) { } diff --git a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx index 5da7722..abb55ef 100644 --- a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx +++ b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx @@ -44,6 +44,8 @@ #include "route.h" #include "config_.h" +#include "navigation-common-dbus.h" + #if (!DEBUG_ENABLED) #undef dbg #define dbg(level,...) ; @@ -152,11 +154,11 @@ class MapMatchedPosition } #endif - std::map< uint16_t, ::DBus::Variant > - GetPosition(const std::vector< uint16_t >& valuesToReturn) + std::map< int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > + GetPosition(const std::vector< int32_t >& valuesToReturn) { dbg(lvl_debug,"enter\n"); - std::map< uint16_t, ::DBus::Variant >map; + std::map< int32_t, DBusCommonAPIVariant >map; struct attr attr; for (int i = 0 ; i < valuesToReturn.size() ; i++) { switch (valuesToReturn[i]) { @@ -181,11 +183,11 @@ class MapMatchedPosition return map; } - std::map< uint16_t, ::DBus::Variant > - GetAddress(const std::vector< uint16_t >& valuesToReturn) + std::map< int32_t, DBusCommonAPIVariant > + GetAddress(const std::vector< int32_t >& valuesToReturn) { - std::map< uint16_t, ::DBus::Variant >ret; - std::vector< uint16_t >::const_iterator it; + std::map< int32_t, DBusCommonAPIVariant >ret; + std::vector< int32_t >::const_iterator it; for (it = valuesToReturn.begin(); it < valuesToReturn.end(); it++) { if (*it == GENIVI_NAVIGATIONCORE_STREET && street_name) { ret[*it]=variant_string(street_name); @@ -194,19 +196,19 @@ class MapMatchedPosition return ret; } - std::map< uint16_t, ::DBus::Variant > - GetPositionOnSegment(const std::vector< uint16_t >& valuesToReturn) + std::map< int32_t, DBusCommonAPIVariant > + GetPositionOnSegment(const std::vector< int32_t >& valuesToReturn) { throw DBus::ErrorNotSupported("Not yet supported"); } - std::map< uint16_t, ::DBus::Variant > - GetStatus(const std::vector< uint16_t >& valuesToReturn) + std::map< int32_t, DBusCommonAPIVariant > + GetStatus(const std::vector< int32_t >& valuesToReturn) { throw DBus::ErrorNotSupported("Not yet supported"); } - uint16_t + int32_t GetSimulationStatus() { return simulationMode; @@ -230,8 +232,8 @@ class MapMatchedPosition throw DBus::ErrorNotSupported("Not yet supported"); } - void - SetPosition(const uint32_t& sessionHandle, const std::map< uint16_t, ::DBus::Variant >& position) + void + SetPosition(const uint32_t& sessionHandle, const std::map< int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > >& position) { throw DBus::ErrorNotSupported("Not yet supported"); } @@ -311,7 +313,7 @@ tracking_attr_position_coord_geo(void) struct attr position_coord_geo, current_item; dbg(lvl_debug,"enter\n"); if (tracking_get_attr(tracking, attr_position_coord_geo, &position_coord_geo, NULL)) { - std::vector< uint16_t >changes; + std::vector< int32_t >changes; changes.push_back(GENIVI_NAVIGATIONCORE_LATITUDE); changes.push_back(GENIVI_NAVIGATIONCORE_LONGITUDE); changes.push_back(GENIVI_NAVIGATIONCORE_SPEED); @@ -332,7 +334,7 @@ tracking_attr_position_coord_geo(void) if (g_strcmp0(new_street_name, street_name)) { g_free(street_name); street_name=g_strdup(new_street_name); - std::vector< uint16_t >changes; + std::vector< int32_t >changes; changes.push_back(GENIVI_NAVIGATIONCORE_STREET); server->AddressUpdate(changes); } diff --git a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx index b05be6e..e8b5c86 100644 --- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx +++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx @@ -48,6 +48,8 @@ #include "map.h" #include "event.h" +#include "navigation-common-dbus.h" + #if (!DEBUG_ENABLED) #undef dbg #define dbg(level,...) ; @@ -77,8 +79,8 @@ class RoutingObj int m_route_status; int m_vehicleprofile_idx; struct vehicleprofile_settings m_vehicleprofile_settings[2]; - std::vector< ::DBus::Struct< uint16_t, uint16_t > > m_route_preferences_list[2]; - std::vector< std::map< uint16_t, ::DBus::Variant > > m_waypoints; + std::vector< ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > > m_route_preferences_list[2]; + std::vector< std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > > m_waypoints; struct callback *m_callback; struct attr m_route,m_vehicleprofile; struct navit *get_navit(void); @@ -86,19 +88,19 @@ class RoutingObj struct route *get_route(struct navit *navit); struct vehicle *get_vehicle(struct navit *navit); struct tracking *get_tracking(void); - void map_to_pcoord(std::map< uint16_t, ::DBus::Variant >map, struct pcoord *pc); + void map_to_pcoord(std::map<DBusCommonAPIEnumeration, DBusCommonAPIVariant> map, struct pcoord *pc); void SetCostModel(uint32_t SessionHandle, uint16_t CostModel); void GetCostModel(uint16_t &CostModel); - void SetWaypoints(uint32_t SessionHandle, bool StartFromCurrentPosition, std::vector< std::map< uint16_t, ::DBus::Variant > > Waypoints); - void GetWaypoints(bool& StartFromCurrentPosition, std::vector< std::map< uint16_t, ::DBus::Variant > >& Waypoints); + void SetWaypoints(uint32_t SessionHandle, bool StartFromCurrentPosition, std::vector< std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > > Waypoints); + void GetWaypoints(bool& StartFromCurrentPosition, std::vector< std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > >& Waypoints); void CalculateRoute(uint32_t SessionHandle); - void GetRouteSegments(int16_t detailLevel , const std::vector< uint16_t >& valuesToReturn, const uint32_t& numberOfSegments, const uint32_t& offset, uint32_t& totalNumberOfSegments, std::vector< std::map< uint16_t, ::DBus::Variant > >& RouteSegments); - void GetRouteOverview(uint32_t routeHandle , std::map< uint16_t, ::DBus::Variant >& routeOverview); + void GetRouteSegments(int16_t detailLevel , const std::vector< DBusCommonAPIEnumeration >& valuesToReturn, const uint32_t& numberOfSegments, const uint32_t& offset, uint32_t& totalNumberOfSegments, std::vector< std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > >& RouteSegments); + void GetRouteOverview(uint32_t routeHandle , std::map<DBusCommonAPIEnumeration, DBusCommonAPIVariant> &routeOverview); void GetRouteBoundingBox(::DBus::Struct< ::DBus::Struct< double, double >,::DBus::Struct< double, double > > &boundingBox); void CancelRouteCalculation(uint32_t sessionHandle); bool RoutePreference(uint16_t preferenceSource, uint16_t preferenceMode); - void SetRoutePreferences(uint32_t sessionHandle, const std::string& country, const std::vector< ::DBus::Struct< uint16_t, uint16_t > >& routePreferencesList); - void GetRoutePreferences(const std::string& country, std::vector< ::DBus::Struct< uint16_t, uint16_t > >& roadPreferenceList); + void SetRoutePreferences(uint32_t sessionHandle, const std::string& country, const std::vector< ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > >& routePreferencesList); + void GetRoutePreferences(const std::string& country, std::vector< ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > >& roadPreferenceList); RoutingObj(Routing *routing, uint32_t session, uint32_t handle); ~RoutingObj(); }; @@ -163,7 +165,7 @@ class Routing } void - SetCostModel(const uint32_t& SessionHandle, const uint32_t& RouteHandle, const uint16_t& CostModel) + SetCostModel(const uint32_t& SessionHandle, const uint32_t& RouteHandle, const DBusCommonAPIEnumeration& CostModel) { RoutingObj *obj=handles[RouteHandle]; if (!obj) @@ -171,7 +173,7 @@ class Routing obj->SetCostModel(SessionHandle, CostModel); } - uint16_t + DBusCommonAPIEnumeration GetCostModel(const uint32_t& RouteHandle) { uint16_t CostModel; @@ -183,10 +185,10 @@ class Routing return CostModel; } - std::vector< uint16_t > + std::vector< DBusCommonAPIEnumeration > GetSupportedCostModels() { - std::vector< uint16_t > CostModels; + std::vector< DBusCommonAPIEnumeration > CostModels; CostModels.resize(2); CostModels[0]=GENIVI_NAVIGATIONCORE_FASTEST; CostModels[1]=GENIVI_NAVIGATIONCORE_SHORTEST; @@ -194,7 +196,7 @@ class Routing } void - SetWaypoints(const uint32_t& SessionHandle , const uint32_t& RouteHandle , const bool& StartFromCurrentPosition , const std::vector< std::map< uint16_t, ::DBus::Variant > >& Waypoints) + SetWaypoints(const uint32_t& SessionHandle , const uint32_t& RouteHandle , const bool& StartFromCurrentPosition , const std::vector< std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > >& Waypoints) { dbg(lvl_debug,"enter\n"); RoutingObj *obj=handles[RouteHandle]; @@ -204,7 +206,7 @@ class Routing } void - GetWaypoints(const uint32_t& RouteHandle , bool& StartFromCurrentPosition , std::vector< std::map< uint16_t, ::DBus::Variant > >& Waypoints) + GetWaypoints(const uint32_t& RouteHandle , bool& StartFromCurrentPosition , std::vector< std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > >& Waypoints) { dbg(lvl_debug,"enter\n"); RoutingObj *obj=handles[RouteHandle]; @@ -224,7 +226,7 @@ class Routing } void - GetRouteSegments(const uint32_t& routeHandle, const int16_t& detailLevel, const std::vector< uint16_t >& valuesToReturn, const uint32_t& numberOfSegments, const uint32_t& offset, uint32_t& totalNumberOfSegments, std::vector< std::map< uint16_t, ::DBus::Variant > >& routeSegments) + GetRouteSegments(const uint32_t& routeHandle, const int16_t& detailLevel, const std::vector< DBusCommonAPIEnumeration >& valuesToReturn, const uint32_t& numberOfSegments, const uint32_t& offset, uint32_t& totalNumberOfSegments, std::vector< std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > >& routeSegments) { dbg(lvl_debug,"enter\n"); RoutingObj *obj=handles[routeHandle]; @@ -244,7 +246,7 @@ class Routing } void - SetRoutePreferences(const uint32_t& sessionHandle, const uint32_t& routeHandle, const std::string& country, const std::vector< ::DBus::Struct< uint16_t, uint16_t > >& roadPreferenceList, const std::vector< ::DBus::Struct< uint16_t, uint16_t > >& conditionPreferenceList) + SetRoutePreferences(const uint32_t& sessionHandle, const uint32_t& routeHandle, const std::string& country, const std::vector< ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > >& roadPreferenceList, const std::vector< ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > >& conditionPreferenceList) { RoutingObj *obj=handles[routeHandle]; if (!obj) @@ -253,10 +255,10 @@ class Routing } void - GetRoutePreferences(const uint32_t& routeHandle, const std::string& country, std::vector< ::DBus::Struct< uint16_t, uint16_t > >& roadPreferenceList, std::vector< ::DBus::Struct< uint16_t, uint16_t > >& conditionPreferenceList) + GetRoutePreferences(const uint32_t& routeHandle, const std::string& country, std::vector< ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > >& roadPreferenceList, std::vector< ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > >& conditionPreferenceList) { - ::DBus::Struct< uint16_t, uint16_t > roadPreference; - ::DBus::Struct< uint16_t, uint16_t > conditionPreference; + ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > roadPreference; + ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > conditionPreference; conditionPreference._1 = GENIVI_NAVIGATIONCORE_USE; conditionPreference._2 = GENIVI_NAVIGATIONCORE_TRAFFIC_REALTIME; @@ -276,10 +278,10 @@ class Routing } void - GetSupportedRoutePreferences(std::vector< ::DBus::Struct< uint16_t, uint16_t > >& routePreferencesList, std::vector< ::DBus::Struct< uint16_t, uint16_t > >& conditionPreferenceList) + GetSupportedRoutePreferences(std::vector< ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > >& routePreferencesList, std::vector< ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > >& conditionPreferenceList) { - ::DBus::Struct< uint16_t, uint16_t > routePreference; - ::DBus::Struct< uint16_t, uint16_t > conditionPreference; + ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > routePreference; + ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > conditionPreference; routePreference._1 = GENIVI_NAVIGATIONCORE_AVOID; routePreference._2 = GENIVI_NAVIGATIONCORE_HIGHWAYS_MOTORWAYS; routePreferencesList.push_back(routePreference); @@ -294,29 +296,29 @@ class Routing conditionPreferenceList.push_back(conditionPreference); } - void SetRouteSchedule(const uint32_t& sessionHandle, const uint32_t& routeHandle, const std::map< uint16_t, uint32_t >& routeSchedule) + void SetRouteSchedule(const uint32_t& sessionHandle, const uint32_t& routeHandle, const std::map< int32_t, uint32_t >& routeSchedule) { throw DBus::ErrorNotSupported("Not yet supported"); } - std::map< uint16_t, uint32_t > GetRouteSchedule(const uint32_t& routeHandle, const std::vector< uint16_t >& valuesToReturn) + std::map< int32_t, uint32_t > GetRouteSchedule(const uint32_t& routeHandle, const std::vector< int32_t >& valuesToReturn) { throw DBus::ErrorNotSupported("Not yet supported"); } void - SetTransportationMeans(const uint32_t& sessionHandle, const uint32_t& routeHandle, const std::vector< uint16_t >& transportationMeansList) + SetTransportationMeans(const uint32_t& sessionHandle, const uint32_t& routeHandle, const std::vector< int32_t >& transportationMeansList) { throw DBus::ErrorNotSupported("Not yet supported"); } - std::vector< uint16_t > + std::vector< DBusCommonAPIEnumeration > GetTransportationMeans(const uint32_t& routeHandle) { throw DBus::ErrorNotSupported("Not yet supported"); } - std::vector< uint16_t > + std::vector< DBusCommonAPIEnumeration > GetSupportedTransportationMeans() { throw DBus::ErrorNotSupported("Not yet supported"); @@ -350,10 +352,10 @@ class Routing throw DBus::ErrorNotSupported("Not yet supported"); } - std::map< uint16_t, ::DBus::Variant > - GetRouteOverview(const uint32_t& routeHandle, const std::vector< uint16_t >& valuesToReturn ) + std::map< int32_t, DBusCommonAPIVariant > + GetRouteOverview(const uint32_t& routeHandle, const std::vector< DBusCommonAPIEnumeration >& valuesToReturn ) { - std::map< uint16_t, ::DBus::Variant > ret; + std::map< int32_t, DBusCommonAPIVariant > ret; RoutingObj *obj=handles[routeHandle]; if (!obj) throw DBus::ErrorInvalidArgs("Route handle invalid"); @@ -492,7 +494,7 @@ RoutingObj::GetCostModel(uint16_t& CostModel) } void -RoutingObj::SetWaypoints(uint32_t SessionHandle, bool StartFromCurrentPosition, std::vector< std::map< uint16_t, ::DBus::Variant > > Waypoints) +RoutingObj::SetWaypoints(uint32_t SessionHandle, bool StartFromCurrentPosition, std::vector< std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > > Waypoints) { if (StartFromCurrentPosition) { if (Waypoints.size() != 1) @@ -513,20 +515,20 @@ RoutingObj::SetWaypoints(uint32_t SessionHandle, bool StartFromCurrentPosition, } void -RoutingObj::GetWaypoints(bool& StartFromCurrentPosition, std::vector< std::map< uint16_t, ::DBus::Variant > >& Waypoints) +RoutingObj::GetWaypoints(bool& StartFromCurrentPosition, std::vector< std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > >& Waypoints) { StartFromCurrentPosition=m_startfromcurrentposition; Waypoints=m_waypoints; } void -RoutingObj::map_to_pcoord(std::map< uint16_t, ::DBus::Variant >map, struct pcoord *pc) +RoutingObj::map_to_pcoord(std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant >map, struct pcoord *pc) { struct coord_geo g; struct coord c; - g.lat=map[GENIVI_NAVIGATIONCORE_LATITUDE]; - g.lng=map[GENIVI_NAVIGATIONCORE_LONGITUDE]; + g.lat=map[GENIVI_NAVIGATIONCORE_LATITUDE]._2; + g.lng=map[GENIVI_NAVIGATIONCORE_LONGITUDE]._2; transform_from_geo(projection_mg, &g, &c); pc->pro=projection_mg; pc->x=c.x; @@ -586,7 +588,7 @@ variant_string(std::string s) } static bool -vector_contains(const std::vector< uint16_t >& vector, uint16_t val) +vector_contains(const std::vector< DBusCommonAPIEnumeration >& vector, uint16_t val) { int i; for (i = 0 ; i < vector.size() ; i++) { @@ -597,7 +599,7 @@ vector_contains(const std::vector< uint16_t >& vector, uint16_t val) } static void -get_map(struct coord *c, struct item *item, int is_end, const std::vector< uint16_t >& valuesToReturn, std::map< uint16_t, ::DBus::Variant > &map) +get_map(struct coord *c, struct item *item, int is_end, const std::vector< DBusCommonAPIEnumeration >& valuesToReturn, std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > &map) { uint16_t lat_key=is_end?GENIVI_NAVIGATIONCORE_END_LATITUDE:GENIVI_NAVIGATIONCORE_START_LATITUDE; uint16_t lon_key=is_end?GENIVI_NAVIGATIONCORE_END_LONGITUDE:GENIVI_NAVIGATIONCORE_START_LONGITUDE; @@ -636,7 +638,7 @@ get_map(struct coord *c, struct item *item, int is_end, const std::vector< uint1 void -RoutingObj::GetRouteSegments(int16_t detailLevel , const std::vector< uint16_t >& valuesToReturn, const uint32_t& numberOfSegments, const uint32_t& offset, uint32_t& totalNumberOfSegments, std::vector< std::map< uint16_t, ::DBus::Variant > >& RouteSegments) +RoutingObj::GetRouteSegments(int16_t detailLevel , const std::vector< DBusCommonAPIEnumeration >& valuesToReturn, const uint32_t& numberOfSegments, const uint32_t& offset, uint32_t& totalNumberOfSegments, std::vector< std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > >& RouteSegments) { struct map *m=route_get_map(m_route.u.route); if (!m) @@ -664,7 +666,7 @@ RoutingObj::GetRouteSegments(int16_t detailLevel , const std::vector< uint16_t > break; case 1: /* last is start coordinates */ { - std::map< uint16_t, ::DBus::Variant > map; + std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant > map; get_map(&last, item, 0, valuesToReturn, map); RouteSegments.push_back(map); pos++; @@ -703,7 +705,7 @@ RoutingObj::GetRouteSegments(int16_t detailLevel , const std::vector< uint16_t > } void -RoutingObj::GetRouteOverview(uint32_t routeHandle , std::map< uint16_t, ::DBus::Variant >& routeOverview) +RoutingObj::GetRouteOverview(uint32_t routeHandle , std::map< DBusCommonAPIEnumeration, DBusCommonAPIVariant >& routeOverview) { struct attr destination_length, destination_time; if (!route_get_attr(m_route.u.route,attr_destination_length, &destination_length, NULL)) @@ -794,13 +796,13 @@ RoutingObj_Callback(struct RoutingObj *obj) obj->m_routing->RouteCalculationProgressUpdate(obj->m_handle, GENIVI_NAVIGATIONCORE_OK, 100); obj->m_route_status=route_status.u.num; dbg(lvl_debug,"callback routing ok\n"); - std::map< uint16_t, uint16_t > unfulfilled_preferences; + std::map< int32_t, int32_t > unfulfilled_preferences; obj->m_routing->RouteCalculationSuccessful(obj->m_handle, unfulfilled_preferences); } if (route_status.u.num == route_status_not_found) { obj->m_route_status=route_status.u.num; dbg(lvl_debug,"callback routing failed\n"); - std::map< uint16_t, uint16_t > unfulfilled_preferences; + std::map< int32_t, int32_t > unfulfilled_preferences; obj->m_routing->RouteCalculationFailed(obj->m_handle, GENIVI_NAVIGATIONCORE_UNREACHABLE_DESTINATION, unfulfilled_preferences); } } @@ -821,7 +823,7 @@ RoutingObj::RoutePreference(uint16_t preferenceSource,uint16_t preferenceMode) } void -RoutingObj::SetRoutePreferences(uint32_t sessionHandle, const std::string& country, const std::vector< ::DBus::Struct< uint16_t, uint16_t > >& routePreferencesList) +RoutingObj::SetRoutePreferences(uint32_t sessionHandle, const std::string& country, const std::vector< ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > >& routePreferencesList) { int idx; struct attr flags_forward_mask,flags_reverse_mask,roadprofile,item_types,route_weight; @@ -880,7 +882,7 @@ RoutingObj::SetRoutePreferences(uint32_t sessionHandle, const std::string& count } void -RoutingObj::GetRoutePreferences(const std::string& country, std::vector< ::DBus::Struct< uint16_t, uint16_t > >& roadPreferenceList) +RoutingObj::GetRoutePreferences(const std::string& country, std::vector< ::DBus::Struct<DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > > &roadPreferenceList) { roadPreferenceList=m_route_preferences_list[m_vehicleprofile_idx]; } diff --git a/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx b/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx index f63ebd2..57a52c4 100644 --- a/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx +++ b/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx @@ -34,6 +34,8 @@ #include "plugin.h" #include "event.h" +#include "navigation-common-dbus.h" + #if (!DEBUG_ENABLED) #undef dbg #define dbg(level,...) ; @@ -79,7 +81,7 @@ class Session return SessionHandle; } - uint16_t GetSessionStatus(const uint32_t& SessionHandle) + DBusCommonAPIEnumeration GetSessionStatus(const uint32_t& SessionHandle) { if (handles[SessionHandle]) return GENIVI_NAVIGATIONCORE_AVAILABLE; diff --git a/src/navigation/poi-cam/CMakeLists.txt b/src/navigation/poi-cam/CMakeLists.txt index 250dfca..06cd7f1 100644 --- a/src/navigation/poi-cam/CMakeLists.txt +++ b/src/navigation/poi-cam/CMakeLists.txt @@ -49,6 +49,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${NAVIT_CONFIG_H_DIR}) # this one contains config.h that is generated +include_directories(${NAVIGATION_COMMON_DIR}) + include_directories(${DBUS_GENERATED_INCLUDE_DIR}/poi-service) if(${YOCTO_CONFIG}) diff --git a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx index 9d83b35..3b04288 100644 --- a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx +++ b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx @@ -40,6 +40,7 @@ #include "transform.h" #include "map.h" #include "mapset.h" +#include "navigation-common-dbus.h" #if (!DEBUG_ENABLED) #undef dbg @@ -72,7 +73,7 @@ variant_string(std::string s) } static bool -do_sort_distance(::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, int32_t >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Variant > > > a, ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, int32_t >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Variant > > > b) +do_sort_distance(::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > a, ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > b) { return a._5 < b._5; } @@ -98,9 +99,9 @@ class ContentAccessModule { private: std::vector< uint32_t > m_poiCategoriesId; - std::vector< ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, int32_t >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Variant > > > > m_resultList; + std::vector< ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > > m_resultList; int m_max_radius; - bool (*m_sort_func)(::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, int32_t >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Variant > > > a, ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, int32_t >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Variant > > > b); + bool (*m_sort_func)(::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > a, ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > b); struct coord m_center; double m_scale; struct mapset *m_mapset; @@ -112,13 +113,13 @@ class ContentAccessModule public: - ContentAccessModule(DBus::Connection &connection) - : DBus::ObjectAdaptor(connection, "/org/genivi/poiservice/POIContentAccessModule") - { - m_mapset=NULL; - m_msh=NULL; - m_map_rect=NULL; - } + ContentAccessModule(DBus::Connection &connection) + : DBus::ObjectAdaptor(connection, "/org/genivi/poiservice/POIContentAccessModule") + { + m_mapset=NULL; + m_msh=NULL; + m_map_rect=NULL; + } void register_cam(void) @@ -128,8 +129,8 @@ class ContentAccessModule int camid=pca->RegisterContentAccessModule(cam_name); dbg(lvl_debug,"camid=%d\n",camid); - std::vector< ::DBus::Struct< ::DBus::Struct< std::vector< uint32_t >, ::DBus::Variant, std::string, std::string, ::DBus::Variant >, std::vector< ::DBus::Struct< uint32_t, std::string, int32_t, std::vector< ::DBus::Struct< int32_t, std::string, ::DBus::Variant > > > >, std::vector< ::DBus::Struct< uint32_t, std::string > > > > poiCategories1; - ::DBus::Struct< ::DBus::Struct< std::vector< uint32_t >, ::DBus::Variant, std::string, std::string, ::DBus::Variant >, std::vector< ::DBus::Struct< uint32_t, std::string, int32_t, std::vector< ::DBus::Struct< int32_t, std::string, ::DBus::Variant > > > >, std::vector< ::DBus::Struct< uint32_t, std::string > > > poiCategory; + std::vector< ::DBus::Struct< ::DBus::Struct< std::vector< uint32_t >, DBusCommonAPIVariant, std::string, std::string, DBusCommonAPIVariant >, std::vector< ::DBus::Struct< uint32_t, std::string, int32_t, std::vector< ::DBus::Struct< int32_t, std::string, DBusCommonAPIVariant > > > >, std::vector< ::DBus::Struct< uint32_t, std::string > > > > poiCategories1; + ::DBus::Struct< ::DBus::Struct< std::vector< uint32_t >, DBusCommonAPIVariant, std::string, std::string, DBusCommonAPIVariant >, std::vector< ::DBus::Struct< uint32_t, std::string, int32_t, std::vector< ::DBus::Struct< int32_t, std::string, DBusCommonAPIVariant > > > >, std::vector< ::DBus::Struct< uint32_t, std::string > > > poiCategory; /* poiCategory._1._1 parents_id */; poiCategory._1._2=variant_string(""); /* icons */ poiCategory._1._3="fuel"; /* name */ @@ -161,8 +162,44 @@ class ContentAccessModule m_map_rect=NULL; } - ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > - GetVersion() + void + add_poi(struct item *item) + { + struct attr label; + struct coord c; + dbg(lvl_debug,"adding poi\n"); + ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > result; + + result._1=m_resultList.size(); /* source_id */ + if (item_attr_get(item, attr_label, &label)) + result._2=std::string(label.u.str); /* name */ + else + result._2=std::string(""); /* name */ + result._3=m_poiCategoriesId[0]; /* category */ + if (item_coord_get(item, &c, 1)) { + struct coord_geo g; + transform_to_geo(projection_mg, &c, &g); + result._4._1=g.lat; /* lat */ + result._4._2=g.lng; /* lon */ + double distance=transform_distance(projection_mg, &m_center, &c)/m_scale; +#if 0 + if (distance > m_max_radius) + return; +#endif + result._5=distance; /* distance */ + } else { + result._4._1=0; /* lat */ + result._4._2=0; /* lon */ + result._5=0; /* distance */ + } + result._4._3=0; /* altitude */ + /* result._6 attributes */ + result._7=variant_string(std::string("")); /* value */ + m_resultList.push_back(result); + } + + ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > + GetVersion() { DBus::Struct<uint16_t, uint16_t, uint16_t, std::string> Version; Version._1=3; @@ -172,21 +209,24 @@ class ContentAccessModule return Version; } - void SetLocale(const std::string& languageCode, const std::string& countryCode, const std::string &scriptCode) + void + SetLocale(const std::string& languageCode, const std::string& countryCode, const std::string &scriptCode) { m_languageCode = languageCode; m_countryCode = countryCode; m_scriptCode = scriptCode; } - void GetLocale(std::string& languageCode, std::string& countryCode, std::string& scriptCode) + void + GetLocale(std::string& languageCode, std::string& countryCode, std::string& scriptCode) { languageCode = m_languageCode; countryCode = m_countryCode; scriptCode = m_scriptCode; } - std::vector< ::DBus::Struct< std::string, std::string , std::string> > GetSupportedLocales() + std::vector< ::DBus::Struct< std::string, std::string , std::string> > + GetSupportedLocales() { std::vector< ::DBus::Struct< std::string, std::string, std::string > > ret; ::DBus::Struct< std::string, std::string, std::string > en_US { "eng","USA", "Latn" }; @@ -196,7 +236,56 @@ class ContentAccessModule return ret; } - void PoiSearchStarted(const uint32_t& poiSearchHandle, const uint16_t& maxSize, const ::DBus::Struct< double, double, int32_t >& location, const std::vector< ::DBus::Struct< uint32_t, uint32_t > >& poiCategories, const std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, ::DBus::Variant, int32_t, bool > >& poiAttributes, const std::string& inputString, const uint16_t& sortOption) + std::vector< ::DBus::Struct< uint32_t, std::string, bool > > + GetAvailableCategories() + { + throw DBus::ErrorNotSupported("Not yet supported"); + } + + uint32_t + GetRootCategory() + { + throw DBus::ErrorNotSupported("Not yet supported"); + } + + std::vector< ::DBus::Struct< uint32_t, bool > > + GetChildrenCategories(const uint32_t& category) + { + throw DBus::ErrorNotSupported("Not yet supported"); + } + + std::vector< ::DBus::Struct< uint32_t, bool > > + GetParentCategories(const uint32_t& category) + { + throw DBus::ErrorNotSupported("Not yet supported"); + } + + uint32_t + createCategory(const ::DBus::Struct< ::DBus::Struct< std::vector< uint32_t >, DBusCommonAPIVariant, std::string, std::string, DBusCommonAPIVariant >, std::vector< ::DBus::Struct< uint32_t, std::string, int32_t, std::vector< ::DBus::Struct< int32_t, std::string, DBusCommonAPIVariant > > > >, std::vector< ::DBus::Struct< uint32_t, std::string > > >& category) + { + throw DBus::ErrorNotSupported("Not yet supported"); + } + + void + removeCategories(const std::vector< uint32_t >& categories) + { + throw DBus::ErrorNotSupported("Not yet supported"); + } + + void + addPOIs(const uint32_t& unique_id, const std::vector< ::DBus::Struct< std::string, ::DBus::Struct< double, double, double >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > >& poiList) + { + throw DBus::ErrorNotSupported("Not yet supported"); + } + + void + removePOIs(const std::vector< uint32_t >& ids) + { + throw DBus::ErrorNotSupported("Not yet supported"); + } + + void + PoiSearchStarted(const uint32_t& poiSearchHandle, const uint16_t& maxSize, const ::DBus::Struct< double, double, double >& location, const std::vector< ::DBus::Struct< uint32_t, uint32_t > >& poiCategories, const std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, DBusCommonAPIVariant, int32_t, bool > >& poiAttributes, const std::string& inputString, const uint16_t& sortOption) { struct attr navit; struct coord_geo g; @@ -247,50 +336,14 @@ class ContentAccessModule m_sort_func=NULL; } - void + void PoiSearchCanceled(const uint32_t& poiSearchHandle) { dbg(lvl_debug,"enter\n"); } - - void - add_poi(struct item *item) - { - struct attr label; - struct coord c; - dbg(lvl_debug,"adding poi\n"); - ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, int32_t >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Variant > > > result; - - result._1=m_resultList.size(); /* source_id */ - if (item_attr_get(item, attr_label, &label)) - result._2=std::string(label.u.str); /* name */ - else - result._2=std::string(""); /* name */ - result._3=m_poiCategoriesId[0]; /* category */ - if (item_coord_get(item, &c, 1)) { - struct coord_geo g; - transform_to_geo(projection_mg, &c, &g); - result._4._1=g.lat; /* lat */ - result._4._2=g.lng; /* lon */ - double distance=transform_distance(projection_mg, &m_center, &c)/m_scale; -#if 0 - if (distance > m_max_radius) - return; -#endif - result._5=distance; /* distance */ - } else { - result._4._1=0; /* lat */ - result._4._2=0; /* lon */ - result._5=0; /* distance */ - } - result._4._3=0; /* altitude */ - /* result._6 attributes */ - result._7=variant_string(std::string("")); /* value */ - m_resultList.push_back(result); - } - void - ResultListRequested(const uint8_t& camId, const uint32_t& poiSearchHandle, const std::vector< uint32_t >& attributes, uint16_t& statusValue, uint16_t& resultListSize, std::vector< ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, int32_t >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Variant > > > >& resultList) + void + ResultListRequested(const uint8_t& camId, const uint32_t& poiSearchHandle, const std::vector< uint32_t >& attributeList, uint16_t& statusValue, uint16_t& resultListSize, std::vector< ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > >& resultList) { struct item *item; int count=0; @@ -311,14 +364,14 @@ class ContentAccessModule resultListSize=resultList.size(); } - std::vector< ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, int32_t > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Variant > > > > + std::vector< ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > > PoiDetailsRequested(const std::vector< uint32_t >& source_id) { dbg(lvl_debug,"enter\n"); - std::vector< ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, int32_t > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Variant > > > > ret; + std::vector< ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > > ret; for (int i = 0 ; i < source_id.size() ; i++) { int sid=source_id[i]; - ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, int32_t > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Variant > > > result; + ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > result; result._1._1=sid; /* source id */ result._1._2=m_resultList[sid]._2; /* name */ result._1._3._1=m_resultList[sid]._4._1; /* lat */ diff --git a/src/poi-service/poi-common/poi-common-dbus-data-model-new-variant.h b/src/poi-service/poi-common/poi-common-dbus-data-model-new-variant.h deleted file mode 100644 index 764ab25..0000000 --- a/src/poi-service/poi-common/poi-common-dbus-data-model-new-variant.h +++ /dev/null @@ -1,1913 +0,0 @@ -/** -* @licence app begin@ -* SPDX-License-Identifier: MPL-2.0 -* -* \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen -* -* \file poi-common-dbus-data-model.h -* -* \brief This file is part of the poi proof of concept. -* -* \author Philippe Colliot <philippe.colliot@mpsa.com> -* -* \version 1.1 -* -* This Source Code Form is subject to the terms of the -* Mozilla Public License (MPL), 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/. -* -* For further information see http://www.genivi.org/. -* -* List of changes: -* 10-02-2014, Philippe Colliot, refinement and migration to the new repository -* <date>, <name>, <description of change> -* -* @licence end@ -*/ -#ifndef __POICOMMONDBUSDATAMODEL_H__ -#define __POICOMMONDBUSDATAMODEL_H__ - -#include <stdbool.h> -#include <unistd.h> -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> -#include <iostream> -#include <fstream> - - -#include <dbus-c++/dbus.h> - -#include "poi-common-data-model.h" - -/* How to - The below classes are gateways between internal data and DBus data - Internal access is provided by set and get - DBus access is provided by setDBus and getDBus - Code rules: - if data name is MYNAME: -class DBus_MYNAME // DBus data type ex:(qqqs) -{ -public: - struct MYNAME_t //no class used into this public structure - { -... - }; - - typedef ... DBus_MYNAME_t; - - DBus_MYNAME(){ -... - } - - ~DBus_MYNAME(){} - - void set(MYNAME_t value){ -... - } - - MYNAME_t get(){ -... - return(m_MYNAME); - } - - void setDBus(DBus_MYNAME_t value){ -... - } - - DBus_MYNAME_t getDBus(){ - DBus_MYNAME_t return_value; -... - return(return_value); - } - -private: - MYNAME_t m_MYNAME; -}; - -*/ - -class DBus_dataFormatConverter -{ -public: - DBus_dataFormatConverter() - { - } - ~ DBus_dataFormatConverter() - { - } - DBus::Variant createVariantString(std::string str) - { - DBus::Variant var; - DBus::MessageIter iter = var.writer(); - iter.append_string(str.c_str()); - return var; - } - - DBus::Variant createVariantBool(bool value) - { - DBus::Variant var; - DBus::MessageIter iter = var.writer(); - iter.append_bool(value); - return var; - } - - DBus::Variant createVariantUint16(uint16_t value) - { - DBus::Variant var; - DBus::MessageIter iter = var.writer(); - iter.append_uint16(value); - return var; - } - - DBus::Variant createVariantInt32(int32_t value) - { - DBus::Variant var; - DBus::MessageIter iter = var.writer(); - iter.append_int32(value); - return var; - } - - DBus::Variant createVariantArrayUint16(std::vector< uint16_t > value) - { - DBus::Variant var; - DBus::MessageIter iter=var.writer(); - iter << value; - return var; - } - - DBus::Variant createVariantUint32(uint32_t value) - { - DBus::Variant var; - DBus::MessageIter iter = var.writer(); - iter.append_uint32(value); - return var; - } - - DBus::Variant createVariantArrayUint32(std::vector< uint32_t > value) - { - DBus::Variant var; - DBus::MessageIter iter=var.writer(); - iter << value; - return var; - } - -}; - -class DBus_variantIcon : DBus_dataFormatConverter // (yv) -{ -public: - enum { - AS_VECTOR_OF_ID = 0, - AS_STRING = 1, - }; - - struct Icon_t - { - std::vector<resourceId_t> id; - std::string url; - }; - - struct variantIcon_t - { - uint8_t index; - Icon_t content; - }; - - typedef ::DBus::Struct< uint8_t, ::DBus::Variant > DBus_variantIcon_t; - - - DBus_variantIcon(){ - m_variantIcon.index = AS_STRING; - m_variantIcon.content.id.clear(); - m_variantIcon.content.url = ""; - } - - ~DBus_variantIcon(){} - - void set(variantIcon_t value){ - size_t index; - - m_variantIcon.index = value.index; - switch (value.index) { - case 0: - m_variantIcon.content.id.clear(); - for (index=0;index<value.content.id.size();index++) - { - m_variantIcon.content.id.push_back(value.content.id.at(index)); - } - break; - case 1: - m_variantIcon.content.url = value.content.url; - break; - default: - break; - } - } - - variantIcon_t get(){ - return(m_variantIcon); - } - - void setDBus(DBus_variantIcon_t value){ - size_t index; - std::string *str; - - m_variantIcon.index = value._1; - switch (value._1) { - case 0: - value._2.reader().get_array(str); - m_variantIcon.content.id.clear(); - - for (index=0;index<str->size();index++) - { - m_variantIcon.content.id.push_back(str->at(index)); - } - break; - case 1: - m_variantIcon.content.url = value._2.reader().get_string(); - break; - default: - break; - } - } - - DBus_variantIcon_t getDBus(){ - size_t index; - DBus_variantIcon_t return_value; - - return_value._1 = m_variantIcon.index; - - switch (m_variantIcon.index) { - case 0: - return_value._2.clear(); - for (index=0;index<m_variantIcon.content.id.size();index++) - { - return_value._2 = createVariantArrayUint32(m_variantIcon.content.id); - } - break; - case 1: - return_value._2 = createVariantString(m_variantIcon.content.url); - break; - default: - break; - } - - return(return_value); - } - -private: - variantIcon_t m_variantIcon; -}; - -class DBus_variantMedia : DBus_dataFormatConverter // (yv) -{ -public: - enum { - AS_VECTOR_OF_ID = 0, - AS_STRING = 1, - }; - - struct Media_t - { - std::vector<resourceId_t> id; - std::string url; - }; - - struct variantMedia_t - { - uint8_t index; - Media_t content; - }; - - typedef ::DBus::Struct< uint8_t, ::DBus::Variant > DBus_variantMedia_t; - - DBus_variantMedia(){ - m_variantMedia.index = AS_STRING; - m_variantMedia.content.id.clear(); - m_variantMedia.content.url = ""; - } - - ~DBus_variantMedia(){} - - void set(variantMedia_t value){ - size_t index; - - m_variantMedia.index = value.index; - switch (value.index) { - case 0: - m_variantMedia.content.id.clear(); - for (index=0;index<value.content.id.size();index++) - { - m_variantMedia.content.id.push_back(value.content.id.at(index)); - } - break; - case 1: - m_variantMedia.content.url = value.content.url; - break; - default: - break; - } - } - - variantMedia_t get(){ - return(m_variantMedia); - } - - void setDBus(DBus_variantMedia_t value){ - size_t index; - std::string *str; - - m_variantMedia.index = value._1; - switch (value._1) { - case 0: - value._2.reader().get_array(str); - m_variantMedia.content.id.clear(); - - for (index=0;index<str->size();index++) - { - m_variantMedia.content.id.push_back(str->at(index)); - } - break; - case 1: - m_variantMedia.content.url = value._2.reader().get_string(); - break; - default: - break; - } - } - - DBus_variantMedia_t getDBus(){ - size_t index; - DBus_variantMedia_t return_value; - - return_value._1 = m_variantMedia.index; - - switch (m_variantMedia.index) { - case 0: - return_value._2.clear(); - for (index=0;index<m_variantMedia.content.id.size();index++) - { - return_value._2 = createVariantArrayUint32(m_variantMedia.content.id); - } - break; - case 1: - return_value._2 = createVariantString(m_variantMedia.content.url); - break; - default: - break; - } - - return(return_value); - } - -private: - variantMedia_t m_variantMedia; -}; - -class DBus_variantAttributeValue : DBus_dataFormatConverter // (yv) -{ -public: - enum { - AS_INT32 = 0, - AS_STRING = 1, - AS_BOOL = 2 - }; - - struct AttributeValue_t - { - int32_t intValue; - std::string stringValue; - bool boolValue; - }; - - struct variantAttributeValue_t - { - uint8_t index; - AttributeValue_t content; - }; - - typedef ::DBus::Struct< uint8_t, ::DBus::Variant > DBus_variantAttributeValue_t; - - DBus_variantAttributeValue(){ - m_variantAttributeValue.index = AS_STRING; - m_variantAttributeValue.content.intValue = 0; - m_variantAttributeValue.content.stringValue = ""; - m_variantAttributeValue.content.boolValue = false; - } - - ~DBus_variantAttributeValue(){} - - void set(variantAttributeValue_t value){ - - m_variantAttributeValue.index = value.index; - switch (value.index) { - case 0: - m_variantAttributeValue.content.intValue = value.content.intValue; - break; - case 1: - m_variantAttributeValue.content.stringValue = value.content.stringValue; - break; - case 2: - m_variantAttributeValue.content.boolValue = value.content.boolValue; - break; - default: - break; - } - } - - variantAttributeValue_t get(){ - return(m_variantAttributeValue); - } - - void setDBus(DBus_variantAttributeValue_t value){ - m_variantAttributeValue.index = value._1; - switch (value._1) { - case 0: - m_variantAttributeValue.content.intValue = value._2.reader().get_int32(); - break; - case 1: - m_variantAttributeValue.content.stringValue = value._2.reader().get_string(); - break; - case 2: - m_variantAttributeValue.content.boolValue = value._2.reader().get_bool(); - break; - default: - break; - } - } - - DBus_variantAttributeValue_t getDBus(){ - DBus_variantAttributeValue_t return_value; - - return_value._1 = m_variantAttributeValue.index; - - switch (m_variantAttributeValue.index) { - case 0: - return_value._2 = createVariantInt32(m_variantAttributeValue.content.intValue); - break; - case 1: - return_value._2 = createVariantString(m_variantAttributeValue.content.stringValue); - break; - case 2: - return_value._2 = createVariantBool(m_variantAttributeValue.content.boolValue); - break; - default: - break; - } - - return(return_value); - } - -private: - variantAttributeValue_t m_variantAttributeValue; -}; - -class DBus_version : DBus_dataFormatConverter // (qqqs) -{ -public: - struct version_t - { - ushort major; - ushort minor; - ushort micro; - std::string date; - }; - - typedef ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > DBus_version_t; - - DBus_version(){ - m_version.major = 0; - m_version.minor = 0; - m_version.micro = 0; - m_version.date = ""; - } - - ~DBus_version(){} - - void set(version_t value){ - m_version.major = value.major; - m_version.minor = value.minor; - m_version.micro = value.micro; - m_version.date = value.date; - } - - version_t get(){ - return(m_version); - } - - void setDBus(DBus_version_t value){ - m_version.major = value._1; - m_version.minor = value._2; - m_version.micro = value._3; - m_version.date = value._4; - } - - DBus_version_t getDBus(){ - DBus_version_t return_value; - return_value._1 = m_version.major; - return_value._2 = m_version.minor; - return_value._3 = m_version.micro; - return_value._4 = m_version.date; - return(return_value); - } - -private: - version_t m_version; -}; - -class DBus_categoryDetails : DBus_dataFormatConverter // (uau(yv)sbs(yv)) -{ -public: - struct categoryDetails_t - { - categoryId_t id; //Category unique id - std::vector<categoryId_t> parents_id; //list of parent categories unique id - DBus_variantIcon::variantIcon_t icons; //visual icons set - std::string name; - bool top_level; //false if predefined, true if created by plugin - std::string description; //short category description (optional) - DBus_variantMedia::variantMedia_t media; //media associated (html web site, audio, video, ...) (optional) - }; - - typedef ::DBus::Struct< uint32_t, std::vector< uint32_t >, ::DBus::Struct< uint8_t, ::DBus::Variant >, std::string, bool, std::string, ::DBus::Struct< uint8_t, ::DBus::Variant > > DBus_categoryDetails_t; - - DBus_categoryDetails() - { - DBus_variantIcon icons; - DBus_variantMedia media; - - m_categoryDetails.id = 0; - m_categoryDetails.parents_id.clear(); - m_categoryDetails.icons = icons.get(); - m_categoryDetails.name = ""; - m_categoryDetails.top_level = true; - m_categoryDetails.description = ""; - m_categoryDetails.media = media.get(); - } - - ~DBus_categoryDetails(){} - - void set(categoryDetails_t value) - { - size_t index; - m_categoryDetails.id = value.id; - m_categoryDetails.parents_id.clear(); - for (index=0;index<value.parents_id.size();index++) - { - m_categoryDetails.parents_id.push_back(value.parents_id.at(index)); - } - m_categoryDetails.icons = value.icons; - m_categoryDetails.name = value.name; - m_categoryDetails.top_level = value.top_level; - m_categoryDetails.description = value.description; - m_categoryDetails.media = value.media; - } - - categoryDetails_t get() - { - return(m_categoryDetails); - } - - void setDBus(DBus_categoryDetails_t value) - { - size_t index; - DBus_variantIcon icons; - DBus_variantMedia media; - - m_categoryDetails.id = value._1; - m_categoryDetails.parents_id.clear(); - for (index=0;index<value._2.size();index++) - { - m_categoryDetails.parents_id.push_back(value._2.at(index)); - } - icons.setDBus(value._3); - m_categoryDetails.icons = icons.get(); - m_categoryDetails.name = value._4; - m_categoryDetails.top_level = value._5; - m_categoryDetails.description = value._6; - media.setDBus(value._7); - m_categoryDetails.media = media.get(); - } - - DBus_categoryDetails_t getDBus() - { - size_t index; - DBus_variantIcon icons; - DBus_variantMedia media; - DBus_categoryDetails_t return_value; - - return_value._1 = m_categoryDetails.id; - return_value._2.clear(); - for (index=0;index<m_categoryDetails.parents_id.size();index++) - { - return_value._2.push_back(m_categoryDetails.parents_id.at(index)); - } - icons.set(m_categoryDetails.icons); - return_value._3 = icons.getDBus(); - return_value._4 = m_categoryDetails.name; - return_value._5 = m_categoryDetails.top_level; - return_value._6 = m_categoryDetails.description; - media.set(m_categoryDetails.media); - return_value._7 = media.getDBus(); - return(return_value); - } - -private: - categoryDetails_t m_categoryDetails; -}; - -class DBus_categoryOperator : DBus_dataFormatConverter // (is(yv)) -{ -public: - struct categoryOperator_t - { - int32_t type; //attribute operator type enum(INVALID,MORE_THAN,LESS_THAN,EQUAL, ....) - std::string name; //attribute operator name - DBus_variantAttributeValue::variantAttributeValue_t value; //attribute operator value - }; - - typedef ::DBus::Struct< int32_t, std::string, ::DBus::Struct< uint8_t, ::DBus::Variant > > DBus_categoryOperator_t; - - DBus_categoryOperator(){ - DBus_variantAttributeValue attributeValue; - - m_categoryOperator.type = 0; - m_categoryOperator.name = ""; - m_categoryOperator.value = attributeValue.get(); - } - - ~DBus_categoryOperator(){ - } - - void set(categoryOperator_t value){ - m_categoryOperator.type = value.type; - m_categoryOperator.name = value.name; - m_categoryOperator.value = value.value; - } - - categoryOperator_t get(){ - return(m_categoryOperator); - } - - void setDBus(DBus_categoryOperator_t value){ - DBus_variantAttributeValue attributeValue; - - m_categoryOperator.type = value._1; - m_categoryOperator.name = value._2; - - attributeValue.setDBus(value._3); - m_categoryOperator.value = attributeValue.get(); - } - - DBus_categoryOperator_t getDBus(){ - DBus_categoryOperator_t return_value; - DBus_variantAttributeValue attributeValue; - - return_value._1 = m_categoryOperator.type; - return_value._2 = m_categoryOperator.name; - - attributeValue.set(m_categoryOperator.value); - return_value._3 = attributeValue.getDBus(); - - return(return_value); - } - -private: - categoryOperator_t m_categoryOperator; -}; - -class DBus_categoryAttribute : DBus_dataFormatConverter // (usia(is(yv))) -{ -public: - struct categoryAttribute_t - { - attributeId_t id; //attribute unique id - std::string name; //attribute unique name - int32_t type; //enum(INVALID,STRING,INTEGER,COORDINATES ...) - std::vector<DBus_categoryOperator::categoryOperator_t > oper; - }; - - typedef ::DBus::Struct< uint32_t, std::string, int32_t, std::vector< ::DBus::Struct< int32_t, std::string, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > DBus_categoryAttribute_t; - - DBus_categoryAttribute(){ - m_categoryAttribute.id = 0; - m_categoryAttribute.name = ""; - m_categoryAttribute.type = 0; - m_categoryAttribute.oper.clear(); - } - - ~DBus_categoryAttribute(){ - } - - void set(categoryAttribute_t value){ - size_t index; - m_categoryAttribute.id = value.id; - m_categoryAttribute.name = value.name; - m_categoryAttribute.type = value.type; - m_categoryAttribute.oper.clear(); - for (index=0;index<value.oper.size();index++) - { - m_categoryAttribute.oper.push_back(value.oper.at(index)); - } - } - - categoryAttribute_t get(){ - return(m_categoryAttribute); - } - - void setDBus(DBus_categoryAttribute_t value){ - size_t index; - DBus_categoryOperator op; - m_categoryAttribute.id = value._1; - m_categoryAttribute.name = value._2; - m_categoryAttribute.type = value._3; - m_categoryAttribute.oper.clear(); - for (index=0;index<value._4.size();index++) - { - op.setDBus(value._4.at(index)); - m_categoryAttribute.oper.push_back(op.get()); - } - } - - DBus_categoryAttribute_t getDBus(){ - DBus_categoryAttribute_t return_value; - size_t index; - DBus_categoryOperator op; - return_value._1 = m_categoryAttribute.id; - return_value._2 = m_categoryAttribute.name; - return_value._3 = m_categoryAttribute.type; - return_value._4.clear(); - for (index=0;index<m_categoryAttribute.oper.size();index++) - { - op.set(m_categoryAttribute.oper.at(index)); - return_value._4.push_back(op.getDBus()); - } - return(return_value); - } - -private: - categoryAttribute_t m_categoryAttribute; -}; - -class DBus_categorySortOption : DBus_dataFormatConverter // (us) -{ -public: - struct categorySortOption_t - { - uint32_t id; //enum(GENIVI_POISERVICE_SORT_DEFAULT,GENIVI_POISERVICE_SORT_BY_DISTANCE,GENIVI_POISERVICE_SORT_BY_TIME ... ) - std::string name; //name to be displayed by application - }; - - typedef ::DBus::Struct< uint32_t, std::string > DBus_categorySortOption_t; - - DBus_categorySortOption(){ - m_categorySortOption.id = 0; - m_categorySortOption.name = ""; - } - - ~DBus_categorySortOption(){ - } - - void set(categorySortOption_t value){ - m_categorySortOption.id = value.id; - m_categorySortOption.name = value.name; - } - - categorySortOption_t get(){ - return(m_categorySortOption); - } - - void setDBus(DBus_categorySortOption_t value){ - m_categorySortOption.id = value._1; - m_categorySortOption.name = value._2; - } - - DBus_categorySortOption_t getDBus(){ - DBus_categorySortOption_t return_value; - return_value._1 = m_categorySortOption.id; - return_value._2 = m_categorySortOption.name; - return(return_value); - } - -private: - categorySortOption_t m_categorySortOption; -}; - -class DBus_category : DBus_dataFormatConverter // ( (uau(yv)sbs(yv)) a(usia(is(yv))) a(us) ) -{ -public: - struct category_t - { - DBus_categoryDetails::categoryDetails_t details; - std::vector<DBus_categoryAttribute::categoryAttribute_t> attributes; - std::vector<DBus_categorySortOption::categorySortOption_t> sortOptions; - }; - - typedef ::DBus::Struct< ::DBus::Struct< uint32_t, std::vector< uint32_t >, ::DBus::Struct< uint8_t, ::DBus::Variant >, std::string, bool, std::string, ::DBus::Struct< uint8_t, ::DBus::Variant > >, std::vector< ::DBus::Struct< uint32_t, std::string, int32_t, std::vector< ::DBus::Struct< int32_t, std::string, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > >, std::vector< ::DBus::Struct< uint32_t, std::string > > > DBus_category_t; - - DBus_category() - { - DBus_categoryDetails details; - - m_category.details = details.get(); - m_category.attributes.clear(); - m_category.sortOptions.clear(); - } - - ~ DBus_category(){} - - void set(category_t value) - { - size_t index; - m_category.details = value.details; - m_category.attributes.clear(); - for (index=0;index<value.attributes.size();index++) - { - m_category.attributes.push_back(value.attributes.at(index)); - } - m_category.sortOptions.clear(); - for (index=0;index<value.sortOptions.size();index++) - { - m_category.sortOptions.push_back(value.sortOptions.at(index)); - } - } - - category_t get() - { - return(m_category); - } - - void setDBus(DBus_category_t value) - { - size_t index; - DBus_categoryDetails details; - DBus_categoryAttribute attrib; - DBus_categorySortOption sortOption; - - details.setDBus(value._1); - m_category.details = details.get(); - m_category.attributes.clear(); - for (index=0;index<value._2.size();index++) - { - attrib.setDBus(value._2.at(index)); - m_category.attributes.push_back(attrib.get()); - } - m_category.sortOptions.clear(); - for (index=0;index<value._3.size();index++) - { - sortOption.setDBus(value._3.at(index)); - m_category.sortOptions.push_back(sortOption.get()); - } - } - - DBus_category_t getDBus() - { - DBus_category_t return_value; - size_t index; - DBus_categoryDetails details; - DBus_categoryAttribute attrib; - DBus_categorySortOption sortOption; - - details.set(m_category.details); - return_value._1 = details.getDBus(); - return_value._2.clear(); - for(index=0;index<m_category.attributes.size();index++) - { - attrib.set(m_category.attributes.at(index)); - return_value._2.push_back(attrib.getDBus()); - } - return_value._3.clear(); - for(index=0;index<m_category.sortOptions.size();index++) - { - sortOption.set(m_category.sortOptions.at(index)); - return_value._3.push_back(sortOption.getDBus()); - } - return(return_value); - } - -private: - category_t m_category; -}; - -class DBus_categoryIdLevel : DBus_dataFormatConverter // (ub) -{ -public: - struct categoryIdLevel_t - { - categoryId_t id; - bool top_level; //false if predefined, true if created by plugin - }; - - typedef ::DBus::Struct< uint32_t, bool > DBus_categoryIdLevel_t; - - - DBus_categoryIdLevel(){ - m_categoryIdLevel.id = 0; - m_categoryIdLevel.top_level = true; - } - - ~DBus_categoryIdLevel(){} - - void set(categoryIdLevel_t value){ - m_categoryIdLevel.id = value.id; - m_categoryIdLevel.top_level = value.top_level; - } - - categoryIdLevel_t get(){ - return(m_categoryIdLevel); - } - - void setDBus(DBus_categoryIdLevel_t value){ - m_categoryIdLevel.id = value._1; - m_categoryIdLevel.top_level = value._2; - } - - DBus_categoryIdLevel_t getDBus(){ - DBus_categoryIdLevel_t return_value; - return_value._1 = m_categoryIdLevel.id; - return_value._2 = m_categoryIdLevel.top_level; - return(return_value); - } - -private: - categoryIdLevel_t m_categoryIdLevel; -}; - -class DBus_categoryReason : DBus_dataFormatConverter // (uq) -{ -public: - struct categoryReason_t - { - categoryId_t id; - ushort reason; //enum(ADDED,REMOVED,ATTR_ADDED,ATTR_MODIFIED,ATTR_REMOVED, ... ) - }; - - typedef ::DBus::Struct< uint32_t, uint16_t > DBus_categoryReason_t; - - - DBus_categoryReason(){ - m_categoryReason.id = 0; - m_categoryReason.reason = true; - } - - ~DBus_categoryReason(){} - - void set(categoryReason_t value){ - m_categoryReason.id = value.id; - m_categoryReason.reason = value.reason; - } - - categoryReason_t get(){ - return(m_categoryReason); - } - - void setDBus(DBus_categoryReason_t value){ - m_categoryReason.id = value._1; - m_categoryReason.reason = value._2; - } - - DBus_categoryReason_t getDBus(){ - DBus_categoryReason_t return_value; - return_value._1 = m_categoryReason.id; - return_value._2 = m_categoryReason.reason; - return(return_value); - } - -private: - categoryReason_t m_categoryReason; -}; - -class DBus_categoryIdName : DBus_categoryIdLevel // (usb) -{ -public: - - struct categoryIdName_t - { - DBus_categoryIdLevel::categoryIdLevel_t id; - std::string name; - }; - - typedef ::DBus::Struct< uint32_t, std::string, bool > DBus_categoryIdName_t; - - - DBus_categoryIdName(){ - m_categoryIdName = ""; - } - - ~DBus_categoryIdName(){} - - void set(categoryIdName_t value){ - DBus_categoryIdLevel::set(value.id); - m_categoryIdName = value.name; - } - - categoryIdName_t get(){ - categoryIdName_t return_value; - return_value.id = DBus_categoryIdLevel::get(); - return_value.name = m_categoryIdName; - return(return_value); - } - - void setDBus(DBus_categoryIdName_t value){ - DBus_categoryIdLevel::DBus_categoryIdLevel_t id; - id._1 = value._1; - id._2 = value._3; - DBus_categoryIdLevel::setDBus(id); - m_categoryIdName = value._2; - } - - DBus_categoryIdName_t getDBus(){ - DBus_categoryIdName_t return_value; - DBus_categoryIdLevel::DBus_categoryIdLevel_t id; - id = DBus_categoryIdLevel::getDBus(); - return_value._1 = id._1; - return_value._2 = m_categoryIdName; - return_value._3 = id._2; - return(return_value); - } - -private: - std::string m_categoryIdName; -}; - -class DBus_categoryRadius : DBus_dataFormatConverter // (uu) -{ -public: - struct categoryRadius_t - { - categoryId_t id; - uint radius; - }; - - typedef ::DBus::Struct< uint32_t, uint32_t > DBus_categoryRadius_t; - - DBus_categoryRadius(){ - m_categoryRadius.id = 0; - m_categoryRadius.radius = 0; - } - - ~DBus_categoryRadius(){} - - void set(categoryRadius_t value){ - m_categoryRadius.id = value.id; - m_categoryRadius.radius = value.radius; - } - - categoryRadius_t get(){ - return(m_categoryRadius); - } - - void setDBus(DBus_categoryRadius_t value){ - m_categoryRadius.id = value._1; - m_categoryRadius.radius = value._2; - } - - DBus_categoryRadius_t getDBus(){ - DBus_categoryRadius_t return_value; - return_value._1 = m_categoryRadius.id; - return_value._2 = m_categoryRadius.radius; - return(return_value); - } - -private: - categoryRadius_t m_categoryRadius; -}; - -class DBus_poiAttribute : DBus_dataFormatConverter // (ui(yv)) -{ -public: - struct poiAttribute_t - { - attributeId_t id; - int32_t type; - DBus_variantAttributeValue::variantAttributeValue_t value; - }; - - typedef ::DBus::Struct< uint32_t, int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > DBus_poiAttribute_t; - - - DBus_poiAttribute(){ - DBus_variantAttributeValue attributeValue; - - m_attribute.id = 0; - m_attribute.type = 0; - m_attribute.value = attributeValue.get(); - } - - ~DBus_poiAttribute(){} - - void set(poiAttribute_t value){ - DBus_variantAttributeValue attributeValue; - - m_attribute.id = value.id; - m_attribute.type = value.type; - attributeValue.set(value.value); - m_attribute.value = attributeValue.get(); - } - - poiAttribute_t get(){ - return(m_attribute); - } - - void setDBus(DBus_poiAttribute_t value){ - DBus_variantAttributeValue attributeValue; - - m_attribute.id = value._1; - m_attribute.type = value._2; - attributeValue.setDBus(value._3); - m_attribute.value = attributeValue.get(); - } - - DBus_poiAttribute_t getDBus(){ - DBus_poiAttribute_t return_value; - DBus_variantAttributeValue attributeValue; - - return_value._1 = m_attribute.id; - return_value._2 = m_attribute.type; - attributeValue.set(m_attribute.value); - return_value._3 = attributeValue.getDBus(); - return(return_value); - } - -private: - poiAttribute_t m_attribute; -}; - -class DBus_attributeDetails : DBus_poiAttribute //(uui(yv)ib) -{ -public: - struct attributeDetails_t - { - DBus_poiAttribute::poiAttribute_t attribute; - categoryId_t categoryId; //Category unique id - int32_t oper; //enum(INVALID,MORE_THAN,LESS_THAN,EQUAL, ....) - bool mandatory; //true if the attribute is mandatory for the search and false for optional - }; - - typedef ::DBus::Struct< uint32_t, uint32_t, int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant >, int32_t, bool > DBus_attributeDetails_t; - - - DBus_attributeDetails(){ - DBus_poiAttribute attribute; - - m_attributeDetails.attribute = attribute.get(); - m_attributeDetails.categoryId = 0; - m_attributeDetails.oper = 0; - m_attributeDetails.mandatory = true; - } - - ~DBus_attributeDetails(){} - - void set(attributeDetails_t value){ - DBus_poiAttribute::set(value.attribute); - m_attributeDetails.categoryId = value.categoryId; - m_attributeDetails.oper = value.oper; - m_attributeDetails.mandatory = value.mandatory; - } - - attributeDetails_t get(){ - attributeDetails_t return_value; - return_value.attribute = DBus_poiAttribute::get(); - return_value.categoryId = m_attributeDetails.categoryId; - return_value.oper = m_attributeDetails.oper; - return_value.mandatory = m_attributeDetails.mandatory; - return(return_value); - } - - void setDBus(DBus_attributeDetails_t value){ - DBus_poiAttribute::DBus_poiAttribute_t attribute; - attribute._1 = value._1; - attribute._2 = value._3; - attribute._3 = value._4; - DBus_poiAttribute::setDBus(attribute); - m_attributeDetails.categoryId = value._2; - m_attributeDetails.oper = value._5; - m_attributeDetails.mandatory = value._6; - } - - DBus_attributeDetails_t getDBus(){ - DBus_attributeDetails_t return_value; - DBus_poiAttribute::DBus_poiAttribute_t attribute; - attribute = DBus_poiAttribute::getDBus(); - return_value._1 = attribute._1; - return_value._2 = m_attributeDetails.categoryId; - return_value._3 = attribute._2; - return_value._4 = attribute._3; - return_value._5 = m_attributeDetails.oper; - return_value._6 = m_attributeDetails.mandatory; - return(return_value); - } - -private: - attributeDetails_t m_attributeDetails; -}; - -class DBus_geoCoordinate3D : DBus_dataFormatConverter //(ddi) -{ -public: - struct geoCoordinate3D_t - { - double latitude; - double longitude; - int altitude; - }; - typedef ::DBus::Struct< double, double, int32_t > DBus_geoCoordinate3D_t; - - DBus_geoCoordinate3D(){ - m_geoCoordinate3D.latitude = 48.85792; //by default center of Paris - m_geoCoordinate3D.longitude = 2.3383145; - m_geoCoordinate3D.altitude = 0; - } - - ~DBus_geoCoordinate3D(){} - - void set(geoCoordinate3D_t value){ - m_geoCoordinate3D.latitude = value.latitude; - m_geoCoordinate3D.longitude = value.longitude; - m_geoCoordinate3D.altitude = value.altitude; - } - - geoCoordinate3D_t get(){ - return(m_geoCoordinate3D); - } - - void setDBus(DBus_geoCoordinate3D_t value){ - m_geoCoordinate3D.latitude = value._1; - m_geoCoordinate3D.longitude = value._2; - m_geoCoordinate3D.altitude = value._3; - } - - DBus_geoCoordinate3D_t getDBus(){ - DBus_geoCoordinate3D_t return_value; - return_value._1 = m_geoCoordinate3D.latitude; - return_value._2 = m_geoCoordinate3D.longitude; - return_value._3 = m_geoCoordinate3D.altitude; - return(return_value); - } - -private: - geoCoordinate3D_t m_geoCoordinate3D; -}; - -class DBus_poiDetails : DBus_dataFormatConverter //(us(ddi)) -{ -public: - struct poiDetails_t - { - poiId_t id; - std::string name; - DBus_geoCoordinate3D::geoCoordinate3D_t location; - }; - typedef ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, int32_t > > DBus_poiDetails_t; - - DBus_poiDetails(){ - DBus_geoCoordinate3D loc; - - m_poiDetails.id = 0; - m_poiDetails.name = ""; - m_poiDetails.location = loc.get(); - } - - ~DBus_poiDetails(){} - - void set(poiDetails_t value){ - m_poiDetails.id = value.id; - m_poiDetails.name = value.name; - m_poiDetails.location = value.location; - } - - poiDetails_t get(){ - return(m_poiDetails); - } - - void setDBus(DBus_poiDetails_t value){ - DBus_geoCoordinate3D loc; - - m_poiDetails.id = value._1; - m_poiDetails.name = value._2; - loc.setDBus(value._3); - m_poiDetails.location = loc.get(); - } - - DBus_poiDetails_t getDBus(){ - DBus_geoCoordinate3D loc; - DBus_poiDetails_t return_value; - return_value._1 = m_poiDetails.id; - return_value._2 = m_poiDetails.name; - loc.set(m_poiDetails.location); - return_value._3 = loc.getDBus(); - return(return_value); - } - -private: - poiDetails_t m_poiDetails; -}; - -class DBus_searchResult : DBus_dataFormatConverter //(uuqa(ui(yv))) -{ -public: - struct searchResult_t - { - poiId_t id; - uint distance; - ushort route_status; - std::vector<DBus_poiAttribute::poiAttribute_t> attributes; - }; - - typedef ::DBus::Struct< uint32_t, uint32_t, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > DBus_searchResult_t; - - DBus_searchResult(){ - m_searchResult.id = 0; - m_searchResult.distance = 0; - m_searchResult.route_status = 0; - m_searchResult.attributes.clear(); - } - - ~DBus_searchResult(){ - } - - void set(searchResult_t value){ - size_t index; - m_searchResult.id = value.id; - m_searchResult.distance = value.distance; - m_searchResult.route_status = value.route_status; - m_searchResult.attributes.clear(); - for (index=0;index<value.attributes.size();index++) - { - m_searchResult.attributes.push_back(value.attributes.at(index)); - } - } - - searchResult_t get(){ - return(m_searchResult); - } - - void setDBus(DBus_searchResult_t value){ - size_t index; - DBus_poiAttribute attrib; - m_searchResult.id = value._1; - m_searchResult.distance = value._2; - m_searchResult.route_status = value._3; - m_searchResult.attributes.clear(); - for (index=0;index<value._4.size();index++) - { - attrib.setDBus(value._4.at(index)); - m_searchResult.attributes.push_back(attrib.get()); - } - } - - DBus_searchResult_t getDBus(){ - DBus_searchResult_t return_value; - size_t index; - DBus_poiAttribute attrib; - return_value._1 = m_searchResult.id; - return_value._2 = m_searchResult.distance; - return_value._3 = m_searchResult.route_status; - return_value._4.clear(); - for (index=0;index<m_searchResult.attributes.size();index++) - { - attrib.set(m_searchResult.attributes.at(index)); - return_value._4.push_back(attrib.getDBus()); - } - return(return_value); - } - -private: - searchResult_t m_searchResult; -}; - -class DBus_searchResultDetails : DBus_dataFormatConverter // ((us(ddi))aua(ui(yv))) -{ -public: - struct searchResultDetails_t - { - DBus_poiDetails::poiDetails_t details; - std::vector<categoryId_t> categories; - std::vector<DBus_poiAttribute::poiAttribute_t> attributes; - }; - - typedef ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, int32_t > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > DBus_searchResultDetails_t; - - - DBus_searchResultDetails(){ - DBus_poiDetails details; - - m_searchResultDetails.details = details.get(); - m_searchResultDetails.categories.clear(); - m_searchResultDetails.attributes.clear(); - } - - ~DBus_searchResultDetails(){} - - void set(searchResultDetails_t value){ - size_t index; - m_searchResultDetails.details = value.details; - m_searchResultDetails.categories.clear(); - for (index=0;index<value.categories.size();index++) - { - m_searchResultDetails.categories.push_back(value.categories.at(index)); - } - m_searchResultDetails.attributes.clear(); - for (index=0;index<value.attributes.size();index++) - { - m_searchResultDetails.attributes.push_back(value.attributes.at(index)); - } - } - - searchResultDetails_t get(){ - return(m_searchResultDetails); - } - - void setDBus(DBus_searchResultDetails_t value){ - size_t index; - DBus_poiDetails details; - DBus_poiAttribute attrib; - - details.setDBus(value._1); - m_searchResultDetails.details = details.get(); - m_searchResultDetails.categories.clear(); - for (index=0;index<value._2.size();index++) - { - m_searchResultDetails.categories.push_back(value._2.at(index)); - } - m_searchResultDetails.attributes.clear(); - for (index=0;index<value._3.size();index++) - { - attrib.setDBus(value._3.at(index)); - m_searchResultDetails.attributes.push_back(attrib.get()); - } - } - - DBus_searchResultDetails_t getDBus(){ - DBus_searchResultDetails_t return_value; - size_t index; - DBus_poiDetails details; - DBus_poiAttribute attrib; - - details.set(m_searchResultDetails.details); - return_value._1 = details.getDBus(); - return_value._2.clear(); - for (index=0;index<m_searchResultDetails.categories.size();index++) - { - return_value._2.push_back(m_searchResultDetails.categories.at(index)); - } - return_value._3.clear(); - for (index=0;index<m_searchResultDetails.attributes.size();index++) - { - attrib.set(m_searchResultDetails.attributes.at(index)); - return_value._3.push_back(attrib.getDBus()); - } - - return(return_value); - } - -private: - searchResultDetails_t m_searchResultDetails; -}; - -class DBus_poiCAMDetails : DBus_dataFormatConverter // (usq(ddi)qa(ui(yv))) -{ -public: - struct poiCAMDetails_t - { - poiId_t source_id; - std::string name; - categoryId_t category; - DBus_geoCoordinate3D::geoCoordinate3D_t location; - ushort distance; - std::vector<DBus_poiAttribute::poiAttribute_t> attributes; - }; - - typedef ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, int32_t >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > DBus_poiCAMDetails_t; - - DBus_poiCAMDetails(){ - DBus_geoCoordinate3D loc; - - m_poiCAMDetails.source_id = 0; - m_poiCAMDetails.name = ""; - m_poiCAMDetails.category = 0; - m_poiCAMDetails.location = loc.get(); - m_poiCAMDetails.distance = 0; - m_poiCAMDetails.attributes.clear(); - } - - ~DBus_poiCAMDetails(){} - - void set(poiCAMDetails_t value){ - size_t index; - - m_poiCAMDetails.source_id = value.source_id; - m_poiCAMDetails.name = value.name; - m_poiCAMDetails.category = value.category; - m_poiCAMDetails.location = value.location; - m_poiCAMDetails.distance = value.distance; - m_poiCAMDetails.attributes.clear(); - for (index=0;index<value.attributes.size();index++) - { - m_poiCAMDetails.attributes.push_back(value.attributes.at(index)); - } - } - - poiCAMDetails_t get(){ - return(m_poiCAMDetails); - } - - void setDBus(DBus_poiCAMDetails_t value){ - size_t index; - DBus_geoCoordinate3D loc; - DBus_poiAttribute attrib; - - m_poiCAMDetails.source_id = value._1; - m_poiCAMDetails.name = value._2; - m_poiCAMDetails.category = value._3; - loc.setDBus(value._4); - m_poiCAMDetails.location = loc.get(); - m_poiCAMDetails.distance = value._5, - m_poiCAMDetails.attributes.clear(); - for (index=0;index<value._6.size();index++) - { - attrib.setDBus(value._6.at(index)); - m_poiCAMDetails.attributes.push_back(attrib.get()); - } - } - - DBus_poiCAMDetails_t getDBus(){ - DBus_poiCAMDetails_t return_value; - size_t index; - DBus_geoCoordinate3D loc; - DBus_poiAttribute attrib; - - return_value._1 = m_poiCAMDetails.source_id; - return_value._2 = m_poiCAMDetails.name; - return_value._3 = m_poiCAMDetails.category; - loc.set(m_poiCAMDetails.location); - return_value._4 = loc.getDBus(); - return_value._5 = m_poiCAMDetails.distance; - return_value._6.clear(); - for (index=0;index<m_poiCAMDetails.attributes.size();index++) - { - attrib.set(m_poiCAMDetails.attributes.at(index)); - return_value._6.push_back(attrib.getDBus()); - } - return(return_value); - } - -private: - poiCAMDetails_t m_poiCAMDetails; -}; - -class DBus_CAMcategoryDetails : DBus_dataFormatConverter // (au(yv)ss(yv)) -{ -public: - struct CAMcategoryDetails_t - { - std::vector<categoryId_t> parents_id; - DBus_variantIcon::variantIcon_t icons; - std::string name; - std::string short_desc; - DBus_variantMedia::variantMedia_t media; - }; - - typedef ::DBus::Struct< std::vector< uint32_t >, ::DBus::Struct< uint8_t, ::DBus::Variant >, std::string, std::string, ::DBus::Struct< uint8_t, ::DBus::Variant > > DBus_CAMcategoryDetails_t; - - DBus_CAMcategoryDetails(){ - DBus_variantIcon icons; - DBus_variantMedia media; - - m_CAMcategoryDetails.parents_id.clear(); - m_CAMcategoryDetails.icons = icons.get(); - m_CAMcategoryDetails.name = ""; - m_CAMcategoryDetails.short_desc = ""; - m_CAMcategoryDetails.media = media.get(); - } - - ~DBus_CAMcategoryDetails(){} - - void set(CAMcategoryDetails_t value){ - size_t index; - - m_CAMcategoryDetails.parents_id.clear(); - for (index=0;index<value.parents_id.size();index++) - { - m_CAMcategoryDetails.parents_id.push_back(value.parents_id.at(index)); - } - m_CAMcategoryDetails.icons = value.icons; - m_CAMcategoryDetails.name = value.name; - m_CAMcategoryDetails.short_desc = value.short_desc; - m_CAMcategoryDetails.media = value.media; - } - - CAMcategoryDetails_t get(){ - return(m_CAMcategoryDetails); - } - - void setDBus(DBus_CAMcategoryDetails_t value){ - size_t index; - DBus_variantIcon icons; - DBus_variantMedia media; - - m_CAMcategoryDetails.parents_id.clear(); - for (index=0;index<value._1.size();index++) - { - m_CAMcategoryDetails.parents_id.push_back(value._1.at(index)); - } - - icons.setDBus(value._2); - m_CAMcategoryDetails.icons = icons.get(); - - m_CAMcategoryDetails.name = value._3; - m_CAMcategoryDetails.short_desc = value._4; - - media.setDBus(value._5); - m_CAMcategoryDetails.media = media.get(); - } - - DBus_CAMcategoryDetails_t getDBus(){ - DBus_CAMcategoryDetails_t return_value; - size_t index; - DBus_variantIcon icons; - DBus_variantMedia media; - - return_value._1.clear(); - for (index=0;index<m_CAMcategoryDetails.parents_id.size();index++) - { - return_value._1.push_back(m_CAMcategoryDetails.parents_id.at(index)); - } - - icons.set(m_CAMcategoryDetails.icons); - return_value._2 = icons.getDBus(); - return_value._3 = m_CAMcategoryDetails.name; - return_value._4 = m_CAMcategoryDetails.short_desc; - - media.set(m_CAMcategoryDetails.media); - return_value._5 = media.getDBus(); - return(return_value); - } - -private: - CAMcategoryDetails_t m_CAMcategoryDetails; -}; - -class DBus_CAMcategory : DBus_dataFormatConverter // ((au(yv)ss(yv))a(usia(is(yv)))a(us)) -->in this implementation, the variant data is string -{ -public: - struct CAMcategory_t //no class used into this public structure - { - DBus_CAMcategoryDetails::CAMcategoryDetails_t details; - std::vector<DBus_categoryAttribute::categoryAttribute_t> attributes; - std::vector<DBus_categorySortOption::categorySortOption_t> sortOptions; - }; - - typedef ::DBus::Struct< ::DBus::Struct< std::vector< uint32_t >, ::DBus::Struct< uint8_t, ::DBus::Variant >, std::string, std::string, ::DBus::Struct< uint8_t, ::DBus::Variant > >, std::vector< ::DBus::Struct< uint32_t, std::string, int32_t, std::vector< ::DBus::Struct< int32_t, std::string, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > >, std::vector< ::DBus::Struct< uint32_t, std::string > > > DBus_CAMcategory_t; - - DBus_CAMcategory(){ - DBus_CAMcategoryDetails details; - DBus_categoryAttribute attrib; - DBus_categorySortOption sortOption; - - m_CAMcategory.details = details.get(); - m_CAMcategory.attributes.clear(); - m_CAMcategory.sortOptions.clear(); - } - - ~DBus_CAMcategory(){} - - void set(CAMcategory_t value){ - size_t index; - m_CAMcategory.details = value.details; - m_CAMcategory.attributes.clear(); - for (index=0;index<value.attributes.size();index++) - { - m_CAMcategory.attributes.push_back(value.attributes.at(index)); - } - m_CAMcategory.sortOptions.clear(); - for (index=0;index<value.sortOptions.size();index++) - { - m_CAMcategory.sortOptions.push_back(value.sortOptions.at(index)); - } - } - - CAMcategory_t get(){ - return(m_CAMcategory); - } - - void setDBus(DBus_CAMcategory_t value){ - size_t index; - DBus_CAMcategoryDetails details; - DBus_categoryAttribute attrib; - DBus_categorySortOption sortOption; - - details.setDBus(value._1); - m_CAMcategory.details = details.get(); - m_CAMcategory.attributes.clear(); - for (index=0;index<value._2.size();index++) - { - attrib.setDBus(value._2.at(index)); - m_CAMcategory.attributes.push_back(attrib.get()); - } - m_CAMcategory.sortOptions.clear(); - for (index=0;index<value._3.size();index++) - { - sortOption.setDBus(value._3.at(index)); - m_CAMcategory.sortOptions.push_back(sortOption.get()); - } - } - - DBus_CAMcategory_t getDBus(){ - DBus_CAMcategory_t return_value; - size_t index; - DBus_CAMcategoryDetails details; - DBus_categoryAttribute attrib; - DBus_categorySortOption sortOption; - - details.set(m_CAMcategory.details); - return_value._1 = details.getDBus(); - return_value._2.clear(); - for(index=0;index<m_CAMcategory.attributes.size();index++) - { - attrib.set(m_CAMcategory.attributes.at(index)); - return_value._2.push_back(attrib.getDBus()); - } - return_value._3.clear(); - for(index=0;index<m_CAMcategory.sortOptions.size();index++) - { - sortOption.set(m_CAMcategory.sortOptions.at(index)); - return_value._3.push_back(sortOption.getDBus()); - } - return(return_value); - } - -private: - CAMcategory_t m_CAMcategory; -}; - -class DBus_CAMcategoryUpdate : DBus_dataFormatConverter // (ua(usia(is(yv)))a(us)) -{ -public: - struct CAMcategoryUpdate_t - { - categoryId_t unique_id; - std::vector<DBus_categoryAttribute::categoryAttribute_t> attributes; - std::vector<DBus_categorySortOption::categorySortOption_t> sortOptions; - }; - - typedef ::DBus::Struct< uint32_t, std::vector< ::DBus::Struct< uint32_t, std::string, int32_t, std::vector< ::DBus::Struct< int32_t, std::string, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > >, std::vector< ::DBus::Struct< uint32_t, std::string > > > DBus_CAMcategoryUpdate_t; - - DBus_CAMcategoryUpdate(){ - m_CAMcategoryUpdate.unique_id = 0; - m_CAMcategoryUpdate.attributes.clear(); - m_CAMcategoryUpdate.sortOptions.clear(); - } - - ~DBus_CAMcategoryUpdate(){} - - void set(CAMcategoryUpdate_t value){ - size_t index; - m_CAMcategoryUpdate.unique_id = value.unique_id; - m_CAMcategoryUpdate.attributes.clear(); - for (index=0;index<value.attributes.size();index++) - { - m_CAMcategoryUpdate.attributes.push_back(value.attributes.at(index)); - } - m_CAMcategoryUpdate.sortOptions.clear(); - for (index=0;index<value.sortOptions.size();index++) - { - m_CAMcategoryUpdate.sortOptions.push_back(value.sortOptions.at(index)); - } - } - - CAMcategoryUpdate_t get(){ - return(m_CAMcategoryUpdate); - } - - void setDBus(DBus_CAMcategoryUpdate_t value){ - size_t index; - DBus_categoryAttribute attrib; - DBus_categorySortOption sortOption; - - m_CAMcategoryUpdate.unique_id = value._1; - m_CAMcategoryUpdate.attributes.clear(); - for (index=0;index<value._2.size();index++) - { - attrib.setDBus(value._2.at(index)); - m_CAMcategoryUpdate.attributes.push_back(attrib.get()); - } - m_CAMcategoryUpdate.sortOptions.clear(); - for (index=0;index<value._3.size();index++) - { - sortOption.setDBus(value._3.at(index)); - m_CAMcategoryUpdate.sortOptions.push_back(sortOption.get()); - } - } - - DBus_CAMcategoryUpdate_t getDBus(){ - DBus_CAMcategoryUpdate_t return_value; - size_t index; - DBus_categoryAttribute attrib; - DBus_categorySortOption sortOption; - - return_value._1 = m_CAMcategoryUpdate.unique_id; - return_value._2.clear(); - for(index=0;index<m_CAMcategoryUpdate.attributes.size();index++) - { - attrib.set(m_CAMcategoryUpdate.attributes.at(index)); - return_value._2.push_back(attrib.getDBus()); - } - return_value._3.clear(); - for(index=0;index<m_CAMcategoryUpdate.sortOptions.size();index++) - { - sortOption.set(m_CAMcategoryUpdate.sortOptions.at(index)); - return_value._3.push_back(sortOption.getDBus()); - } - return(return_value); - } - -private: - CAMcategoryUpdate_t m_CAMcategoryUpdate; -}; - -class DBus_PoiAddedDetails : DBus_dataFormatConverter // (s(ddi)a(ui(yv))) -{ -public: - struct PoiAddedDetails_t - { - std::string name; - DBus_geoCoordinate3D::geoCoordinate3D_t location; - std::vector<DBus_poiAttribute::poiAttribute_t> attributes; - }; - - typedef ::DBus::Struct< std::string, ::DBus::Struct< double, double, int32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > DBus_PoiAddedDetails_t; - - - DBus_PoiAddedDetails(){ - DBus_geoCoordinate3D loc; - - m_PoiAddedDetails.name = ""; - m_PoiAddedDetails.location = loc.get(); - m_PoiAddedDetails.attributes.clear(); - } - - ~DBus_PoiAddedDetails(){} - - void set(PoiAddedDetails_t value){ - size_t index; - m_PoiAddedDetails.name = value.name; - m_PoiAddedDetails.location = value.location; - - m_PoiAddedDetails.attributes.clear(); - for (index=0;index<value.attributes.size();index++) - { - m_PoiAddedDetails.attributes.push_back(value.attributes.at(index)); - } - } - - PoiAddedDetails_t get(){ - return(m_PoiAddedDetails); - } - - void setDBus(DBus_PoiAddedDetails_t value){ - DBus_geoCoordinate3D loc; - size_t index; - DBus_poiAttribute attrib; - - m_PoiAddedDetails.name = value._1; - loc.setDBus(value._2); - m_PoiAddedDetails.location = loc.get(); - - m_PoiAddedDetails.attributes.clear(); - for (index=0;index<value._3.size();index++) - { - attrib.setDBus(value._3.at(index)); - m_PoiAddedDetails.attributes.push_back(attrib.get()); - } - } - - DBus_PoiAddedDetails_t getDBus(){ - DBus_PoiAddedDetails_t return_value; - size_t index; - DBus_poiAttribute attrib; - DBus_geoCoordinate3D loc; - - return_value._1 = m_PoiAddedDetails.name; - - loc.set(m_PoiAddedDetails.location); - return_value._2 = loc.getDBus(); - - return_value._3.clear(); - for (index=0;index<m_PoiAddedDetails.attributes.size();index++) - { - attrib.set(m_PoiAddedDetails.attributes.at(index)); - return_value._3.push_back(attrib.getDBus()); - } - - return(return_value); - } - -private: - PoiAddedDetails_t m_PoiAddedDetails; -}; - - -#endif |