Commit e9e80423 authored by mullers's avatar mullers
Browse files

Modifications to align with EN 302 637-3 V1.2.4 (DENM)

parent 25a50355
Loading
Loading
Loading
Loading
+15 −34
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
BEGIN


IMPORTS 
IMPORTS 
   ItsPduHeader, CauseCode, StationID, Speed, InformationQuality, ReferencePosition, ClosedLanes, DangerousGoodsExtended, Heading, LaneNumber, LightBarSirenInUse, PathHistory, RoadType, HeightLonCarr, PosLonCarr, PosPillar, PosCentMass, PositioningSolutionType, RequestResponseIndication, StationType, SpeedLimit, StationarySince, TimestampIts, WheelBaseVehicle, TurningRadius, PosFrontAx, PositionOfOccupants, Temperature, VehicleMass, VehicleIdentification, EnergyStorageType FROM ITS-Container {
   ItsPduHeader, CauseCode, StationID, Speed, InformationQuality, ReferencePosition, ClosedLanes, DangerousGoodsExtended, Heading, LanePosition, LightBarSirenInUse, PathHistory, RoadType, HeightLonCarr, PosLonCarr, PosCentMass, PositioningSolutionType, RequestResponseIndication, StationType, SpeedLimit, StationarySince, TimestampIts, WheelBaseVehicle, TurningRadius, PosFrontAx, PositionOfOccupants, Temperature, VehicleMass, VehicleIdentification, EnergyStorageType, ActionID, ItineraryPath, NumberOfOccupants, PositionOfPillars, RelevanceTrafficDirection, RestrictedTypes, SequenceNumber, Traces, TransmissionInterval, ValidityDuration, RelevanceDistance, EventHistory FROM ITS-Container {
 itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (1) 
 itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (1) 
};
};


@@ -30,11 +30,10 @@ ManagementContainer ::= SEQUENCE {
	actionID	ActionID,
	actionID	ActionID,
	detectionTime	TimestampIts,
	detectionTime	TimestampIts,
	referenceTime	TimestampIts,
	referenceTime	TimestampIts,
	isNegation	BOOLEAN,
	termination Termination,
	isCancellation	BOOLEAN,
	eventPosition	ReferencePosition,
	eventPosition	ReferencePosition,
	relevanceDistance	RelevanceDistance,
	relevanceDistance	RelevanceDistance OPTIONAL,
	relevanceTrafficDirection RelevanceTrafficDirection,
	relevanceTrafficDirection RelevanceTrafficDirection OPTIONAL,
	validityDuration	ValidityDuration DEFAULT defaultValidity,
	validityDuration	ValidityDuration DEFAULT defaultValidity,
	transmissionInterval	TransmissionInterval OPTIONAL 
	transmissionInterval	TransmissionInterval OPTIONAL 
}
}
@@ -42,7 +41,8 @@ ManagementContainer ::= SEQUENCE {
SituationContainer ::= SEQUENCE {
SituationContainer ::= SEQUENCE {
	informationQuality InformationQuality,
	informationQuality InformationQuality,
	eventType CauseCode,
	eventType CauseCode,
	linkedCause CauseCode OPTIONAL
	linkedCause CauseCode OPTIONAL,
    eventHistory EventHistory OPTIONAL
}
}


LocationContainer ::= SEQUENCE {
LocationContainer ::= SEQUENCE {
@@ -67,7 +67,6 @@ ImpactReductionContainer ::= SEQUENCE {
  requestResponseIndication RequestResponseIndication
  requestResponseIndication RequestResponseIndication
}
}


PositionOfPillars ::= SEQUENCE (SIZE(1..3, ...)) OF PosPillar


 RoadWorksContainerExtended ::= SEQUENCE {
 RoadWorksContainerExtended ::= SEQUENCE {
  lightBarSirenInUse LightBarSirenInUse OPTIONAL,
  lightBarSirenInUse LightBarSirenInUse OPTIONAL,
@@ -75,25 +74,26 @@ PositionOfPillars ::= SEQUENCE (SIZE(1..3, ...)) OF PosPillar
  restriction RestrictedTypes OPTIONAL,
  restriction RestrictedTypes OPTIONAL,
  speedLimit SpeedLimit OPTIONAL,
  speedLimit SpeedLimit OPTIONAL,
  incidentIndication CauseCode OPTIONAL,
  incidentIndication CauseCode OPTIONAL,
  recommendedPath ItineraryPath OPTIONAL	--Traces without timestamps
  recommendedPath ItineraryPath OPTIONAL
 }
 }




RestrictedTypes ::= SEQUENCE OF StationType


StationaryVehicleContainer ::= SEQUENCE {
StationaryVehicleContainer ::= SEQUENCE {
 stationType StationType,
 stationType StationType,
 stationarySince StationarySince OPTIONAL,
 stationarySince StationarySince OPTIONAL,
 stationaryCause CauseCode OPTIONAL,
 stationaryCause CauseCode OPTIONAL,
 carryingDangerousGoods DangerousGoodsExtended OPTIONAL,
 carryingDangerousGoods DangerousGoodsExtended OPTIONAL,
 numberOfOccupants INTEGER(0..127) OPTIONAL,
 
 numberOfOccupants NumberOfOccupants OPTIONAL,
 vehicleIdentification VehicleIdentification OPTIONAL,
 vehicleIdentification VehicleIdentification OPTIONAL,
 energyStorageType EnergyStorageType OPTIONAL
 energyStorageType EnergyStorageType OPTIONAL
}
}




AlacarteContainer ::= SEQUENCE {
AlacarteContainer ::= SEQUENCE {
	laneNumber LaneNumber OPTIONAL,
	
    lanePosition LanePosition OPTIONAL,
	impactReduction	ImpactReductionContainer OPTIONAL,
	impactReduction	ImpactReductionContainer OPTIONAL,
	externalTemperature Temperature OPTIONAL,
	externalTemperature Temperature OPTIONAL,
	roadWorks RoadWorksContainerExtended OPTIONAL,
	roadWorks RoadWorksContainerExtended OPTIONAL,
@@ -102,27 +102,8 @@ AlacarteContainer ::= SEQUENCE {
	...
	...
}
}


 ActionID ::= SEQUENCE {

  originatorStationID StationID,
  sequenceNumber SequenceNumber
 }

 SequenceNumber ::=	INTEGER (0..65535)

defaultValidity INTEGER ::= 600
defaultValidity INTEGER ::= 600


 ValidityDuration ::=	INTEGER { timeOfDetection(0), oneSecondAfterDetection(1) } (0..86400)
Termination ::= ENUMERATED {isCancellation(0), isNegation (1)}
 
 Traces ::= SEQUENCE SIZE(0..7) OF PathHistory
    
 ItineraryPath ::= SEQUENCE SIZE(0..40) OF ReferencePosition
 
 TransmissionInterval ::= INTEGER { oneMilliSecond(1), tenSeconds(10000) } (1..10000)
 
 RelevanceDistance ::= ENUMERATED { lessThan50m(0)
, lessThan100m(1), lessThan200m(2), lessThan500m(3), lessThan1000m(4), lessThan5km(5), lessThan10km(6), over10km(7) }
  
 RelevanceTrafficDirection ::= ENUMERATED { unavailable(0), upstreamTraffic(1), downstreamTraffic(2), allTrafficDirection(3) }
 
 
END
END
 No newline at end of file