Commit 6018ec33 authored by kovacsa's avatar kovacsa
Browse files

asn cleanup and ReferencePosition update

parent 5c9dcdae
Loading
Loading
Loading
Loading
+9 −37
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ ItsPduHeader ::= SEQUENCE {

CoopAwareness ::= SEQUENCE {

    -- STF405: introduced type StationID
	stationID	StationID,

	-- Basic characterization of an ITS station. A more detailed classification can be given by VehicleType.
	stationCharacteristics	SEQUENCE {
		mobileItsStation			BOOLEAN,	-- will ITS station change position?
		privateItsStation			BOOLEAN,	-- not public authority
@@ -37,25 +37,15 @@ CoopAwareness ::= SEQUENCE {
		...
	},
	
	-- Basic characterization of an ITS station. A more detailed classification can be given by VehicleType.
	camParameters CHOICE {
	 irs IrsParameters,
	 vehicle VehicleParameters
	},
	referencePosition ReferencePosition,
	camParameters CamParameters OPTIONAL, -- presently omitted for Irs
	
   ...
}

	IrsParameters ::= SEQUENCE {
	 referencePositionIrs ReferencePositionIrs,
	 ...
	}
	
	
	VehicleParameters ::= SEQUENCE {
	 referencePositionVehicle ReferencePositionVehicle,
	
	-- STF405: replace taggedList with profile as described in chapter 7.2
	CamParameters ::= SEQUENCE {
	 vehicleCommonParameters	VehicleCommonParameters,
	 profileDependent 		ProfileParameters OPTIONAL,
	 ...
@@ -68,8 +58,6 @@ ProfileParameters ::= CHOICE {
    ...
}

-- STF405: introduced as replacement for TaggedValue to reflect the profiles
-- STF405: added yawRate at longAcceleration/yawRate confidence fields to the common parameters
VehicleCommonParameters ::= SEQUENCE {
     vehicleType                     VehicleType,
     stationLength                   StationLength,
@@ -99,7 +87,6 @@ VehicleCommonParameters ::= SEQUENCE {
}


-- STF405: introduced as replacement for TaggedValue to reflect the profiles
BasicVehicle ::= SEQUENCE {
     ...
}
@@ -111,7 +98,6 @@ EmergencyVehicle ::= SEQUENCE {
     ...
}

-- STF405: introduced as replacement for TaggedValue to reflect the profiles
PublicTransportVehicle ::= SEQUENCE {
     publicVehicleType              PublicVehicleType,
     pTLineDescription              PTLineDescription OPTIONAL,
@@ -204,9 +190,7 @@ Longitude ::= SEQUENCE {
Occupancy ::= INTEGER (0..255) 

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

PublicVehicleType ::= INTEGER(0..255) 

--STF405: splitted ReferencePosition to ReferencePositionVehicle/ReferencePositionIRS for conditionality handling. Also, tags have been removed.
ReferencePositionVehicle ::= SEQUENCE {
  longitude Longitude,
  latitude Latitude,
  elevation Elevation,
  heading Direction,
  streetName StreetName OPTIONAL,
  positionConfidence Confidence,
  elevationConfidence Confidence,
  roadSegmentID RoadSegmentID OPTIONAL
}

ReferencePositionIrs ::= SEQUENCE {
ReferencePosition ::= SEQUENCE {
  longitude Longitude,
  latitude Latitude,
  elevation Elevation,
  heading Direction OPTIONAL, --present if mobileItsStation flag is TRUE
  streetName StreetName OPTIONAL,
  positionConfidence Confidence OPTIONAL, --present if mobileItsStation flag is TRUE
  elevationConfidence Confidence OPTIONAL, --present if mobileItsStation flag is TRUE
  roadSegmentID RoadSegmentID OPTIONAL
}


RoadSegmentID ::= INTEGER (0..99999999) 

RouteRef ::= IA5String(SIZE(0..32)) 
@@ -259,7 +233,6 @@ SireneInUse ::= SimpleSystemState

Speed ::= INTEGER (-32765..32765)  -- multiples of 0.01 m/s 

-- STF405: introduced
StationID ::=   INTEGER(0..4294967295)

StationLength ::= Dimension 
@@ -302,7 +275,6 @@ WiperSystemFront ::= ENUMERATED {
  washerActive (4)
}

-- STF405: changed
YawRate ::= SEQUENCE {
  yawDirection ENUMERATED { left (0), right (1) },
  yawRateValue  INTEGER (0..32765)  		-- multiples of 0.01deg/s
+4 −34
Original line number Diff line number Diff line
@@ -7,11 +7,9 @@ DEFINITIONS AUTOMATIC TAGS ::=
BEGIN

IMPORTS 
    ItsPduHeader, Latitude, Longitude, Elevation, Speed, VehicleCommonParameters, ProfileParameters, StationID, TimeStamp, ReferencePositionVehicle 
    ItsPduHeader, Latitude, Longitude, Elevation, Speed, VehicleCommonParameters, ProfileParameters, StationID, TimeStamp, ReferencePosition 
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


DenmPdu ::= SEQUENCE {
	header	ItsPduHeader,	
@@ -19,8 +17,6 @@ DenmPdu ::= SEQUENCE {

}


--STF405: doubled defined, renamed
DecentralizedEnvironmentalNotificationMessage ::= SEQUENCE {
	
	management	DecentralizedSituationManagement,	--  container with DEN management and version control
@@ -36,7 +32,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
	
	-- STF405: changed inline definition to explicit
	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	
	expiryTime	TimeStamp  	OPTIONAL, 	-- 6 byte
@@ -63,33 +58,27 @@ DecentralizedSituation::= SEQUENCE {
		-- event mobility description, set to TRUE if the event is in mobility 
		eventmobility	BOOLEAN,
		-- whether the event is caused by the originator ITS station
-- STF405: changed type to be more self explaining
		causeType   ENUMERATED { itsStation, geographicalRegion },
		-- whether the event is physicalling relevant to the  receiving ITS station.
-- STF405: changed type to be more self explaining
		relevance ENUMERATED {physicallyRelevant, difficultDrivingConditions },
		-- whether the event is time critical road safety event, set to TRUE if it is the case.
		timeCriticality	BOOLEAN,
		-- more characteristics may be added. 	
		-- more characteristics may be added in future.
		...
	} OPTIONAL,
		
	-- STF405: changed to profile based on the changes in the CAM module
	vehicleCommonParameters	VehicleCommonParameters OPTIONAL,
	profile ProfileParameters    OPTIONAL
}

DecentralizedSituationLocation::= SEQUENCE {
	-- description of the event position
	-- STF405: as the eventPosition CHOICe is extensible the EventArea type can be added when needed
	eventPosition	CHOICE	{
		-- the geographical position of the reference position 
		eventPositionCurrentDefinition	EventPosition,
		...
	},
	-- description of  the relevance area for the  DENM dissemination
	--STF405:  changed DecentralizedSituationLocation to extensible SEQUENCE, so that definition of RelevanceArea can be added when needed!
	--relevanceArea	RelevanceArea,
	-- location referencing of the event position
	locationRef	CHOICE {
		-- consequence position of the trace location referencing mechanism
@@ -100,9 +89,8 @@ DecentralizedSituationLocation::= SEQUENCE {
	...
}

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

@@ -114,13 +102,8 @@ ActionID ::= SEQUENCE {

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
DataVersion ::= INTEGER {firstVersion(0),secondVersion(1),cancellation(255) } (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 (0..7)

Situation ::= SEQUENCE {
@@ -128,18 +111,12 @@ Situation ::= SEQUENCE {
	subCause	SubCauseCode	-- 1 byte
}

-- STF405: Changed to INTEGER as it allows to use cause codes in [3]
-- 1 to 100 indicates causecode defined within [3]
-- 101 – 255 indicates causecode without being defined by [3]
CauseCode ::= INTEGER {reserved(0),dangerousDriving(101),intersectionViolation(102),vehicleProblem(103),intersectionCollision(104),hazardousLocation(105) } (0..255)

-- STF405: changed type as it seems more applicable
SubCauseCode ::= INTEGER {unknown(0)} (0..255)

--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
{
	informative		(1), 
@@ -151,11 +128,6 @@ Severity ::= ENUMERATED -- 1 byte
	highestDanger	(4)		--danger level 3: 
}

--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)

TraceLocData ::=	SEQUENCE {
	--3 bits, identifier of the trace
	traceID	INTEGER(0 .. 7),	
@@ -167,10 +139,8 @@ Waypoint ::= SEQUENCE{
	--  waypoint positions included in the trace.	
	ptLat 	Latitude,							--a 4 bytes value 
	ptLong 	Longitude,						--a 4 bytes value
--STF405: type name is made consistent with CAM definitions
	ptAlt 	Elevation,
	...
	--STF405: removed repetition
}

END