diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2016-08-05 09:25:55 +0200 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2016-08-05 09:25:55 +0200 |
| commit | 7f214ad407820a8cee50b41642551a8ffe46c85d (patch) | |
| tree | c906e1a139fbe0b617281e58881073a161942885 /api | |
| parent | bccb55317b6bcabe63ccf89a81a82babeac6d0b5 (diff) | |
| download | poi-service-7f214ad407820a8cee50b41642551a8ffe46c85d.tar.gz | |
CommonAPI: navigationcore routing plugin OK
Diffstat (limited to 'api')
| -rw-r--r-- | api/franca/navigation/navigationcore/LocationInput.fidl | 2 | ||||
| -rw-r--r-- | api/franca/navigation/navigationcore/Routing.fidl | 86 |
2 files changed, 43 insertions, 45 deletions
diff --git a/api/franca/navigation/navigationcore/LocationInput.fidl b/api/franca/navigation/navigationcore/LocationInput.fidl index 1825fb4..c4d372e 100644 --- a/api/franca/navigation/navigationcore/LocationInput.fidl +++ b/api/franca/navigation/navigationcore/LocationInput.fidl @@ -58,7 +58,7 @@ interface LocationInput { Double doubleValue
String stringValue
Coordinate3D coordinate3DValue
- ByteBuffer internalData
+ UInt8[] internalData
}
map Address {
diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl index c05477a..246f748 100644 --- a/api/franca/navigation/navigationcore/Routing.fidl +++ b/api/franca/navigation/navigationcore/Routing.fidl @@ -68,11 +68,6 @@ interface Routing { DEPARTURE_DATE = 397
}
- enumeration RouteOverviewType extends Schedule {
- TOTAL_TIME = 398
- TOTAL_DISTANCE = 399
- }
-
enumeration PreferenceMode extends BasicEnum { //Base 0x0190
PROHIBIT = 400
AVOID = 401
@@ -95,10 +90,6 @@ interface Routing { RoutePreferenceSource source
}
-
- <**
- @description : struct generated for DBus argument SetRoutePreferences_conditionPreferenceList
- **>
struct ConditionPreference {
PreferenceMode mode
ConditionPreferenceSource source
@@ -118,11 +109,46 @@ interface Routing { ALTITUDE = 162
}
- enumeration WaypointElementType extends GeoLocalizedEnum {
- WAYPOINT_TYPE = 289
- LOCATION_INPUT = 17
+ struct IntermediatePoint extends Coordinate2D {
+ WayPointType type
+ }
+
+ enumeration WayPointType {
+ HARD_POINT = 290
+ SOFT_POINT = 291
+ }
+
+ enumeration RouteOverviewType extends Schedule {
+ TOTAL_TIME = 398
+ TOTAL_DISTANCE = 399
+ }
+
+ union RouteOverviewItem {
+ UInt32 uValue
}
+ map RouteOverview {
+ RouteOverviewType to RouteOverviewItem
+ }
+
+ enumeration WaypointElementType {
+ LATITUDE = 160
+ LONGITUDE = 161
+ ALTITUDE = 162
+ LOCATION_INPUT = 17
+ WAYPOINT_TYPE = 289
+ }
+
+ union WayPointItem {
+ Double coordinateValue
+ WayPointType waypointValue
+ UInt8[] metaData
+ }
+
+ map WayPoint {
+ WaypointElementType to WayPointItem
+ }
+
enumeration RouteSegmentType extends BasicEnum {
LINK_ID = 320 //Base 0x0140
START_LATITUDE = 321
@@ -144,50 +170,22 @@ interface Routing { HIGHWAY_EXIT = 116
SPEED = 164
}
-
- enumeration IntermediatePointType {
- HARD_POINT
- SOFT_POINT
- }
-
- union RouteOverviewItem {
- UInt32 uValue
- }
-
- struct IntermediatePoint extends Coordinate2D {
- IntermediatePointType type
- }
-
+
//TODO: Incomplete
union RouteSegmentItem {
Double doubleValue // LATITUDE, LONGITUDE, ALTITUDE
IntermediatePoint[] intermediatePoints
String stringValue // ROAD_NUMBER
- ByteBuffer linkId
+ UInt8[] linkId
Int32 int32Value
Int16 int16Value
UInt32 uInt32Value
}
-
- union WayPointItem {
- Double coordinateValue
- Int32 altitudeValue
- IntermediatePointType wayPointValue
- ByteBuffer metaData
- }
-
- map WayPoint {
- WaypointElementType to WayPointItem
- }
-
+
map RouteSegment {
RouteSegmentType to RouteSegmentItem
}
- map RouteOverview {
- RouteOverviewType to RouteOverviewItem
- }
-
<**
@description : struct generated for DBus argument SetBlockedRouteStretches_blockParameters
**>
@@ -772,7 +770,7 @@ interface Routing { <**
@description : percentage = progress status. Range [0:100]
**>
- Int8 percentage
+ UInt8 percentage
}
}
|