diff options
Diffstat (limited to 'api/franca')
4 files changed, 60 insertions, 4 deletions
diff --git a/api/franca/navigation/navigationcore/Guidance.fidl b/api/franca/navigation/navigationcore/Guidance.fidl index e678e7a..64de71f 100644 --- a/api/franca/navigation/navigationcore/Guidance.fidl +++ b/api/franca/navigation/navigationcore/Guidance.fidl @@ -177,6 +177,9 @@ interface Guidance { @description : struct generated for DBus argument GetManeuversList_maneuversList
**>
struct Maneuver {
+ RoadShield[] roadShieldsAfterManeuver // A road can have zero or more roadshields.
+ String countryCodeAfterManeuver // ISO 3166‐1 alpha-3 country code (three-letter upper case).
+ String stateCodeAfterManeuver // ISO 3166-2 Subdivision code (e.g., provinces or state) of country (up to three characters). An empty string when absent.
String roadNumberAfterManeuver
String roadNameAfterManeuver
RoadProperty roadPropertyAfterManeuver
diff --git a/api/franca/navigation/navigationcore/LocationInput.fidl b/api/franca/navigation/navigationcore/LocationInput.fidl index c16cb24..e6f300b 100644 --- a/api/franca/navigation/navigationcore/LocationInput.fidl +++ b/api/franca/navigation/navigationcore/LocationInput.fidl @@ -52,6 +52,7 @@ interface LocationInput { LOCATION_INPUT = 177
FULL_ADDRESS = 178
POSTAL_CODE = 181
+ ROADSHIELDS = 182
}
union AddressValue {
@@ -60,6 +61,7 @@ interface LocationInput { String stringValue
Coordinate3D coordinate3DValue
UInt8[] internalData
+ RoadShield[] roadShields
}
map Address {
@@ -171,7 +173,7 @@ interface LocationInput { LocationHandle locationInputHandle
<**
- @description : selectionCriterion = enum(INVALID,LATITUDE,LONGITUDE,ALTITUDE,FULL_ADDRESS,COUNTRY,COUNTRYCODE,STATE,CITY,ZIPCODE,STREET,ROAD_NUMBER,HOUSENUMBER,HOUSENAME,CROSSING,DISTRICT,PHONENUMBER,POINAME,TOWNCENTER, ... )
+ @description : selectionCriterion = enum(INVALID,LATITUDE,LONGITUDE,ALTITUDE,FULL_ADDRESS,COUNTRY,COUNTRYCODE,STATE,CITY,STREET,ROAD_NUMBER,HOUSENUMBER,HOUSENAME,CROSSING,DISTRICT,PHONENUMBER,POINAME,TOWNCENTER, ... )
**>
AddressAttribute selectionCriterion
}
@@ -361,7 +363,7 @@ interface LocationInput { LocationHandle locationInputHandle
<**
- @description : selectionCriterion = enum(INVALID,LATITUDE,LONGITUDE,ALTITUDE,FULL_ADDRESS,COUNTRY,COUNTRYCODE,STATE,CITY,ZIPCODE,STREET,ROAD_NUMBER,HOUSENUMBER,HOUSENAME,CROSSING,DISTRICT,PHONENUMBER,POINAME,TOWNCENTER, ... )
+ @description : selectionCriterion = enum(INVALID,LATITUDE,LONGITUDE,ALTITUDE,FULL_ADDRESS,COUNTRY,COUNTRYCODE,STATE,CITY,STREET,ROAD_NUMBER,HOUSENUMBER,HOUSENAME,CROSSING,DISTRICT,PHONENUMBER,POINAME,TOWNCENTER, ... )
**>
AddressAttribute selectionCriterion
}
diff --git a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl index c7238e5..5a72b20 100644 --- a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl +++ b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl @@ -32,7 +32,6 @@ interface MapMatchedPosition { COUNTRY = 166 //Base 0x00a0
STATE = 167
CITY = 168
- ZIPCODE = 169
STREET = 170
HOUSENUMBER = 171
CROSSING = 172
@@ -46,7 +45,8 @@ interface MapMatchedPosition { HOUSENAME = 180
POSTAL_CODE = 181
ROAD_NUMBER = 334
- MATCH_TYPE = 240
+ MATCH_TYPE = 240
+ ROADSHIELDS = 182
}
enumeration PositionStatus extends GeoLocalizedEnum { //Base 0x00e0
@@ -102,6 +102,7 @@ interface MapMatchedPosition { Int16 offset
Timestamp timestamp
MatchMode matchMode
+ RoadShield[] roadShields
}
map AddressItemDict {
diff --git a/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl b/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl index 61499ab..217683a 100644 --- a/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl +++ b/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl @@ -23,5 +23,55 @@ typeCollection NavigationCoreTypes { LONGITUDE = 161 //value of type Double, that expresses the longitude in format %3.6f. Range[-180:+180]. Example: 9.167898 ALTITUDE = 162 //value of type Int32, that expresses the altitude in meters } + enumeration RoadShieldAffixType { + NONE = 700 + NORTH = 701 + EAST = 702 + SOUTH = 703 + WEST = 704 + ALTERNATE = 705 + BYPASS = 706 + BUSINESS_LOOP = 707 + BUSINESS_ROUTE = 708 + BUSINESS_SPUR = 709 + EXTENDED = 710 + COLLECTOR = 711 + EXPRESS = 712 + } + + <** + @description : This struct describes information about the 'affix', which is a small sign which may be attached to + the main road sign. Usually this will be something like 'northbound'. In most cases the affixContent is just + a textual representation of the type, and can be ignored, but it could be used to build a string representation + of the road sign, if desired. + **> + struct RoadShieldAffix { + <** @description : Type of the affix. **> + RoadShieldAffixType affixType + + <** @description : The textual representation of the affix type. **> + String affixContent + } + + <** + @description : A road shield is the way in which a road number is graphically represented on road signs. For + example, A-roads in the Netherlands are displayed in white lettering on a red background, while E-roads + are shown as white letters on a green background. + **> + struct RoadShield { + <** @description : The text of a road number as displayed on a road shield. For example, for a motorway in Germany + with the numbers "A40" and "E34", the values are "40" and "E34". This shows that the 'A' is not shown on + the shield, but the 'E' is shown. **> + String roadNumber + + <** @description : A road shield can have zero or more affixes. **> + RoadShieldAffix[] affixes + + <** @description : For every road shield a number of icons may be available. There may be icons for high and low + density screens, and/or icons with different widths for different text lengths. Such a collection of icons + is called an icon set. Opaque data referring to an icon set for the RoadShield. An empty string indicates + that no icon set is available. **> + String iconSetId + } } |