Commit 1bfcdc2f authored by kovacsa's avatar kovacsa
Browse files

updated eventPosition

parent 239fb5e8
Loading
Loading
Loading
Loading
+14 −6
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ DEFINITIONS AUTOMATIC TAGS ::=
BEGIN

IMPORTS 
    ItsPduHeader, Latitude, Longitude, Elevation, VehicleCommonParameters, ProfileParameters, StationID, TimeStamp, ReferencePositionVehicle 
    ItsPduHeader, Latitude, Longitude, Elevation, Speed, VehicleCommonParameters, ProfileParameters, StationID, TimeStamp, ReferencePositionVehicle 
FROM CAM-PDU-Descriptions { itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102637) cam (2) version1 (1) };

--STF405: all unnecessary tags have been removed
@@ -84,7 +84,7 @@ DecentralizedSituationLocation::= SEQUENCE {
	-- STF405: as the eventPosition CHOICe is extensible the EventArea type can be added when needed
	eventPosition	CHOICE	{
		-- the geographical position of the reference position 
		refPosition	ReferencePositionVehicle,	
		eventPositionCurrentDefinition	EventPosition,
		...
	},
	-- description of  the relevance area for the  DENM dissemination
@@ -100,6 +100,13 @@ DecentralizedSituationLocation::= SEQUENCE {
	...
}

--STF405: created following EventPosition definition, as requested by WG1
EventPosition ::= SEQUENCE {
		refPosition	ReferencePositionVehicle,
		eventSpeed	Speed OPTIONAL	-- event speed, either equal to or different from the vehicle speed
}

		
ActionID ::= SEQUENCE {
	stationID 	StationID,	-- a 4 byte value
	sequenceNo 	SequenceNo	-- a 2 byte value
@@ -110,7 +117,8 @@ SequenceNo ::= INTEGER (0..65535) -- increased by 1 each time a new event is de
-- STF405: changed to INTEGER as ENUMERATED is not applicable for handling
DataVersion ::= INTEGER {firstVersion(0),secondVersion(1),cancellation(255) } (0..255)

Frenquency ::=	INTEGER (0..255)
--STF405: removed the (mis-spelled) Frenquency type, as it has been unused, because frequency field uses an inline definition instead
-- Frenquency ::=	INTEGER (0..255)

--STF405: removed OPTIONAL, as it is syntactically incorrect
TrafficFlowEffect ::= 	INTEGER {
@@ -136,8 +144,8 @@ CauseCode ::= INTEGER {reserved(0),dangerousDriving(101),intersectionViolation(1
-- STF405: changed type as it seems more applicable
SubCauseCode ::= INTEGER {unknown(0)} (0..255)

--STF405: removed OPTIONAL, as it is syntactically incorrect
LinkedCause ::= 	Situation
--STF405: removed LinkedCause definition, as it is not used anywhere (linkedCause field directly invokes Situation type)
-- LinkedCause ::= 	Situation

--STF405: renamed to Severity
Severity ::= ENUMERATED 		-- 1 byte
@@ -151,7 +159,7 @@ Severity ::= ENUMERATED -- 1 byte
	highestDanger	(4)		--danger level 3: 
}

--STF405: removed following three definitions, which are now redundant (and have been inconsistent with CAM anyway)
--STF405: removed following three definitions, which are now redundant (and have been partly inconsistent with CAM anyway)
-- Altitude ::= INTEGER (-10000..16767215) 
-- PositionAccuracy ::= OCTET STRING (SIZE(4))	
-- Speed ::= INTEGER (-32765..32765)