Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TTCN-3 Libraries
LibIts
Commits
afdbfe74
Commit
afdbfe74
authored
Aug 31, 2020
by
Yann Garcia
Browse files
Remove duplicate types from IVI, Editorial update of IVI
parent
5d290dcc
Changes
2
Hide whitespace changes
Inline
Side-by-side
asn1/IS/ISO_TS_14823/GDD.asn
View file @
afdbfe74
...
...
@@ -15,6 +15,10 @@ GDD {iso (1) standard (0) gdd(14823) version1 (0)}
DEFINITIONS AUTOMATIC TAGS::=
BEGIN
IMPORTS
Distance, DistanceOrDuration, DestinationPlace, DestinationPlaces, DestinationRoad, DestinationRoads, MonthDay, HoursMinutes, DayOfWeek, Weight, DDD-IO, DDD-IO-LIST
FROM IVI {iso (1) standard (0) ivi (19321) version2 (2)};
--Definition of GDD Structure
GddStructure::= SEQUENCE{
...
...
@@ -54,16 +58,16 @@ InternationalSign-applicablePeriod::= SEQUENCE {
yearRangeEndYear INTEGER(2000..2127,...)
} OPTIONAL,
month-day SEQUENCE { -- contains dateRangeStartMonth&Date and dateRangeEndMonth&Date
dateRangeStart
GDD-
MonthDay
GDD-
MonthDay,
dateRangeEnd
GDD-
MonthDay
GDD-
MonthDay
dateRangeStartMonthDay MonthDay,
dateRangeEndMonthDay MonthDay
} OPTIONAL,
repeatingPeriodDayTypes RepeatingPeriodDayTypes OPTIONAL,
hourMinutes SEQUENCE { -- contains timeRangeStartTime and timeRangeEndTime
timeRangeStartTime
GDD-
HoursMinutes,
timeRangeEndTime
GDD-
HoursMinutes
timeRangeStartTime HoursMinutes,
timeRangeEndTime HoursMinutes
} OPTIONAL,
dateRangeOfWeek
GDD-
DayOfWeek OPTIONAL,
durationHourMinute
GDD-
HoursMinutes OPTIONAL
dateRangeOfWeek DayOfWeek OPTIONAL,
durationHourMinute HoursMinutes OPTIONAL
}
InternationalSign-exemptedApplicablePeriod::= InternationalSign-applicablePeriod
...
...
@@ -80,10 +84,10 @@ InternationalSign-directionalFlowOfLane::= INTEGER {
} (1..8)
InternationalSign-applicableVehicleDimensions::= SEQUENCE{
vehicleHeight
GDD-
Distance OPTIONAL,
vehicleWidth
GDD-
Distance OPTIONAL,
vehicleLength
GDD-
Distance OPTIONAL,
vehicle
GDD-
Weight
GDD-
Weight OPTIONAL
vehicleHeight Distance OPTIONAL,
vehicleWidth Distance OPTIONAL,
vehicleLength Distance OPTIONAL,
vehicleWeight Weight OPTIONAL
}
InternationalSign-speedLimits::= SEQUENCE{
...
...
@@ -94,18 +98,18 @@ InternationalSign-speedLimits::= SEQUENCE{
InternationalSign-rateOfIncline::= INTEGER(1..32)
InternationalSign-distanceBetweenVehicles::=
GDD-
Distance
InternationalSign-distanceBetweenVehicles::= Distance
InternationalSign-destinationInformation::= SEQUENCE{
junctionDirection INTEGER(1..128) OPTIONAL,
roundaboutCwDirection INTEGER(1..128)OPTIONAL,
roundaboutCcwDirection INTEGER(1..128)OPTIONAL,
ioList
GDD-
DDD-IO-LIST
ioList DDD-IO-LIST
}
InternationalSign-section::= SEQUENCE{
startingPointLength
GDD-
Distance OPTIONAL,
continuityLength
GDD-
Distance OPTIONAL
startingPointLength Distance OPTIONAL,
continuityLength Distance OPTIONAL
}
InternationalSign-numberOfLane::= INTEGER(0..99)
...
...
@@ -131,102 +135,6 @@ Code-Units::= INTEGER {
-- value 15 reserved for future use
} (0..15)
GDD-DayOfWeek::= BIT STRING {unused(0), monday(1), tuesday(2), wednesday(3), thursday(4), friday(5), saturday(6), sunday(7)} (SIZE (8))
GDD-DDD-IO-LIST ::= SEQUENCE (SIZE (1..8,...)) OF GDD-DDD-IO
GDD-DDD-IO::= SEQUENCE{
arrowDirection INTEGER(0..7),
destPlace GDD-DestinationPlaces OPTIONAL,
destRoad GDD-DestinationRoads OPTIONAL,
roadNumberIdentifier INTEGER(1..999) OPTIONAL,
streetName INTEGER(1..999) OPTIONAL,
streetNameText UTF8String OPTIONAL,
distanceToDivergingPoint GDD-DistanceOrDuration OPTIONAL,
distanceToGDD-DestinationPlace GDD-DistanceOrDuration OPTIONAL
}
GDD-DestinationPlace::= SEQUENCE{
destType DestinationType,
destRSCode GddStructure (WITH COMPONENTS {..., attributes ABSENT}) OPTIONAL,
destBlob OCTET STRING OPTIONAL,
placeNameIdentification INTEGER(1..999) OPTIONAL,
placeNameText UTF8String OPTIONAL
}
GDD-DestinationPlaces ::= SEQUENCE (SIZE (1..4,...)) OF GDD-DestinationPlace
GDD-DestinationRoad::= SEQUENCE{
derType GDD-DestinationRoadType,
roadNumberIdentifier INTEGER(1..999) OPTIONAL,
roadNumberText UTF8String OPTIONAL
}
GDD-DestinationRoads ::= SEQUENCE (SIZE (1..4,...)) OF GDD-DestinationRoad
GDD-DestinationRoadType::= INTEGER {
none (0),
nationalHighway (1),
localHighway (2),
tollExpresswayMotorway (3),
internationalHighway (4),
highway (5),
expressway (6),
nationalRoad (7),
regionalProvincialRoad (8),
localRoad (9),
motorwayJunction (10),
diversion (11),
rfu1 (12),
rfu2 (13),
rfu3 (14),
rfu4 (15)
} (0..15, ...)
DestinationType::= INTEGER {
none (0),
importantArea (1),
principalArea (2),
generalArea (3),
wellKnownPoint (4),
country (5),
city (6),
street (7),
industrialArea (8),
historicArea (9),
touristicArea (10),
culturalArea (11),
touristicRoute (12),
recommendedRoute (13),
touristicAttraction (14),
geographicArea (15)
} (0..15, ...)
GDD-Distance::= SEQUENCE{
value INTEGER(1..16384),
unit Code-Units(2..4|6..8)
}
GDD-DistanceOrDuration::= SEQUENCE {
value INTEGER(1..16384),
unit Code-Units (2..9)
}
GDD-HoursMinutes::= SEQUENCE {
hours INTEGER (0..23),-- number of hours after midnight
mins INTEGER (0..59) -- number of minutes after the hour
}
GDD-MonthDay::= SEQUENCE {
month INTEGER (1..12),
day INTEGER (1..31)
}
RepeatingPeriodDayTypes::= BIT STRING {national-holiday (0), even-days(1), odd-days(2), market-day(3) } (SIZE (4))
GDD-Weight::= SEQUENCE {
value INTEGER(1..16384),
unit Code-Units (10..12)
}
END
asn1/IS/ISO_TS_19321/IVI.asn
View file @
afdbfe74
...
...
@@ -556,15 +556,17 @@ DDD::= SEQUENCE{
}
-- changes: from DDD_IO to DDD-IO
DDD-IO::= SEQUENCE{
drn
INTEGER(0..7),
dp SEQUENCE (SIZE (1..4,...)) OF
DestinationPlace OPTIONAL,
dr SEQUENCE (SIZE (1..4,...)) OF
DestinationRoad OPTIONAL,
rne
INTEGER(1..999) OPTIONAL,
stnId
INTEGER(1..999) OPTIONAL,
stnText
UTF8String OPTIONAL,
dcp
DistanceOrDuration OPTIONAL,
ddp
DistanceOrDuration OPTIONAL
arrowDirection
INTEGER(0..7),
destPlace
DestinationPlace
s
OPTIONAL,
destRoad
DestinationRoad
s
OPTIONAL,
roadNumberIdentifier
INTEGER(1..999) OPTIONAL,
streetName
INTEGER(1..999) OPTIONAL,
streetNameText
UTF8String OPTIONAL,
distanceToDivergingPoint
DistanceOrDuration OPTIONAL,
distanceToDestinationPlace
DistanceOrDuration OPTIONAL
}
DDD-IO-LIST ::= SEQUENCE (SIZE (1..8,...)) OF DDD-IO
-- changes: from DDD_DEP to DDD-DEP
DestinationPlace::= SEQUENCE{
depType DDD-DEP,
...
...
@@ -574,13 +576,15 @@ DestinationPlace::= SEQUENCE{
depBlob OCTET STRING OPTIONAL,
plnId INTEGER(1..999) OPTIONAL,
plnText UTF8String OPTIONAL
}
}
DestinationPlaces ::= SEQUENCE (SIZE (1..4,...)) OF DestinationPlace
-- changes: from DDD_DER to DDD-DER
DestinationRoad::=SEQUENCE{
derType DDD-DER,
ronId INTEGER(1..999) OPTIONAL,
ronText UTF8String OPTIONAL
}
DestinationRoads ::= SEQUENCE (SIZE (1..4,...)) OF DestinationRoad
-- changes: from DDD_DER to DDD-DER
DDD-DER::= INTEGER {
none (0),
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment