diff options
| author | <philippe colliot> | 2015-08-28 17:21:54 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2015-08-28 17:21:54 +0200 |
| commit | 08ec9c92501300a3de40ce31ed3467a4beadb2f7 (patch) | |
| tree | 853f43f6885b163cf36d78b6e470b33b74f4e4f6 /api | |
| parent | 1da40e28957f2dbda99a1586cdbe83140f283a59 (diff) | |
| download | poi-service-08ec9c92501300a3de40ce31ed3467a4beadb2f7.tar.gz | |
Some updates of franca files
Diffstat (limited to 'api')
| -rw-r--r-- | api/franca/.gitignore | 2 | ||||
| -rw-r--r-- | api/franca/navigation/Navigation.fdepl | 28 | ||||
| -rwxr-xr-x | api/franca/navigation/NavigationTypes.fidl | 34 | ||||
| -rwxr-xr-x | api/franca/navigation/mapviewer/MapViewerControlTypes.fidl | 155 | ||||
| -rwxr-xr-x | api/franca/navigation/navigationcore/Guidance.fidl | 6 | ||||
| -rwxr-xr-x | api/franca/navigation/navigationcore/GuidanceTypes.fidl | 184 | ||||
| -rwxr-xr-x | api/franca/navigation/navigationcore/LocationInputTypes.fidl | 54 | ||||
| -rwxr-xr-x | api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl | 143 | ||||
| -rw-r--r-- | api/franca/navigation/navigationcore/NavigationCore.fdepl | 18 | ||||
| -rwxr-xr-x | api/franca/navigation/navigationcore/Routing.fidl | 8 | ||||
| -rwxr-xr-x | api/franca/navigation/navigationcore/RoutingTypes.fidl | 188 | ||||
| -rwxr-xr-x | api/franca/navigation/poiservice/POIServiceTypes.fidl | 98 |
12 files changed, 555 insertions, 363 deletions
diff --git a/api/franca/.gitignore b/api/franca/.gitignore index 04dcda4..231215a 100644 --- a/api/franca/.gitignore +++ b/api/franca/.gitignore @@ -1,4 +1,4 @@ *.xml *.project - +src-gen/ diff --git a/api/franca/navigation/Navigation.fdepl b/api/franca/navigation/Navigation.fdepl new file mode 100644 index 0000000..b7961c9 --- /dev/null +++ b/api/franca/navigation/Navigation.fdepl @@ -0,0 +1,28 @@ +import "NavigationTypes.fidl" +import "navigationcore/MapMatchedPositionTypes.fidl" +specification NavigationSpec +{ + for enumerations { + EnumBackingType: {UseDefault, UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64} (default: UInt64); + } +} +specification NavigationCoreSpec +{ + for enumerations { + EnumBackingType: {UseDefault, UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64} (default: UInt64); + } +} + +define NavigationSpec for typeCollection org.genivi.navigation.NavigationTypes +{ + enumeration BasicEnum { + EnumBackingType = UInt64 + } +} + +define NavigationCoreSpec for typeCollection org.genivi.navigation.navigationcore.MapMatchedPositionTypes +{ + enumeration PositionStatus { + EnumBackingType = UInt16 + } +} diff --git a/api/franca/navigation/NavigationTypes.fidl b/api/franca/navigation/NavigationTypes.fidl index 6249495..0b3e176 100755 --- a/api/franca/navigation/NavigationTypes.fidl +++ b/api/franca/navigation/NavigationTypes.fidl @@ -40,19 +40,41 @@ typeCollection NavigationTypes { Coordinate2D bottomRight
}
+// for the time being, no use of extends for the enum, to be implemented later
enumeration BasicEnum {
- INVALID = "0x0000"
+ INVALID = 0
+ }
+
+ enumeration TimeStampedEnum extends BasicEnum {
+ TIMESTAMP = 16
+ }
+
+// enumeration GeoLocalizedEnum extends TimeStampedEnum {
+ enumeration GeoLocalizedEnum {
+ INVALID = 0
+ TIMESTAMP = 16
+ LATITUDE = 160
+ LONGITUDE = 161
+ ALTITUDE = 162
}
<** @description: Settings**>
enumeration Settings {
- INVALID = "0x0000"
- UNITS_OF_MEASUREMENT = "0x0030"
- LOCALE = "0x0025"
- TIME_FORMAT = "0x0003"
- COORDINATES_FORMAT = "0x0006"
+ INVALID = 0
+ UNITS_OF_MEASUREMENT = 48 //Base 0x0030
+ LOCALE = 37
+ TIME_FORMAT = 3
+ COORDINATES_FORMAT = 6
}
+ enumeration Units {
+ METER = 50
+ MILE = 51
+ KM = 52
+ YARD = 53
+ FOOT = 54
+ }
+
typedef Timestamp is UInt64
typedef Distance is Double
diff --git a/api/franca/navigation/mapviewer/MapViewerControlTypes.fidl b/api/franca/navigation/mapviewer/MapViewerControlTypes.fidl index ea33b1f..013ac1d 100755 --- a/api/franca/navigation/mapviewer/MapViewerControlTypes.fidl +++ b/api/franca/navigation/mapviewer/MapViewerControlTypes.fidl @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MPL-2.0
-// Copyright (C) 2014, PCA Peugeot Citroën, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
+// Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
// This Source Code Form is subject to the terms of the
// Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
// this file, you can obtain one at http://mozilla.org/MPL/2.0/.
@@ -10,25 +10,32 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl" typeCollection MapViewerControlTypes {
- enumeration MapViewType extends BasicEnum {
- MAIN_MAP = "0x0010"
- SPLIT_SCREEN = "0x0011"
-
- GUIDING_MAP
+// enumeration MapViewType extends BasicEnum { //Base 0x0010
+ enumeration MapViewType { //Base 0x0010
+ INVALID = 0
+ MAIN_MAP = 16
+ SPLIT_SCREEN = 17
+ GUIDING_MAP = 18
}
- enumeration MapScaleMode extends BasicEnum {
- AUTOMATIC = "0x0110"
- MANUAL = "0x0111"
- HYBRID = "0x0112"
+// enumeration MapScaleMode extends BasicEnum { //Base 0x0110
+ enumeration MapScaleMode { //Base 0x0110
+ INVALID = 0
+ AUTOMATIC = 272
+ MANUAL = 273
+ HYBRID = 274
}
- enumeration MapPerspective extends BasicEnum {
- PERSPECTIVE_2D = "0x0020"
- PERSPECTIVE_3D = "0x0021"
+// enumeration MapPerspective extends BasicEnum { //Base 0x0020
+ enumeration MapPerspective { //Base 0x0020
+ INVALID = 0
+ PERSPECTIVE_2D = 32
+ PERSPECTIVE_3D = 33
}
- enumeration MapObject extends BasicEnum {
+// enumeration MapObject extends BasicEnum {
+ enumeration MapObject {
+ INVALID = 0
// TODO: Check which elements are really visible
DET_POI //Points Of Interest
DET_TTI //TTI elements
@@ -46,10 +53,10 @@ typeCollection MapViewerControlTypes { DET_ROAD //Roads
DET_POLYGON //Polygons
DET_DESTINATION //Destination flag
- DET_MANOEUVRE_MARKER //Manoeuvre point markers
- DET_LANE_GUIDANCE_MARKER //Lange guidance point markers
+ DET_MANOEUVRE_MARKER //Maneuvre point markers
+ DET_LANE_GUIDANCE_MARKER //Lane guidance point markers
DET_ROUTE //Route
- DET_MANOEUVRE_ARROW //Manoeuvre arrows
+ DET_MANOEUVRE_ARROW //Maneuvre arrows
DET_TREKKING_TOUR //Trekking tours
DET_TTI_EDGE_HIGHLIGHTING //TTI highlighted edges
DET_CITY_MARKER //City markers
@@ -64,7 +71,7 @@ typeCollection MapViewerControlTypes { DET_DIRECTION_ARROW //Draw arrows that indicate driving or walking direction.
DET_CITY_BUILDINGS //Render city buildings.
DET_FPS_DISPLAY //Measure and display frames per second.
- DET_CROSSHAIR //Display crosshair.
+ DET_CROSSHAIR //Display cross-hair.
DET_DEVDROP_BANNER //Enables drawing of a banner. The banner indicates that the current version is a developer's version. The banner is rendered across the display.
DET_FRAME_AROUND_MAP //a frame is rendered around the map.
DET_CORONA //a corona is drawn around the earth.
@@ -82,27 +89,35 @@ typeCollection MapViewerControlTypes { DET_STENCIL
}
- enumeration PanAction extends BasicEnum {
- PAN_START = "0x0100"
- PAN_TO = "0x0101"
- PAN_END = "0x0102"
+// enumeration PanAction extends BasicEnum { //Base 0x0100
+ enumeration PanAction { //Base 0x0100
+ INVALID = 0
+ PAN_START = 256
+ PAN_TO = 257
+ PAN_END = 258
}
- enumeration Visibility extends BasicEnum {
- VISIBLE = "0x0043"
- INVISIBLE = "0x0044"
- FROZEN = "0x0045"
+// enumeration Visibility extends BasicEnum { //Base 0x0040
+ enumeration Visibility { //Base 0x0040
+ INVALID = 0
+ VISIBLE = 67
+ INVISIBLE = 68
+ FROZEN = 69
}
- enumeration Level extends BasicEnum {
- LEVEL_1 = "0x0050"
- LEVEL_2 = "0x0051"
- LEVEL_3 = "0x0052"
- LEVEL_4 = "0x0053"
- LEVEL_5 = "0x0054"
+// enumeration Level extends BasicEnum { //Base 0x0050
+ enumeration Level { //Base 0x0050
+ INVALID = 0
+ LEVEL_1 = 80
+ LEVEL_2 = 81
+ LEVEL_3 = 82
+ LEVEL_4 = 83
+ LEVEL_5 = 84
}
- enumeration MapTheme extends BasicEnum {
+// enumeration MapTheme extends BasicEnum {
+ enumeration MapTheme {
+ INVALID = 0
THEME_BMW_CLASSIC_DAY
THEME_BMW_CLASSIC_NIGHT
THEME_BMW_CLASSIC_TRAFFIC_DAY
@@ -146,45 +161,51 @@ typeCollection MapViewerControlTypes { MapObject to Boolean
}
- enumeration MapScaleUnit extends BasicEnum {
- METER = "0x0032"
- MILE = "0x0033"
- KM = "0x0034"
- YARD = "0x0035"
- FOOT = "0x0036"
+// enumeration MapScaleUnit extends BasicEnum { //Base 0x0030
+ enumeration MapScaleUnit { //Base 0x0030
+ INVALID = 0
+ METER = 50
+ MILE = 51
+ KM = 52
+ YARD = 53
+ FOOT = 54
}
- enumeration MapScaleType extends BasicEnum {
- MIN = "0x0040"
- MAX = "0x0041"
- MID = "0x0042"
+// enumeration MapScaleType extends BasicEnum { //Base 0x0040
+ enumeration MapScaleType { //Base 0x0040
+ INVALID = 0
+ MIN = 64
+ MAX = 65
+ MID = 66
}
- enumeration SelectableMapType extends BasicEnum {
- MET_POI = "2" //POI.
- MET_POLYGON = "3" //Polygons.
- MET_EDGE = "4" //All edges except roads. E.g. railways rivers ferries.
- MET_ROAD = "5" //Road edges.
- MET_ROAD_ICON = "6" //Road icons.
- MET_TTI_ICON = "7" //TTI icons.
- MET_TTI_EDGE = "8" //TTI edge [Not yet supported].
- MET_CITY_MARKER = "9" //City names and city markers.
- MET_ROUTE = "10" //Tours.
- MET_TREKKING_ROUTE = "11" //Trekking tours.
- MET_POSITION = "12" //Position.
- MET_LANDMARK = "13" //Landmarks.
- MET_DESTINATION = "14" //Destinations.
- MET_FAVORITE = "15" //Favorites.
- MET_PICTURE = "16" //Picture.
- MET_GENERIC_MARKER = "17" //Generic markers like weather markers.
+// enumeration SelectableMapType extends BasicEnum {
+ enumeration SelectableMapType {
+ INVALID = 0
+ MET_POI = 2 //POI.
+ MET_POLYGON = 3 //Polygons.
+ MET_EDGE = 4 //All edges except roads. E.g. railways rivers ferries.
+ MET_ROAD = 5 //Road edges.
+ MET_ROAD_ICON = 6 //Road icons.
+ MET_TTI_ICON = 7 //TTI icons.
+ MET_TTI_EDGE = 8 //TTI edge [Not yet supported].
+ MET_CITY_MARKER = 9 //City names and city markers.
+ MET_ROUTE = 10 //Tours.
+ MET_TREKKING_ROUTE = 11 //Trekking tours.
+ MET_POSITION = 12 //Position.
+ MET_LANDMARK = 13 //Landmarks.
+ MET_DESTINATION = 14 //Destinations.
+ MET_FAVORITE = 15 //Favorites.
+ MET_PICTURE = 16 //Picture.
+ MET_GENERIC_MARKER = 17 //Generic markers like weather markers.
- CUSTOM_ELEMENT = "0x0120"
- CURRENT_POSITION = "0x0121"
- WAYPOINT = "0x0122"
- POI = "0x0123"
- TRAFFIC_INCIDENT = "0x0124"
- ROUTE = "0x0125"
- GEOCOORDINATES = "0x0126"
+ CUSTOM_ELEMENT = 288 //Base 0x0120
+ CURRENT_POSITION = 289
+ WAYPOINT = 290
+ POI = 291
+ TRAFFIC_INCIDENT = 292
+ ROUTE = 293
+ GEOCOORDINATES = 294
}
<**
diff --git a/api/franca/navigation/navigationcore/Guidance.fidl b/api/franca/navigation/navigationcore/Guidance.fidl index 54044c0..fe4677f 100755 --- a/api/franca/navigation/navigationcore/Guidance.fidl +++ b/api/franca/navigation/navigationcore/Guidance.fidl @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MPL-2.0
-// Copyright (C) 2014, PCA Peugeot Citroën, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
+// Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
// This Source Code Form is subject to the terms of the
// Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
// this file, you can obtain one at http://mozilla.org/MPL/2.0/.
@@ -102,7 +102,7 @@ interface Guidance { <**
@description : maneuver = enum(INVALID,CRUISE,MANEUVER_APPEARED,PRE_ADVICE,ADVICE,PASSED, ... )
**>
- ManueverPhase maneuver
+ ManeuverPhase maneuver
}
}
@@ -319,7 +319,7 @@ interface Guidance { <**
@description : maneuver = enum(INVALID,CRUISE,MANEUVER_APPEARED,PRE_ADVICE,ADVICE,PASSED, ... )
**>
- ManueverPhase maneuver
+ ManeuverPhase maneuver
}
}
diff --git a/api/franca/navigation/navigationcore/GuidanceTypes.fidl b/api/franca/navigation/navigationcore/GuidanceTypes.fidl index 62a930b..be47331 100755 --- a/api/franca/navigation/navigationcore/GuidanceTypes.fidl +++ b/api/franca/navigation/navigationcore/GuidanceTypes.fidl @@ -1,6 +1,6 @@ /*
SPDX-License-Identifier: MPL-2.0
-Copyright (C) 2014, PCA Peugeot Citroën, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
+Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
This Source Code Form is subject to the terms of the
Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
this file, you can obtain one at http://mozilla.org/MPL/2.0/.
@@ -11,103 +11,125 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl" typeCollection GuidanceTypes {
- enumeration ManueverPhase extends BasicEnum {
- CRUISE = "0x0050"
- MANEUVER_APPEARED = "0x0051"
- PRE_ADVICE = "0x0052"
- ADVICE = "0x0053"
- PASSED = "0x0054"
+// enumeration Side extends BasicEnum {
+ enumeration Side {
+ INVALID = 0
+ LEFT = 128
+ RIGHT = 131
+ NOT_AVAILABLE = 2
}
- enumeration Side extends BasicEnum {
- LEFT = "0x0080"
- RIGHT = "0x0083"
- NOT_AVAILABLE = "0x0002"
- }
-
- enumeration RoadProperty extends BasicEnum {
+// enumeration RoadProperty extends BasicEnum {
+ enumeration RoadProperty {
+ INVALID = 0
}
- enumeration ManeuverType extends BasicEnum {
- STRAIGHT_ON = "0x0070"
- TURN = "0x0078"
- CROSSROAD = "0x0071"
- ROUNDABOUT = "0x0072"
- HIGHWAY_ENTER = "0x0073"
- HIGHWAY_EXIT = "0x0074"
- BIFURCATION = "0x0079"
- HIGHWAY_CHANGE_LANE = "0x0075"
- DESTINATION = "0x0076"
- WAYPOINT = "0x0077"
- }
-
- enumeration ManeuverDirectionType extends BasicEnum {
- LENGTH = "0x0031"
- DIRECTION = "0x0240"
- EXIT_NUMBER = "0x0241"
- ROAD_FORM = "0x0242"
- LANE_INFO = "0x0243"
- }
-
- enumeration LaneType extends BasicEnum {
- LANE_INFO_BITMASK_STRAIGHT = "0x0001"
- LANE_INFO_BITMASK_SLIGHTRIGHT = "0x0002"
- LANE_INFO_BITMASK_RIGHT = "0x0004"
- LANE_INFO_BITMASK_SHARPRIGHT = "0x0008"
- LANE_INFO_BITMASK_RIGHTUTURN = "0x0010"
- LANE_INFO_BITMASK_SLIGHTLEFT = "0x0020"
- LANE_INFO_BITMASK_LEFT = "0x0040"
- LANE_INFO_BITMASK_SHARPLEFT = "0x0080"
- LANE_INFO_BITMASK_LEFTUTURN = "0x1000"
+// enumeration LaneType extends BasicEnum {
+ enumeration LaneType {
+ INVALID = 0
+ LANE_INFO_BITMASK_STRAIGHT = 1
+ LANE_INFO_BITMASK_SLIGHTRIGHT = 2
+ LANE_INFO_BITMASK_RIGHT = 4
+ LANE_INFO_BITMASK_SHARPRIGHT = 8
+ LANE_INFO_BITMASK_RIGHTUTURN = 16
+ LANE_INFO_BITMASK_SLIGHTLEFT = 32
+ LANE_INFO_BITMASK_LEFT = 64
+ LANE_INFO_BITMASK_SHARPLEFT = 128
+ LANE_INFO_BITMASK_LEFTUTURN = 256
}
- enumeration LaneDivider extends BasicEnum {
- DIVIDER_UNDEFINED = "0x0250"
- DIVIDER_INTERRUPTEDLONG = "0x0251"
- DIVIDER_INTERRUPTEDSHORT = "0x0252"
- DIVIDER_SOLIDSINGLE = "0x0253"
- DIVIDER_SOLIDDOUBLE = "0x0254"
- DIVIDER_SOLIDINTERRUPTED = "0x0255"
- DIVIDER_INTERRUPTEDSOLID = "0x0256"
+// enumeration PromptMode extends BasicEnum { //Base 0x0040
+ enumeration PromptMode { //Base 0x0040
+ INVALID = 0
+ DISABLED_PROMPT = 65
+ AUTOMATIC_PROMPT = 66
+ MANUAL_PROMPT = 67
}
-
- enumeration CalculationMode extends BasicEnum {
- ALL_MANUAL = "0x0090"
- ALL_AUTOMATIC = "0x0091"
- TRAFFIC_MANUAL = "0x0092"
- OFF_ROUTE_MANUAL = "0x0093"
+
+// enumeration ManeuverPhase extends BasicEnum { //Base 0x0050
+ enumeration ManeuverPhase { //Base 0x0050
+ INVALID = 0
+ CRUISE = 80
+ MANEUVER_APPEARED = 81
+ PRE_ADVICE = 82
+ ADVICE = 83
+ PASSED = 84
}
- enumeration GuidanceStatus extends BasicEnum {
- ACTIVE = "0x0060"
- INACTIVE = "0x0061"
+// enumeration GuidanceStatus extends BasicEnum { //Base 0x0060
+ enumeration GuidanceStatus{ //Base 0x0060
+ INVALID = 0
+ ACTIVE = 96
+ INACTIVE = 97
}
- enumeration PromptMode extends BasicEnum {
- DISABLED_PROMPT = "0x0041"
- AUTOMATIC_PROMPT = "0x0042"
- MANUAL_PROMPT = "0x0043"
+// enumeration ManeuverType extends BasicEnum { //Base 0x0070
+ enumeration ManeuverType { //Base 0x0070
+ INVALID = 0
+ STRAIGHT_ON = 112
+ CROSSROAD = 113
+ ROUNDABOUT = 114
+ HIGHWAY_ENTER = 115
+ HIGHWAY_EXIT = 116
+ FOLLOW_SPECIFIC_LANE = 117
+ DESTINATION = 118
+ WAYPOINT = 119
+ TURN = 120
+ BIFURCATION = 121
}
- enumeration RouteChangedCause extends BasicEnum {
- TRAFFIC = "0x0210"
- OFF_ROUTE = "0x0211"
- MANUAL = "0x0212"
+// enumeration ManeuverDirection extends BasicEnum { //Base 0x0080
+ enumeration ManeuverDirection { //Base 0x0080
+ INVALID = 0
+ LEFT = 128
+ SLIGHT_LEFT = 129
+ HARD_LEFT = 130
+ RIGHT = 131
+ SLIGHT_RIGHT = 132
+ HARD_RIGHT = 133
+ UTURN_RIGHT = 134
+ UTURN_LEFT = 135
}
- enumeration ManeuverDirection extends BasicEnum {
- STRAIGHT_ON = "0x0070"
- LEFT = "0x0080"
- SLIGHT_LEFT = "0x0081"
- HARD_LEFT = "0x0082"
- RIGHT = "0x0083"
- SLIGHT_RIGHT = "0x0084"
- HARD_RIGHT = "0x0085"
- UTURN_RIGHT = "0x0086"
- UTURN_LEFT = "0x0087"
+// enumeration CalculationMode extends BasicEnum { //Base 0x0090
+ enumeration CalculationMode { //Base 0x0090
+ INVALID = 0
+ ALL_MANUAL = 144
+ ALL_AUTOMATIC = 145
+ TRAFFIC_MANUAL = 146
+ OFF_ROUTE_MANUAL = 147
}
-
+
+// enumeration RouteChangedCause extends BasicEnum { //Base 0x0210
+ enumeration RouteChangedCause { //Base 0x0210
+ INVALID = 0
+ TRAFFIC = 528
+ OFF_ROUTE = 529
+ MANUAL = 530
+ }
+
+// enumeration ManeuverDirectionType extends BasicEnum { //Base 0x0240
+ enumeration ManeuverDirectionType{ //Base 0x0240
+ INVALID = 0
+ DIRECTION = 576
+ EXIT_NUMBER = 577
+ ROAD_FORM = 578
+ LANE_INFO = 579
+ }
+
+// enumeration LaneDivider extends BasicEnum { //Base 0x0250
+ enumeration LaneDivider { //Base 0x0250
+ INVALID = 0
+ DIVIDER_UNDEFINED = 592
+ DIVIDER_INTERRUPTEDLONG = 593
+ DIVIDER_INTERRUPTEDSHORT = 594
+ DIVIDER_SOLIDSINGLE = 595
+ DIVIDER_SOLIDDOUBLE = 596
+ DIVIDER_SOLIDINTERRUPTED = 597
+ DIVIDER_INTERRUPTEDSOLID = 598
+ }
+
struct tWaypointStruct {
UInt32 waypointOffset
UInt32 travelTime
diff --git a/api/franca/navigation/navigationcore/LocationInputTypes.fidl b/api/franca/navigation/navigationcore/LocationInputTypes.fidl index 4c88bb9..017ee6d 100755 --- a/api/franca/navigation/navigationcore/LocationInputTypes.fidl +++ b/api/franca/navigation/navigationcore/LocationInputTypes.fidl @@ -11,35 +11,39 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl" typeCollection LocationInputTypes {
- enumeration AddressAttribute extends BasicEnum {
- LATITUDE = "0x00a0"
- LONGITUDE = "0x00a1"
- ALTITUDE = "0x00a2"
- FULL_ADDRESS = "0x00b2"
- COUNTRY = "0x00a6"
- STATE = "0x00a7"
- CITY = "0x00a8"
- ZIPCODE = "0x00a9"
- STREET = "0x00aa"
- HOUSENUMBER = "0x00ab"
- CROSSING = "0x00ac"
- DISTRICT = "0x00ad"
- PHONENUMBER = "0x00ae"
- POINAME = "0x00af"
- TOWNCENTER = "0x00b0"
- INTERNAL_DATA = "0x00FF"
+ enumeration AddressAttribute extends GeoLocalizedEnum { //Base 0x00a0
+ COUNTRY = 166
+ STATE = 167
+ CITY = 168
+ ZIPCODE = 169
+ STREET = 170
+ HOUSENUMBER = 171
+ CROSSING = 172
+ DISTRICT = 173
+ PHONENUMBER = 174
+ POINAME = 175
+ TOWNCENTER = 176
+ LOCATION_INPUT = 177
+ FULL_ADDRESS = 178
+ COUNTRYCODE = 179
+ HOUSENAME = 180
+ POSTAL_CODE = 181
}
- enumeration ValidationType extends BasicEnum {
- OK = "0x00d0"
- UNKNOWN = "0x00d1"
- AMBIGUOUS = "0x00d2"
- INCONSISTENT = "0x00d3"
+// enumeration SearchStatus extends BasicEnum {
+ enumeration SearchStatus { //Base 0x00c0
+ INVALID = 0
+ SEARCHING = 193
+ FINISHED = 194
}
- enumeration SearchStatus extends BasicEnum {
- SEARCHING = "0x00c1"
- FINISHED = "0x00c2"
+// enumeration ValidationType extends BasicEnum { //Base 0x00d0
+ enumeration ValidationType { //Base 0x00d0
+ INVALID = 0
+ OK = 208
+ UNKNOWN = 209
+ AMBIGUOUS = 210
+ INCONSISTENT = 211
}
array AddressAttributeList of AddressAttribute
diff --git a/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl b/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl index 678767f..a14215c 100755 --- a/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl +++ b/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl @@ -1,6 +1,6 @@ /*
SPDX-License-Identifier: MPL-2.0
-Copyright (C) 2014, PCA Peugeot Citroën, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
+Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
This Source Code Form is subject to the terms of the
Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
this file, you can obtain one at http://mozilla.org/MPL/2.0/.
@@ -12,46 +12,95 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl" typeCollection MapMatchedPositionTypes {
- enumeration SimulationStatus extends BasicEnum {
- SIMULATION_STATUS_NO_SIMULATION = "0x0220"
- SIMULATION_STATUS_RUNNING = "0x0221"
- SIMULATION_STATUS_PAUSED = "0x0222"
- SIMULATION_STATUS_FIXED_POSITION = "0x0223"
+// enumeration PositionItemKey extends PositionStatus { //Base 0x00a0
+ enumeration PositionItemKey { //Base 0x00a0
+ INVALID = 0
+ TIMESTAMP = 16
+ LATITUDE = 160
+ LONGITUDE = 161
+ ALTITUDE = 162
+ GNSS_FIX_STATUS = 224
+ DR_STATUS = 225
+ MM_STATUS = 226
+ SIMULATION_MODE = 227
+ HEADING = 163
+ SPEED = 164
+ CLIMB = 165
}
- enumeration PositionStatus extends BasicEnum {
- TIMESTAMP = "0x0010"
- GNSS_FIX_STATUS = "0x00e0"
- DR_STATUS = "0x00e1"
- MM_STATUS = "0x00e2"
- SIMULATION_MODE = "0x00e3"
+// enumeration AddressItemKey extends TimeStampedEnum {
+ enumeration AddressItemKey {
+ INVALID = 0
+ TIMESTAMP = 16
+ TIMEZONE_OFFSET = 17
+ DAYLIGHT_OFFSET = 18
+ COUNTRY = 166 //Base 0x00a0
+ STATE = 167
+ CITY = 168
+ ZIPCODE = 169
+ STREET = 170
+ HOUSENUMBER = 171
+ CROSSING = 172
+ DISTRICT = 173
+ PHONENUMBER = 174
+ POINAME = 175
+ TOWNCENTER = 176
+ LOCATION_INPUT = 177
+ FULL_ADDRESS = 178
+ COUNTRYCODE = 179
+ HOUSENAME = 180
+ POSTAL_CODE = 181
}
-
- enumeration PositionItemKey extends PositionStatus {
- LATITUDE = "0x00a0"
- LONGITUDE = "0x00a1"
- ALTITUDE = "0x00a2"
- HEADING = "0x00a3"
- SPEED = "0x00a4"
- CLIMB = "0x00a5"
+
+// enumeration PositionStatus extends GeoLocalizedEnum { //Base 0x00e0
+ enumeration PositionStatus { //Base 0x00e0
+ INVALID = 0
+ TIMESTAMP = 16
+ LATITUDE = 160
+ LONGITUDE = 161
+ ALTITUDE = 162
+ GNSS_FIX_STATUS = 224
+ DR_STATUS = 225
+ MM_STATUS = 226
+ SIMULATION_MODE = 227
}
- enumeration GnnsFixStatus extends BasicEnum {
- NO_FIX = "0x0100"
- TIME_FIX = "0x0101"
- FIX_2D = "0x0102"
- FIX_3D = "0x0103"
- }
-
- enumeration MatchMode {
- INVALID = "0x00f0"
- ON_ROAD = "0x00f1"
- OFF_ROAD = "0x00f2"
- ON_FERRY = "0x00f3"
- IN_TUNNEL = "0x00f4"
- ON_CARPARK = "0x00f5"
+ enumeration MatchMode { //Base 0x00f0
+ MATCH_TYPE = 240
+ ON_ROAD = 241
+ OFF_ROAD = 242
+ ON_FERRY = 243
+ IN_TUNNEL = 244
+ ON_CARPARK = 245
}
+// enumeration GnnsFixStatus extends BasicEnum { //Base 0x0100
+ enumeration GnnsFixStatus { //Base 0x0100
+ INVALID = 0
+ NO_FIX = 256
+ TIME_FIX = 257
+ FIX_2D = 258 //2D_FIX is prohibited
+ FIX_3D = 259
+ }
+
+// enumeration PositionOnSegmentKey extends TimeStampedEnum { //Base 0x0110
+ enumeration PositionOnSegmentKey { //Base 0x0110
+ INVALID = 0
+ TIMESTAMP = 16
+ SEGMENT_ID = 272
+ DIRECTION_ON_SEGMENT = 274
+ DISTANCE_ON_SEGMENT = 275
+ }
+
+// enumeration SimulationStatus extends BasicEnum { //Base 0x0220
+ enumeration SimulationStatus { //Base 0x0220
+ INVALID = 0
+ SIMULATION_STATUS_NO_SIMULATION = 544
+ SIMULATION_STATUS_RUNNING = 545
+ SIMULATION_STATUS_PAUSED = 546
+ SIMULATION_STATUS_FIXED_POSITION = 547
+ }
+
union PositionItemValue {
Timestamp timestamp
Boolean status
@@ -64,23 +113,6 @@ typeCollection MapMatchedPositionTypes { PositionItemKey to PositionItemValue
}
- enumeration AddressItemKey extends BasicEnum {
- TIMESTAMP = "0x0010"
- COUNTRY = "0x00a6"
- COUNTRYCODE = "0x00b3"
- STATE = "0x00a7"
- CITY = "0x00a8"
- STREET = "0x00aa"
- ROAD_NUMBER = "0x014e"
- HOUSENUMBER = "0x00ab"
- HOUSENAME = "0x00b4"
- CROSSING = "0x00ac"
- DISTRICT = "0x00ad"
- TIMEZONE_OFFSET = "0x0011"
- DAYLIGHT_OFFSET = "0x0012"
- MATCH_TYPE = "0x00f0"
- }
-
union AddressItemValue {
String addressField
Int16 offset
@@ -92,13 +124,6 @@ typeCollection MapMatchedPositionTypes { AddressItemKey to AddressItemValue
}
- enumeration PositionOnSegmentKey extends BasicEnum {
- TIMESTAMP = "0x0010"
- SEGMENT_ID = "0x0110"
- DIRECTION_ON_SEGMENT = "0x0112"
- DISTANCE_ON_SEGMENT = "0x0113"
- }
-
union PositionOnSegmentValue {
Boolean directionOnSegment
Distance distanceOnSegment
@@ -113,7 +138,7 @@ typeCollection MapMatchedPositionTypes { union PositionStatusValue {
Boolean statusValue
GnnsFixStatus fixStatus
- Timestamp timestanp
+ Timestamp timestamp
}
map PositionStatusDict {
diff --git a/api/franca/navigation/navigationcore/NavigationCore.fdepl b/api/franca/navigation/navigationcore/NavigationCore.fdepl new file mode 100644 index 0000000..a9c0475 --- /dev/null +++ b/api/franca/navigation/navigationcore/NavigationCore.fdepl @@ -0,0 +1,18 @@ +import "MapMatchedPositionTypes.fidl" +import "LocationInputTypes.fidl" +import "GuidanceTypes.fidl" +import "RoutingTypes.fidl" + +specification NavigationCoreSpec +{ + for enumerations { + EnumBackingType: {UseDefault, UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64} (default: UInt64); + } +} + +define NavigationCoreSpec for typeCollection org.genivi.navigation.navigationcore.MapMatchedPositionTypes +{ + enumeration PositionStatus { + EnumBackingType = UInt16 + } +} diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl index 19d3918..54b30c8 100755 --- a/api/franca/navigation/navigationcore/Routing.fidl +++ b/api/franca/navigation/navigationcore/Routing.fidl @@ -1,6 +1,6 @@ /*
SPDX-License-Identifier: MPL-2.0
-Copyright (C) 2014, PCA Peugeot Citroën, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
+Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
This Source Code Form is subject to the terms of the
Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
this file, you can obtain one at http://mozilla.org/MPL/2.0/.
@@ -144,7 +144,7 @@ interface Routing { RoutePreference[] roadPreferenceList
- ConiditionPreference[] conditionPreferenceList
+ ConditionPreference[] conditionPreferenceList
}
}
@@ -166,7 +166,7 @@ interface Routing { }
out {
RoutePreference[] roadPreferenceList
- ConiditionPreference[] conditionPreferenceList
+ ConditionPreference[] conditionPreferenceList
}
}
@@ -176,7 +176,7 @@ interface Routing { method getSupportedRoutePreferences {
out {
RoutePreference[] routePreferencesList
- ConiditionPreference[] conditionPreferenceList
+ ConditionPreference[] conditionPreferenceList
}
}
diff --git a/api/franca/navigation/navigationcore/RoutingTypes.fidl b/api/franca/navigation/navigationcore/RoutingTypes.fidl index a60dbee..daa43b4 100755 --- a/api/franca/navigation/navigationcore/RoutingTypes.fidl +++ b/api/franca/navigation/navigationcore/RoutingTypes.fidl @@ -1,6 +1,6 @@ /*
SPDX-License-Identifier: MPL-2.0
-Copyright (C) 2014, PCA Peugeot Citroën, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
+Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
This Source Code Form is subject to the terms of the
Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
this file, you can obtain one at http://mozilla.org/MPL/2.0/.
@@ -12,66 +12,87 @@ import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl" typeCollection RoutingTypes {
- enumeration CostModel extends BasicEnum {
- FASTEST = "0x0160"
- SHORTEST = "0x0161"
- ECOLOGICAL = "0x0162"
- SCENIC = "0x0163"
- EASY = "0x0164"
- OFF_ROAD = "0x0165"
- BALANCED = "0x0166"
- CHEAPEST = "0x0167"
- }
-
-
- enumeration PreferenceMode extends BasicEnum {
- PROHIBIT = "0x0190"
- AVOID = "0x0191"
- USE = "0x0192"
- PREFER = "0x0193"
- IGNORE = "0x0194"
- }
-
- enumeration RoutePreferenceSource extends BasicEnum {
- FERRY = "0x0170"
- TOLL_ROADS = "0x0171"
- TUNNELS = "0x0172"
- HIGHWAYS_MOTORWAYS = "0x0173"
- VEHICLE_SIZE_LIMIT = "0x0174"
- CRIME_AREAS = "0x0175"
- }
-
- enumeration ConditionPreferenceSource extends BasicEnum {
- TRAFFIC_REALTIME = "0x0200"
- }
-
-
- enumeration Schedule extends BasicEnum {
- ARRIVAL_TIME = "0x018a"
- ARRIVAL_DATE = "0x018b"
- DEPARTURE_TIME = "0x018c"
- DEPARTURE_DATE = "0x018d"
+// enumeration CalculationStatus extends BasicEnum { //Base 0x0130
+ enumeration CalculationStatus { //Base 0x0130
+ INVALID = 0
+ CALCULATION_OK = 304
+ NO_POSITION = 305
}
-
- enumeration TransportationMeans extends BasicEnum {
- BY_CAR = "0x0180"
- ON_FOOT = "0x0181"
- LONG_RANGE_TRAINS = "0x0182"
- PUBLIC_TRANSPORTATION = "0x0183"
- BY_BICYCLE = "0x0184"
- BY_TRUCK = "0x0185"
+
+// enumeration CalculationError extends BasicEnum {
+ enumeration CalculationError {
+ INVALID = 0
+ UNMATCHED_POSITION = 306
+ UNREACHABLE_DESTINATION = 307
+ UNFULFILLED_PREFERENCE_MODE = 308
}
- enumeration CalculationStatus extends BasicEnum {
- CALCULATION_OK = "0x0130"
- NO_POSITION = "0x0131"
+// enumeration CostModel extends BasicEnum { //Base 0x0160
+ enumeration CostModel { //Base 0x0160
+ INVALID = 0
+ FASTEST = 352
+ SHORTEST = 353
+ ECOLOGICAL = 354
+ SCENIC = 355
+ EASY = 356
+ OFF_ROAD = 357 //to be confirmed
+ BALANCED = 358
+ CHEAPEST = 359
+ }
+
+// enumeration RoutePreferenceSource extends BasicEnum { //Base 0x0170
+ enumeration RoutePreferenceSource { //Base 0x0170
+ INVALID = 0
+ FERRY = 368
+ TOLL_ROADS = 369
+ TUNNELS = 370
+ HIGHWAYS_MOTORWAYS = 371
+ VEHICLE_SIZE_LIMIT = 372
+ CRIME_AREAS = 373
+ }
+
+ // enumeration TransportationMeans extends BasicEnum { //Base 0x0180
+ enumeration TransportationMeans { //Base 0x0180
+ INVALID = 0
+ BY_CAR = 384
+ ON_FOOT = 385
+ LONG_RANGE_TRAINS = 386
+ PUBLIC_TRANSPORTATION = 387
+ BY_BICYCLE = 388
+ BY_TRUCK = 389
}
- enumeration CalculationError extends BasicEnum {
- UNREACHABLE_DESTINATION = "0x0133"
- UNFULFILLED_PREFERENCE_MODE = "0x0134"
+// enumeration Schedule extends BasicEnum {
+ enumeration Schedule {
+ INVALID = 0
+ ARRIVAL_TIME = 394
+ ARRIVAL_DATE = 395
+ DEPARTURE_TIME = 396
+ DEPARTURE_DATE = 397
+ }
+
+ enumeration RouteOverviewType extends Schedule {
+ TOTAL_TIME = 398
+ TOTAL_DISTANCE = 399
}
+// enumeration PreferenceMode extends BasicEnum { //Base 0x0190
+ enumeration PreferenceMode { //Base 0x0190
+ INVALID = 0
+ PROHIBIT = 400
+ AVOID = 401
+ USE = 402
+ PREFER = 403
+ IGNORE = 404
+ }
+
+// enumeration ConditionPreferenceSource extends BasicEnum { //Base 0x0200
+ enumeration ConditionPreferenceSource { //Base 0x0200
+ INVALID = 0
+ TRAFFIC_REALTIME = 512
+ }
+
+
<**
@description : struct generated for DBus argument SetRoutePreferences_roadPreferenceList
**>
@@ -83,7 +104,7 @@ typeCollection RoutingTypes { <**
@description : struct generated for DBus argument SetRoutePreferences_conditionPreferenceList
**>
- struct ConiditionPreference {
+ struct ConditionPreference {
PreferenceMode mode
ConditionPreferenceSource source
}
@@ -94,33 +115,33 @@ typeCollection RoutingTypes { }
- enumeration WapointElementType extends BasicEnum {
- WAYPOINT_TYPE = "0x0121"
- LOCATION_INPUT = "0x00b1"
- LATITUDE = "0x00a0"
- LONGITUDE = "0x00a1"
- ALTITUDE = "0x00a2"
+ enumeration WaypointElementType extends GeoLocalizedEnum {
+ WAYPOINT_TYPE = 289
+ LOCATION_INPUT = 17
}
- enumeration RouteSegmentType extends BasicEnum {
- LINK_ID = "0x0140"
- INTERMEDIATE_POINTS = "0x0120"
- START_LATITUDE = "0x0141"
- START_LONGITUDE = "0x0143"
- START_ALTITUDE = "0x0145"
- END_LATITUDE = "0x0142"
- END_LONGITUDE = "0x0144"
- END_ALTITUDE = "0x0146"
- ROAD_NAME = "0x0147"
- ROAD_NUMBER = "0x014e"
- DISTANCE = "0x0148"
- TIME = "0x0149"
- MANEUVER = "0x014a"
- INSTRUCTION = "0x014b"
- BORDER_CROSSING = "0x014c"
- ADDITIONAL_INFORMATION = "0x014d"
- HIGHWAY_EXIT = "0x0074"
- ALL = "0xffff"
+// enumeration RouteSegmentType extends BasicEnum {
+ enumeration RouteSegmentType {
+ INVALID = 0
+ LINK_ID = 320 //Base 0x0140
+ START_LATITUDE = 321
+ END_LATITUDE = 322
+ START_LONGITUDE = 323
+ END_LONGITUDE = 324
+ START_ALTITUDE = 325
+ END_ALTITUDE = 326
+ ROAD_NAME = 327
+ DISTANCE = 328
+ TIME = 329
+ MANEUVER = 330
+ INSTRUCTION = 331
+ BORDER_CROSSING = 332
+ ADDITIONAL_INFORMATION = 333
+ ROAD_NUMBER = 334
+ START_OFFSET = 335
+ INTERMEDIATE_POINTS = 288
+ HIGHWAY_EXIT = 116
+ ALL = 65535
}
enumeration IntermediatePointType {
@@ -128,11 +149,6 @@ typeCollection RoutingTypes { SOFT_POINT
}
- enumeration RouteOverviewType extends Schedule {
- TOTAL_DISTANCE = "0x018f"
- TOTAL_TIME = "0x018e"
- }
-
union RouteOverviewItem {
UInt32 uValue
}
@@ -160,7 +176,7 @@ typeCollection RoutingTypes { }
map WayPoint {
- WapointElementType to WayPointItem
+ WaypointElementType to WayPointItem
}
map RouteSegment {
diff --git a/api/franca/navigation/poiservice/POIServiceTypes.fidl b/api/franca/navigation/poiservice/POIServiceTypes.fidl index ed214fa..01003c1 100755 --- a/api/franca/navigation/poiservice/POIServiceTypes.fidl +++ b/api/franca/navigation/poiservice/POIServiceTypes.fidl @@ -29,36 +29,80 @@ typeCollection POIServiceTypes { typedef ContentAccessModuleID is UInt8
- <** @description: Current state of the search**>
- enumeration SearchStatusState {
- INVALID
- NOT_STARTED
- SEARCHING
- FINISHED
+ <** @description: Set of CategoryID**>
+// enumeration CategoryIDSet extends BasicEnum {
+ enumeration CategoryIDSet {
+ INVALID = 0
+ AIRPORT = 1
+ SPORTING = 2
+ FERRY_TERMINAL = 3
+ ENTERTAINMENT = 4
+ HOTEL_MOTEL = 5
+ RESTAURANT = 6
+ PARKING = 7
+ FUEL_STATION = 8
+ SERVICE_AREA = 9
+ CAR_REPAIR_SHOP = 10
+ CAR_DEALER = 11
+ CAR_RENTAL_AGENCY = 12
+ MEDICAL = 13
+ SHOPPING = 14
+ BUSINESS_AREA = 15
+ LANDMARK = 16
+ FLASH_RADAR = 17
+ POI_TRUCK = 18
+ SANCTUARY = 19
+ TOLLBOOTH = 20
+ KIOSK = 21
+ WATER_CLOSET = 22
+ BANK_AND_FINANCIAL = 23
+ TRAVEL = 24
+ TOURIST = 25
+ PUBLIC_BUILDING = 26
+ RAILWAY_STATION = 27
+ }
+
+ <** @description: Type of Attribute**>
+ enumeration AttributeType { //Base 0x0500
+ STRING = 1280
+ INTEGER = 1281
+ BOOLEAN = 1282
+ COORDINATES = 1283
+ }
+
+ <** @description: Current state of the search**>
+// enumeration SearchStatusState extends BasicEnum { //Base 0x0510
+ enumeration SearchStatusState { //Base 0x0510
+ INVALID = 0
+ NOT_STARTED = 1296
+ SEARCHING = 1297
+ FINISHED = 1298
}
- <** @description: Type of Attribute**>
- enumeration AttributeType {
- INTEGER
- BOOLEAN
- COORDINATE
+ <** @description: Type of Operator**>
+// enumeration OperatorType extends BasicEnum { //Base 0x0520
+ enumeration OperatorType { //Base 0x0520
+ INVALID = 0
+ MORE_THAN = 1312
+ LESS_THAN = 1313
+ EQUAL = 1314
}
- <** @description: Type of Operator**>
- enumeration OperatorType {
- INVALID
- MORE_THAN
- LESS_THAN
- EQUAL
+ <** @description: Reason of update**>
+ enumeration SortOption { //Base 0x0560
+ SORT_DEFAULT = 1376
+ SORT_BY_DISTANCE = 1377
+ SORT_BY_TIME = 1378
+ ATTRIBUTE_CUSTOM = 1379
}
<** @description: Reason of update**>
- enumeration UpdateReason {
- ADDED
- REMOVED
- ATTR_ADDED
- ATTR_MODIFIED
- ATTR_REMOVED
+ enumeration UpdateReason { //Base 0x0700
+ ADDED = 1792
+ REMOVED = 1793
+ ATTR_ADDED = 1794
+ ATTR_MODIFIED = 1795
+ ATTR_REMOVED = 1796
}
<** @description: Configuration changed**>
@@ -66,14 +110,6 @@ typeCollection POIServiceTypes { LOCALES
}
- <** @description: Reason of update**>
- enumeration SortOption {
- SORT_DEFAULT
- SORT_BY_DISTANCE
- SORT_BY_TIME
- ATTRIBUTE_CUSTOM
- }
-
<** @description: Different types of resources for icons**>
union Icon {
ResourceID[] id
|