Commit 3fcf9a6c authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

Merge branch 'TTF0002' of https://forge.etsi.org/gitlab/LIBS/LibIts into TTF0002

parents 2e91342b 5d290dcc
Loading
Loading
Loading
Loading
+32 −32
Original line number Diff line number Diff line
@@ -54,16 +54,16 @@ InternationalSign-applicablePeriod::= SEQUENCE {
      yearRangeEndYear      INTEGER(2000..2127,...)
      } OPTIONAL,
   month-day  SEQUENCE { -- contains dateRangeStartMonth&Date and dateRangeEndMonth&Date
      dateRangeStartMonthDay   MonthDay,
      dateRangeEndMonthDay     MonthDay
      dateRangeStartGDD-MonthDay   GDD-MonthDay,
      dateRangeEndGDD-MonthDay     GDD-MonthDay
      } OPTIONAL,
   repeatingPeriodDayTypes RepeatingPeriodDayTypes OPTIONAL,
   hourMinutes  SEQUENCE { -- contains timeRangeStartTime and timeRangeEndTime
      timeRangeStartTime  HoursMinutes,
      timeRangeEndTime    HoursMinutes
      timeRangeStartTime  GDD-HoursMinutes,
      timeRangeEndTime    GDD-HoursMinutes
      } OPTIONAL,
   dateRangeOfWeek       DayOfWeek OPTIONAL,
   durationHourMinute   HoursMinutes OPTIONAL
   dateRangeOfWeek       GDD-DayOfWeek OPTIONAL,
   durationHourMinute   GDD-HoursMinutes OPTIONAL
}

InternationalSign-exemptedApplicablePeriod::= InternationalSign-applicablePeriod
@@ -80,10 +80,10 @@ InternationalSign-directionalFlowOfLane::= INTEGER {
    } (1..8)

InternationalSign-applicableVehicleDimensions::= SEQUENCE{
   vehicleHeight   Distance OPTIONAL,
   vehicleWidth    Distance OPTIONAL,
   vehicleLength   Distance OPTIONAL,
   vehicleWeight   Weight 	OPTIONAL
   vehicleHeight   GDD-Distance OPTIONAL,
   vehicleWidth    GDD-Distance OPTIONAL,
   vehicleLength   GDD-Distance OPTIONAL,
   vehicleGDD-Weight   GDD-Weight 	OPTIONAL
   }

InternationalSign-speedLimits::= SEQUENCE{
@@ -94,18 +94,18 @@ InternationalSign-speedLimits::= SEQUENCE{

InternationalSign-rateOfIncline::= INTEGER(1..32)

InternationalSign-distanceBetweenVehicles::= Distance
InternationalSign-distanceBetweenVehicles::= GDD-Distance

InternationalSign-destinationInformation::= SEQUENCE{
   junctionDirection         INTEGER(1..128) OPTIONAL,
   roundaboutCwDirection     INTEGER(1..128)OPTIONAL,
   roundaboutCcwDirection    INTEGER(1..128)OPTIONAL,
   ioList                    DDD-IO-LIST
   ioList                    GDD-DDD-IO-LIST
   }

InternationalSign-section::= SEQUENCE{
	startingPointLength   Distance OPTIONAL,
	continuityLength      Distance OPTIONAL
	startingPointLength   GDD-Distance OPTIONAL,
	continuityLength      GDD-Distance OPTIONAL
   }

InternationalSign-numberOfLane::= INTEGER(0..99)
@@ -131,22 +131,22 @@ Code-Units::= INTEGER {
   -- value  15 reserved for future use
   } (0..15)

DayOfWeek::= BIT STRING {unused(0), monday(1), tuesday(2), wednesday(3), thursday(4), friday(5), saturday(6), sunday(7)} (SIZE (8))
GDD-DayOfWeek::= BIT STRING {unused(0), monday(1), tuesday(2), wednesday(3), thursday(4), friday(5), saturday(6), sunday(7)} (SIZE (8))

DDD-IO-LIST ::= SEQUENCE (SIZE (1..8,...)) OF DDD-IO
GDD-DDD-IO-LIST ::= SEQUENCE (SIZE (1..8,...)) OF GDD-DDD-IO

DDD-IO::= SEQUENCE{
GDD-DDD-IO::= SEQUENCE{
   arrowDirection                 INTEGER(0..7),
   destPlace                      DestinationPlaces OPTIONAL,
   destRoad                       DestinationRoads OPTIONAL,
   destPlace                      GDD-DestinationPlaces OPTIONAL,
   destRoad                       GDD-DestinationRoads OPTIONAL,
   roadNumberIdentifier           INTEGER(1..999) OPTIONAL,
   streetName                     INTEGER(1..999) OPTIONAL,
   streetNameText                 UTF8String OPTIONAL,
   distanceToDivergingPoint       DistanceOrDuration OPTIONAL,
   distanceToDestinationPlace     DistanceOrDuration OPTIONAL
   distanceToDivergingPoint       GDD-DistanceOrDuration OPTIONAL,
   distanceToGDD-DestinationPlace     GDD-DistanceOrDuration OPTIONAL
   }

DestinationPlace::= SEQUENCE{
GDD-DestinationPlace::= SEQUENCE{
   destType   					DestinationType,
   destRSCode  					GddStructure (WITH COMPONENTS {..., attributes ABSENT}) OPTIONAL,
   destBlob   					OCTET STRING OPTIONAL,
@@ -154,17 +154,17 @@ DestinationPlace::= SEQUENCE{
   placeNameText   				UTF8String OPTIONAL
   }

DestinationPlaces ::= SEQUENCE (SIZE (1..4,...)) OF DestinationPlace
GDD-DestinationPlaces ::= SEQUENCE (SIZE (1..4,...)) OF GDD-DestinationPlace

DestinationRoad::= SEQUENCE{
   derType   				DestinationRoadType,
GDD-DestinationRoad::= SEQUENCE{
   derType   				GDD-DestinationRoadType,
   roadNumberIdentifier   	INTEGER(1..999) OPTIONAL,
   roadNumberText   		UTF8String OPTIONAL
   }

DestinationRoads ::= SEQUENCE (SIZE (1..4,...)) OF DestinationRoad
GDD-DestinationRoads ::= SEQUENCE (SIZE (1..4,...)) OF GDD-DestinationRoad

DestinationRoadType::= INTEGER {
GDD-DestinationRoadType::= INTEGER {
   none                   (0),
   nationalHighway        (1),
   localHighway           (2),
@@ -202,29 +202,29 @@ DestinationType::= INTEGER {
   geographicArea        (15)
   } (0..15, ...)

Distance::= SEQUENCE{
GDD-Distance::= SEQUENCE{
   value    INTEGER(1..16384),
   unit     Code-Units(2..4|6..8)
	}

DistanceOrDuration::= SEQUENCE {
GDD-DistanceOrDuration::= SEQUENCE {
	value INTEGER(1..16384),
	unit Code-Units (2..9)
	}

HoursMinutes::= SEQUENCE {
GDD-HoursMinutes::= SEQUENCE {
   hours      INTEGER (0..23),-- number of hours after midnight
   mins       INTEGER (0..59) -- number of minutes after the hour
   }

MonthDay::= SEQUENCE {
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))

Weight::= SEQUENCE {
GDD-Weight::= SEQUENCE {
	value 	INTEGER(1..16384),
	unit 	Code-Units (10..12)
	}