Commit b9533470 authored by berge's avatar berge
Browse files

Removed some of STF405 comments to produce a cleaner version

parent ef741764
Loading
Loading
Loading
Loading
+0 −64
Original line number Original line Diff line number Diff line
@@ -56,10 +56,7 @@ CoopAwareness ::= SEQUENCE {
	VehicleParameters ::= SEQUENCE {
	VehicleParameters ::= SEQUENCE {
	 referencePosition ReferencePositionVehicle,
	 referencePosition ReferencePositionVehicle,


	-- a Parameter list that has optional and mandatory entries depending on the profile of the 
	-- ITS station, this is defined in a separate document
	-- STF405: replace taggedList with profile as described in chapter 7.2
	-- STF405: replace taggedList with profile as described in chapter 7.2
	-- taggedList	SET SIZE(0..32) OF TaggedValue,
	 vehicleCommonParameters	VehicleCommonParameters,
	 vehicleCommonParameters	VehicleCommonParameters,
	 profileDependent 			ProfileParameters OPTIONAL,
	 profileDependent 			ProfileParameters OPTIONAL,
	 ...
	 ...
@@ -72,49 +69,6 @@ ProfileParameters ::= CHOICE {
    ...
    ...
}
}



-- STF405: replaced by the different profiles BasicVehicle, EmergencyVehicle and PublicTransportVehicle. Also removed tags
--TaggedValue ::= CHOICE {
--	 vehicleType           			 [1] VehicleType,
--	 publicVehicleType     			 [2] PublicVehicleType,
--	 lightBarInUse         			 [3] LightBarInUse,
--	 sireneInUse           			 [4] SireneInUse,
--	 emergencyResponseType 			 [5] EmergencyResponseType,
--	 stationLength         			 [6] StationLength,
--	 stationLengthConfidence		 [7] Confidence,
--	 stationWidth          			 [8] StationWidth,
--	 stationWidthConfidence			 [9] Confidence,
--	 vehicleSpeed          			[10] VehicleSpeed,
--	 vehicleSpeedConfidence			[11] Confidence,
--	 longAcceleration      			[12] LongAcceleration,
--	 longAccelConfidence   			[13] Confidence,
--	 yawRate               			[14] YawRate,
--	 yawRateConfidence     			[15] Confidence,
--	 accelerationControl   			[16] AccelerationControl,
--	 exteriorLights        			[17] ExteriorLights,
--	 causeCode             			[18] CauseCode,
--	 ambientAirTemperature 			[19] AmbientAirTemperature,
--	 speed                 			[20] Speed,
--	 pTLineDescription     			[22] PTLineDescription,
--	 turnAdvice            			[23] TurnAdvice,
--	 distanceToStopLine    			[24] DistanceToStopLine,
--	 distanceToStoLineConfidence	[25] Confidence,
--	 occupancy             			[26] Occupancy,
--	 scheduleDeviation    			[27] ScheduleDeviation,
--	 trafficLightPriority 			[28] TrafficLightPriority,
--	 doorOpen            			[29] DoorOpen,
--	 dataReference       			[30] DataReference,
--	 posConfidenceElli   			[31] PosConfidenceEllipse,
--	 curvature           			[32] Curvature,
--	 curvatureGradient     			[33] CurvatureGradient,
--	 curvatureConfidence   			[34] Confidence,
--	 wiperSystemFront      			[35] WiperSystemFront,
--	 crashStatus           			[36] CrashStatus,
--	 headingConfidence     			[37] Confidence,
--	 dangerousGoods			 		[38] DangerousGoods,
--	 ...
--	}

-- STF405: introduced as replacement for TaggedValue to reflect the profiles
-- STF405: introduced as replacement for TaggedValue to reflect the profiles
VehicleCommonParameters ::= SEQUENCE {
VehicleCommonParameters ::= SEQUENCE {
     vehicleType                     VehicleType,
     vehicleType                     VehicleType,
@@ -246,18 +200,12 @@ Occupancy ::= INTEGER (0..255)


PosConfidenceEllipse ::= SEQUENCE {
PosConfidenceEllipse ::= SEQUENCE {
-- STF405: changed type from PositionConfidence to Confidence
-- STF405: changed type from PositionConfidence to Confidence
--  semiMajorConfidence   PositionConfidence,   
  semiMajorConfidence   Confidence,   -- confidence of the ellipse's major semi-axes
  semiMajorConfidence   Confidence,   -- confidence of the ellipse's major semi-axes
-- STF405: changed type from PositionConfidence to Confidence
-- STF405: changed type from PositionConfidence to Confidence
--  semiMinorConfidence   PositionConfidence,   
  semiMinorConfidence   Confidence,   -- confidence of the ellipse's minor semi-axes
  semiMinorConfidence   Confidence,   -- confidence of the ellipse's minor semi-axes
  semiMajorOrientation   Direction
  semiMajorOrientation   Direction
} 
} 


-- STF405: deleted as there is not need for this special type, all occurencies can be expressed directly by using Confidence
--PositionConfidence ::= Confidence 
-- 2^PositionConfidence * 0.1m 

Priority ::= INTEGER(0..7) 
Priority ::= INTEGER(0..7) 


PTLineDescription ::= SEQUENCE {
PTLineDescription ::= SEQUENCE {
@@ -273,29 +221,18 @@ ReferencePositionVehicle ::= SEQUENCE {
  longitude Longitude,
  longitude Longitude,
  latitude Latitude,
  latitude Latitude,
  elevation Elevation,
  elevation Elevation,
-- STF405: changed optionality due to type splitting
--  heading [1] Direction OPTIONAL,
  heading Direction,
  heading Direction,
  streetName StreetName OPTIONAL,
  streetName StreetName OPTIONAL,
-- STF405: changed optionality due to type splitting
--  positionConfidence [3] PositionConfidence OPTIONAL, 
  positionConfidence Confidence,
  positionConfidence Confidence,
-- STF405: changed optionality due to type splitting
--  elevationConfidence [4] Confidence OPTIONAL, 
  elevationConfidence Confidence,
  elevationConfidence Confidence,
  roadSegmentID RoadSegmentID OPTIONAL
  roadSegmentID RoadSegmentID OPTIONAL
}
}



ReferencePositionIrs ::= SEQUENCE {
ReferencePositionIrs ::= SEQUENCE {
  longitude Longitude,
  longitude Longitude,
  latitude Latitude,
  latitude Latitude,
  elevation Elevation,
  elevation Elevation,
-- STF405: removed heading and confidence elements due to type splitting
--  heading [1] Direction OPTIONAL,
  streetName StreetName OPTIONAL,
  streetName StreetName OPTIONAL,
--  positionConfidence [3] PositionConfidence OPTIONAL, 
--  elevationConfidence [4] Confidence OPTIONAL, 
  roadSegmentID RoadSegmentID OPTIONAL
  roadSegmentID RoadSegmentID OPTIONAL
}
}


@@ -361,7 +298,6 @@ WiperSystemFront ::= ENUMERATED {
}
}


-- STF405: changed
-- STF405: changed
-- YawRate ::= INTEGER (-32765..32765) 
YawRate ::= SEQUENCE {
YawRate ::= SEQUENCE {
  isLeft BOOLEAN,                 	-- true if yaw is to the left
  isLeft BOOLEAN,                 	-- true if yaw is to the left
  yawRate  INTEGER (0..32765)  		-- multiples of 0.01deg/s
  yawRate  INTEGER (0..32765)  		-- multiples of 0.01deg/s
+2 −103
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ DenmPdu ::= SEQUENCE {




--STF405: doubled defined, renamed
--STF405: doubled defined, renamed
--DecentralizedSituation ::= SEQUENCE {
DecentralizedEnvironmentalNotificationMessage ::= SEQUENCE {
DecentralizedEnvironmentalNotificationMessage ::= SEQUENCE {
	
	
	management	DecentralizedSituationManagement,	--  container with DEN management and version control
	management	DecentralizedSituationManagement,	--  container with DEN management and version control
@@ -38,7 +37,6 @@ DecentralizedSituationManagement::= SEQUENCE {
	-- version of the DENM indicating updates from the same originator ITS station; value of 255 is used for the  cancellation message sent from the originator ITS station
	-- version of the DENM indicating updates from the same originator ITS station; value of 255 is used for the  cancellation message sent from the originator ITS station
	
	
	-- STF405: changed inline definition to explicit
	-- STF405: changed inline definition to explicit
	-- dataVersion	INTEGER(0..255),
	dataVersion	DataVersion,  	-- 1 byte
	dataVersion	DataVersion,  	-- 1 byte
	-- time when the DENM is deleted from the DEN management and the information related to the event is set as invalid.. If it is not provided, it indicates that the expiry time is unkown by the originator ITS station	
	-- time when the DENM is deleted from the DEN management and the information related to the event is set as invalid.. If it is not provided, it indicates that the expiry time is unkown by the originator ITS station	
	expiryTime	TimeStamp  	OPTIONAL, 	-- 6 byte
	expiryTime	TimeStamp  	OPTIONAL, 	-- 6 byte
@@ -66,21 +64,17 @@ DecentralizedSituation::= SEQUENCE {
		eventmobility	BOOLEAN,
		eventmobility	BOOLEAN,
		-- whether the event is caused by the originator ITS station, set to TRUE if it is the case. FALSE if it is a location that may cause danger
		-- whether the event is caused by the originator ITS station, set to TRUE if it is the case. FALSE if it is a location that may cause danger
-- STF405: changed type to be more self explaining
-- STF405: changed type to be more self explaining
--		causeType	BOOLEAN,
		causeType   ENUMERATED { itsStation, geographicalRegion },
		causeType   ENUMERATED { itsStation, geographicalRegion },
		-- whether the event is physicalling relevant to the  receiving ITS station.. Set to TRUE if it is the case
		-- whether the event is physicalling relevant to the  receiving ITS station.. Set to TRUE if it is the case
-- STF405: changed type to be more self explaining
-- STF405: changed type to be more self explaining
--		relevant	BOOLEAN,
        relevant ENUMERATED {physicallyRelevant, difficultDrivingConditions },
        relevant ENUMERATED {physicallyRelevant, difficultDrivingConditions },
		-- whether the event is time critical road safety event, set to TRUE if it is the case.
		-- whether the event is time critical road safety event, set to TRUE if it is the case.
		timeCritacality	BOOLEAN,
		timeCritacality	BOOLEAN,
		-- more characteristics may be added. 	
		-- more characteristics may be added. 	
		...
		...
	} OPTIONAL,
	} OPTIONAL,
	-- tagged list to provide supplementary information  describing the event, may include DEs and EFs definied in [i.6] or [6]		
		
	-- STF405: changed to profile based on the changes in the CAM module
	-- STF405: changed to profile based on the changes in the CAM module
	-- taggedList	SET SIZE(0..32) OF TaggedList OPTIONAL 
	-- optional taggedlist with TaggedValue  OPTIONAL
	vehicleCommonParameters	VehicleCommonParameters OPTIONAL,
	vehicleCommonParameters	VehicleCommonParameters OPTIONAL,
	profile ProfileParameters    OPTIONAL
	profile ProfileParameters    OPTIONAL
}
}
@@ -90,7 +84,6 @@ DecentralizedSituationLocation::= SEQUENCE {
	-- STF405: as the eventPosition CHOICe is extensible the EventArea type can be added when needed
	-- STF405: as the eventPosition CHOICe is extensible the EventArea type can be added when needed
	eventPosition	CHOICE	{
	eventPosition	CHOICE	{
		-- the geographical position of the reference position 
		-- the geographical position of the reference position 
--		refPosition	RefPosition,	
		refPosition	ReferencePositionVehicle,	
		refPosition	ReferencePositionVehicle,	
		...
		...
	},
	},
@@ -107,49 +100,19 @@ DecentralizedSituationLocation::= SEQUENCE {
	...
	...
}
}



--STF405: changed MessageID to inline definition, as in CAM
--MessageID ::=  	INTEGER (0..255) 

--STF405: uses imported TimeStamp type instead as this is actually referenced, LongTimeStamp never
--LongTimeStamp ::=	INTEGER (0.. 281474976710655)		

ActionID ::= SEQUENCE {
ActionID ::= SEQUENCE {
	stationID 	StationID,	-- a 4 byte value
	stationID 	StationID,	-- a 4 byte value
	sequenceNo 	SequenceNo	-- a 2 byte value
	sequenceNo 	SequenceNo	-- a 2 byte value
}
}


--STF405: STRING not a valid ASN.1 type, using the CAM definition
--StationID ::=	STRING 		
-- station ID of the DENM originator ITS station	

SequenceNo ::=	INTEGER (0..65535)		-- increased by 1 each time a new event is detected by the same ITS  station.
SequenceNo ::=	INTEGER (0..65535)		-- increased by 1 each time a new event is detected by the same ITS  station.


-- STF405: changed to INTEGER as ENUMERATED is not applicable for handling
-- STF405: changed to INTEGER as ENUMERATED is not applicable for handling
-- DataVersion ::= ENUMERATED {
-- 	firstVersion	(0),
-- 	secondVersion	(1),
-- 	cancellation	(255),
-- 	...
-- }
DataVersion ::= INTEGER {firstVersion(0),secondVersion(1),cancellation(255) } (0..255)
DataVersion ::= INTEGER {firstVersion(0),secondVersion(1),cancellation(255) } (0..255)


--STF405: removed as is expressed already in TimeStamp which is referenced only, furthermore OPTIONAL is syntactically incorrect
--LongTimeStamp ::=	INTEGER (0.. 281474976710655) 	OPTIONAL
-- 6byte, units of milliseconds.

Frenquency ::=	INTEGER (0..255)
Frenquency ::=	INTEGER (0..255)


-- STF405: no need for explicit type
--Reliability ::=	INTEGER (0..100)	
--7 bit

-- STF405: no need for explicit type
-- IsNegation ::=	BOOLEAN	
--1 bit

--STF405: removed OPTIONAL, as it is syntactically incorrect
--STF405: removed OPTIONAL, as it is syntactically incorrect
--TrafficFlowEffect ::= 	INTEGER(0..7)	OPTIONAL
TrafficFlowEffect ::= 	INTEGER {
TrafficFlowEffect ::= 	INTEGER {
    trafficFlowUnknown(1), 
    trafficFlowUnknown(1), 
    freeTrafficFlow(2),
    freeTrafficFlow(2),
@@ -166,38 +129,17 @@ Situation ::= SEQUENCE {
}
}


-- STF405: Changed to INTEGER as it allows to use cause codes in [3]
-- STF405: Changed to INTEGER as it allows to use cause codes in [3]
-- CauseCode ::= ENUMERATED  

-- 1 to 100 indicates causecode defined within [3]
-- 1 to 100 indicates causecode defined within [3]
-- 101 – 255 indicates causecode without being defined by [3]
-- 101 – 255 indicates causecode without being defined by [3]

-- {
--	reserved		(0),
--	dangerousDriving	(101),
--	intersectionViolation	(102),
--	vehicleProblem	(103),
--	intersectionCollision	(104),
--	hazardousLocation	(105),
--	...
--}
CauseCode ::= INTEGER {reserved(0),dangerousDriving(101),intersectionViolation(102),vehicleProblem(103),intersectionCollision(104),hazardousLocation(105) } (0..255)
CauseCode ::= INTEGER {reserved(0),dangerousDriving(101),intersectionViolation(102),vehicleProblem(103),intersectionCollision(104),hazardousLocation(105) } (0..255)


-- STF405: changed type as it seems more applicable
-- STF405: changed type as it seems more applicable
-- SubCauseCode ::= ENUMERATED
-- {
-- 	unknown		(0),
-- 	subCauseCode1	(1),
-- 	subCauseCode2	(2),
-- 	...
-- }													
SubCauseCode ::= INTEGER {unknown(0)} (0..255)
SubCauseCode ::= INTEGER {unknown(0)} (0..255)


--STF405: removed OPTIONAL, as it is syntactically incorrect
--STF405: removed OPTIONAL, as it is syntactically incorrect
--LinkedCause ::= 	Situation		OPTIONAL
LinkedCause ::= 	Situation
LinkedCause ::= 	Situation


--STF405: renamed to Severity
--STF405: renamed to Severity
--LongTimeStamp ::= ENUMERATED...
Severity ::= ENUMERATED 		-- 1 byte
Severity ::= ENUMERATED 		-- 1 byte
{
{
	informative		(1), 
	informative		(1), 
@@ -209,55 +151,13 @@ Severity ::= ENUMERATED -- 1 byte
	highestDanger	(4)		--danger level 3: 
	highestDanger	(4)		--danger level 3: 
}
}


--STF405: no need for explicit type
--EventCharact ::= SEQUENCE	
-- 1 byte
--{
-- whether the detected event is in mobility (moving vehicle) or static
--	mobility		BOOLEAN,
-- whether the detected event is an ITS station, or is a geographical region
-- causeType		BOOLEAN,
-- whether the detected event is physically relevant to the received ITS stations (accident) or describing difficult driving conditions (fog on the road)
-- relevant	BOOLEAN,
-- whether a detected event is time critical (e.g., electronic braking light) or not (e.g. fog on the road)
--	timeCriticality	BOOLEAN,
--	...
--}

--STF405: The CAM definition is used instead, removed OPTIONAL, as it is syntactically incorrect
-- TaggedList ::= SEQUENCE
-- {
-- 	...
-- }

--STF405: replaced by imported type from CAM
--RefPosition ::= SEQUENCE {
--	situationLat	Latitude,  
--	situationLong	Longitude,  
--	situationAlt	Altitude,
--	accuracy	PositionAccuracy,	
--	speed	Speed	OPTIONAL,	
--	direction	Direction	OPTIONAL
--}

Altitude ::= INTEGER (-10000..16767215) 	-- multiples of 0.1 m
Altitude ::= INTEGER (-10000..16767215) 	-- multiples of 0.1 m


PositionAccuracy ::= OCTET STRING (SIZE(4))	
PositionAccuracy ::= OCTET STRING (SIZE(4))	


--STF405: removed Direction, as it is imported from CAM
--Direction ::= INTEGER{north(0), east(7200), south(14400), west(21600)} (0..28799)

--STF405: removed OPTIONAL, as it is syntactically incorrect
--STF405: removed OPTIONAL, as it is syntactically incorrect
Speed ::= INTEGER (-32765..32765)	 -- multiples of 0.01 m/s 
Speed ::= INTEGER (-32765..32765)	 -- multiples of 0.01 m/s 


--STF405: no need for explicit type
--LocationRef ::=	CHOICE {
	-- consequence position of the trace location referencing mechanism
--	trace	[0]	TraceLocData,
	-- more location referencing mechanism to be added
--	...
--}

TraceLocData ::=	SEQUENCE {
TraceLocData ::=	SEQUENCE {
	--3 bits, identifier of the trace
	--3 bits, identifier of the trace
	traceID	INTEGER(0 .. 7),	
	traceID	INTEGER(0 .. 7),	
@@ -270,7 +170,6 @@ Waypoint ::= SEQUENCE{
	ptLat 	Latitude,							--a 4 bytes value 
	ptLat 	Latitude,							--a 4 bytes value 
	ptLong 	Longitude,						--a 4 bytes value
	ptLong 	Longitude,						--a 4 bytes value
--STF405: type name is made consistent with CAM definitions
--STF405: type name is made consistent with CAM definitions
--	ptAlt 	Altitude,
	ptAlt 	Elevation,
	ptAlt 	Elevation,
	...
	...
	--STF405: removed repetition
	--STF405: removed repetition