Commit 714cb9e5 authored by YannGarcia's avatar YannGarcia
Browse files

Rebuild AtsIS based on TITAN iso-patch

parent ff13e445

iso-patched/AddGrpC.asn

+9 −12
Changes for iso-patched/AddGrpC.asn: 9 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -26,18 +26,10 @@ AddGrpC { 
DEFINITIONS AUTOMATIC TAGS::= BEGIN



IMPORTS

NodeOffsetPointXY, NodeSetXY, PrioritizationResponseStatus, SignalGroupID, DeltaTime, LaneID, LaneConnectionID, FuelType, VehicleHeight

FROM DSRC-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-nocurcular (12) version (2) }



DeltaTime, FuelType, IntersectionID, LaneConnectionID, SignalGroupID, VehicleHeight

FROM DSRC { 

  iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc (2) version2 (2)

}



LaneID, NodeOffsetPointXY, NodeSetXY, PrioritizationResponseStatus

FROM DSRC-noCircular { 

  iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-nocurcular (12) version2 (2)

}



Altitude, DeltaAltitude, StationID, VehicleMass

Altitude, StationID, DeltaAltitude, VehicleMass

FROM ITS-Container { itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (2) };



-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -76,12 +68,14 @@ MovementEvent-addGrpC ::= SEQUENCE { 
	...

}



/*FIXME RGY moved to AddGrpC-noCircular to cut circular import loop

NodeAttributeSet-addGrpC  ::=	SEQUENCE {

  ptvRequest  PtvRequestType  OPTIONAL,

  nodeLink    NodeLink        OPTIONAL,

  node        Node            OPTIONAL,

  ...

}

*/



Position3D-addGrpC ::=	SEQUENCE {

  altitude  Altitude,
@@ -106,7 +100,6 @@ SignalStatusPackage-addGrpC ::= SEQUENCE { 
	...

}





-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-- Data frames

-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -121,6 +114,7 @@ ItsStationPosition ::= SEQUENCE { 


ItsStationPositionList ::=	SEQUENCE SIZE(1..5) OF ItsStationPosition



/*FIXME YGA Moved to DSRC-REGION_noCircular to cut circular import loop

Node ::= SEQUENCE {

  id              INTEGER,

  lane            LaneID           OPTIONAL,
@@ -130,6 +124,7 @@ Node ::= SEQUENCE { 
}



NodeLink ::= SEQUENCE SIZE (1..5) OF Node

*/



PrioritizationResponse ::=	SEQUENCE {

  stationID    StationID,
@@ -189,6 +184,7 @@ ExceptionalCondition ::= ENUMERATED { 
  ...

}



/*FIXME RGY moved to AddGrpC-noCircular to cut circular import loop

PtvRequestType	::= ENUMERATED {

	preRequest,

	mainRequest,
@@ -197,6 +193,7 @@ PtvRequestType ::= ENUMERATED { 
	emergencyRequest,

	...

}

*/



RejectedReason ::= ENUMERATED {

  unknown,

iso-patched/AddGrpC_noCircular.asn

0 → 100644
+34 −0
Changes for iso-patched/AddGrpC_noCircular.asn: 34 added lines, 0 removed lines.
Original line number Diff line number Diff line 
-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-

-- 

-- module: AddGrpC

-- ISO TS 19091 30.08.2016

-- 

-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-

--FIXME RGY definitions are moved here from AddGrpC; created to cut circular import loops amongst ASN.1 files

AddGrpC-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) addgrpc (1) version (1) }





DEFINITIONS AUTOMATIC TAGS::= BEGIN



IMPORTS



PtvRequestType

FROM DSRC-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-nocurcular (12) version (2) };



Control-addGrpC ::=  SEQUENCE {

	ptvRequest			PtvRequestType,

	...

}



/*

PtvRequestType	::= ENUMERATED {

	preRequest,

	mainRequest,

	doorCloseRequest,

	cancelRequest,

	emergencyRequest,

	...

}

*/



END

iso-patched/DSRC.asn

+81 −51
Changes for iso-patched/DSRC.asn: 81 added lines, 51 removed lines.
Original line number Diff line number Diff line
@@ -26,35 +26,38 @@ DSRC { 
DEFINITIONS AUTOMATIC TAGS::= BEGIN



IMPORTS



Longitude, Latitude, StationID

FROM ITS-Container { itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (2) }



Reg-AdvisorySpeed, Reg-ComputedLane, Reg-ConnectionManeuverAssist, Reg-GenericLane,

Reg-IntersectionGeometry, Reg-IntersectionState, Reg-LaneAttributes, Reg-MapData,

Reg-LaneDataAttribute, Reg-MovementEvent, Reg-MovementState,

Reg-NodeAttributeSetXY, Reg-NodeOffsetPointXY, Reg-Position3D, Reg-RequestorDescription, Reg-RequestorType, Reg-RestrictionUserType, Reg-RoadSegment,

Reg-RTCMcorrections, Reg-SignalControlZone, Reg-SignalRequestPackage, Reg-SignalRequest, Reg-SignalStatus, Reg-SignalStatusPackage, Reg-SignalRequestMessage,

Reg-SignalStatusMessage, Reg-SPAT

Reg-SPAT,Reg-SignalRequestMessage, Reg-SignalStatusMessage, Reg-MapData, Reg-AdvisorySpeed, Reg-ComputedLane, Reg-ConnectionManeuverAssist,

Reg-GenericLane, Reg-IntersectionGeometry, Reg-IntersectionState, Reg-LaneAttributes, Reg-MovementEvent, Reg-MovementState, Reg-Position3D,

Reg-RequestorDescription, Reg-RequestorType, Reg-RestrictionUserType, Reg-RoadSegment, Reg-SignalControlZone, Reg-SignalRequestPackage,

Reg-SignalRequest, Reg-SignalStatusPackage, Reg-SignalStatus, Reg-RTCMcorrections

FROM REGION {iso (1) standard (0) signalizedIntersection (19091) profilec (2) region (1) version2 (2)}



NodeAttributeSetXY, NodeAttributeXY, NodeAttributeXYList,

Node-LLmD-64b, Node-XY-20b, Node-XY-22b, Node-XY-24b, Node-XY-26b, Node-XY-28b, Node-XY-32b, NodeListXY, NodeOffsetPointXY, NodeXY, NodeSetXY,

Offset-B09, Offset-B10, Offset-B11, Offset-B12, Offset-B13, Offset-B14, Offset-B16,

SegmentAttributeXY, SegmentAttributeXYList,

SpeedLimitList, RegulatorySpeedLimit, SpeedLimitType,

Velocity, DeltaAngle, RoadwayCrownAngle, MergeDivergeNodeAngle, LaneDataAttribute, LaneDataAttributeList, 

RegionalExtension, RegionId,

LaneID ,DrivenLineOffsetLg, DrivenLineOffsetSm, Angle, Scale-B12, ComputedLane, PrioritizationResponseStatus

FROM DSRC-noCircular {iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-noCircular (12) version2 (2)} 

DeltaAngle, DeltaTime, LaneID, LaneConnectionID, IntersectionID, NodeSetXY, PrioritizationResponseStatus, RegionalExtension, SignalGroupID, SpeedLimitList,

Velocity, NodeOffsetPointXY, NodeAttributeXY, Reg-LaneDataAttribute, Reg-NodeAttributeSetXY, Reg-NodeOffsetPointXY, Offset-B12, Offset-B09, Offset-B10, Node-LLmD-64b, NodeAttributeXYList

FROM DSRC-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-nocurcular (12) version (2) } 



Iso3833VehicleType

FROM ElectronicRegistrationIdentificationVehicleDataModule { iso(1) standard(0) iso24534 (24534) vehicleData (1) version1 (1) };

Iso3833VehicleType FROM ElectronicRegistrationIdentificationVehicleDataModule {iso(1) standard(0) iso24534 (24534) vehicleData (1) version1 (1)}



Longitude, Latitude, StationID FROM ITS-Container { itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (2) }

;



-- -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_

-- Messages

-- -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_



/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

-- Regional extensions support

REG-EXT-ID-AND-TYPE ::= CLASS {

   &id     RegionId UNIQUE,

   &Type

   } WITH SYNTAX {&Type IDENTIFIED BY &id}



RegionalExtension {REG-EXT-ID-AND-TYPE : Set} ::= SEQUENCE {

   regionId     REG-EXT-ID-AND-TYPE.&id( {Set} ),

   regExtValue  REG-EXT-ID-AND-TYPE.&Type( {Set}{@regionId} )

   }

*/



MapData ::= SEQUENCE {

  timeStamp         MinuteOfTheYear OPTIONAL,

  msgIssueRevision  MsgCount,
@@ -111,9 +114,6 @@ SignalStatusMessage ::= SEQUENCE { 
   ...

}









-- -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_

-- Start of entries from table Data_Frames...

-- Data frames
@@ -137,7 +137,7 @@ AntennaOffsetSet ::= SEQUENCE { 
   antOffsetY  Offset-B09,

   antOffsetZ  Offset-B10

   }

/*



ComputedLane ::= SEQUENCE {

   referenceLaneId    LaneID,

   offsetXaxis        CHOICE {
@@ -155,7 +155,6 @@ ComputedLane ::= SEQUENCE { 
             RegionalExtension {{Reg-ComputedLane}} OPTIONAL,

   ...

   }

*/

ConnectsToList ::= SEQUENCE (SIZE(1..16)) OF Connection



ConnectingLane ::= SEQUENCE {
@@ -190,7 +189,6 @@ DataParameters ::= SEQUENCE { 
   ...

}





DDateTime ::= SEQUENCE {

   year    DYear    OPTIONAL,

   month   DMonth   OPTIONAL,
@@ -217,7 +215,6 @@ FullPositionVector ::= SEQUENCE { 
   ...

}





GenericLane ::= SEQUENCE {

   laneID           LaneID,

   name             DescriptiveName OPTIONAL,
@@ -284,7 +281,8 @@ LaneAttributes ::= SEQUENCE { 
  laneType        LaneTypeAttributes,

  regional        RegionalExtension {{Reg-LaneAttributes}} OPTIONAL

}

/*



/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

LaneDataAttribute ::= CHOICE {

    pathEndPointAngle        DeltaAngle,  

    laneCrownPointCenter     RoadwayCrownAngle,
@@ -299,6 +297,7 @@ LaneDataAttribute ::= CHOICE { 


LaneDataAttributeList ::= SEQUENCE (SIZE(1..8)) OF LaneDataAttribute

*/



LaneList ::= SEQUENCE (SIZE(1..255)) OF GenericLane



LaneSharing ::= BIT STRING {
@@ -350,7 +349,8 @@ MovementState ::= SEQUENCE { 
                      RegionalExtension {{Reg-MovementState}} OPTIONAL,

   ...

}

/*



/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

NodeAttributeSetXY ::= SEQUENCE {

   localNode    NodeAttributeXYList OPTIONAL,

   disabled     SegmentAttributeXYList OPTIONAL,
@@ -381,11 +381,13 @@ NodeAttributeXY ::= ENUMERATED { 


NodeAttributeXYList ::= SEQUENCE (SIZE(1..8)) OF NodeAttributeXY



FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

Node-LLmD-64b ::= SEQUENCE {

   lon  Longitude,

   lat  Latitude

   }





   Node-XY-20b ::= SEQUENCE {

   x  Offset-B10,

   y  Offset-B10
@@ -396,25 +398,30 @@ Node-XY-22b ::= SEQUENCE { 
   y  Offset-B11

   }





Node-XY-24b ::= SEQUENCE {

   x  Offset-B12,

   y  Offset-B12

   }





Node-XY-26b ::= SEQUENCE {

   x  Offset-B13,

   y  Offset-B13

   }





Node-XY-28b ::= SEQUENCE {

   x  Offset-B14,

   y  Offset-B14

   }





Node-XY-32b ::= SEQUENCE {

   x  Offset-B16,

   y  Offset-B16

   }

*/



NodeListXY ::= CHOICE {

   nodes     NodeSetXY,
@@ -422,6 +429,7 @@ NodeListXY ::= CHOICE { 
   ...

}



/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

NodeOffsetPointXY ::= CHOICE {

  node-XY1         Node-XY-20b,

  node-XY2         Node-XY-22b,
@@ -441,6 +449,7 @@ NodeXY ::= SEQUENCE { 


NodeSetXY ::= SEQUENCE (SIZE(2..63)) OF NodeXY

*/



OverlayLaneList ::= SEQUENCE (SIZE(1..5)) OF LaneID



PositionalAccuracy ::= SEQUENCE {
@@ -454,7 +463,6 @@ PositionConfidenceSet ::= SEQUENCE { 
   elevation  ElevationConfidence

}





Position3D ::= SEQUENCE {

  lat        Latitude,

  long       Longitude,
@@ -466,7 +474,7 @@ Position3D ::= SEQUENCE { 


PreemptPriorityList ::= SEQUENCE (SIZE(1..32)) OF SignalControlZone



/*

/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

RegulatorySpeedLimit ::= SEQUENCE {

   type        SpeedLimitType, 

   speed       Velocity
@@ -549,7 +557,7 @@ RTCMheader ::= SEQUENCE { 


RTCMmessageList ::= SEQUENCE (SIZE(1..5)) OF RTCMmessage



/*

/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

SegmentAttributeXYList ::= SEQUENCE (SIZE(1..8)) OF SegmentAttributeXY

*/
@@ -623,7 +631,7 @@ SpeedandHeadingandThrottleConfidence ::= SEQUENCE { 
   throttle  ThrottleConfidence

   }



/*   

/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

SpeedLimitList ::= SEQUENCE (SIZE(1..9)) OF RegulatorySpeedLimit



SpeedLimitType ::= ENUMERATED {
@@ -634,9 +642,11 @@ SpeedLimitType ::= ENUMERATED { 
    vehicleMinSpeed,

   vehicleMaxSpeed,

    vehicleNightMaxSpeed,



    truckMinSpeed,

    truckMaxSpeed,

    truckNightMaxSpeed,



    vehiclesWithTrailersMinSpeed,

    vehiclesWithTrailersMaxSpeed,

    vehiclesWithTrailersNightMaxSpeed,
@@ -693,7 +703,7 @@ AllowedManeuvers ::= BIT STRING { 
    reserved1                    (11)

   } (SIZE(12))



--Angle ::= INTEGER (0..28800) 

Angle ::= INTEGER (0..28800)



ApproachID ::= INTEGER (0..15)
@@ -726,9 +736,11 @@ BasicVehicleRole ::= ENUMERATED { 


DDay ::= INTEGER (0..31)



/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

DeltaAngle ::= INTEGER (-150..150) 



DeltaTime ::= INTEGER (-122 .. 121) 

*/



DescriptiveName ::= IA5String (SIZE(1..63))
@@ -740,9 +752,9 @@ DMonth ::= INTEGER (0..12) 


DOffset ::= INTEGER (-840..840)



--DrivenLineOffsetLg ::= INTEGER (-32767..32767) 

DrivenLineOffsetLg ::= INTEGER (-32767..32767)



--DrivenLineOffsetSm ::= INTEGER (-2047..2047) 

DrivenLineOffsetSm ::= INTEGER (-2047..2047)



DSecond ::= INTEGER (0..65535)
@@ -776,8 +788,7 @@ ElevationConfidence ::= ENUMERATED { 
   elev-000-01 (15)

}





FuelType ::= INTEGER (0..15) 

/*FuelType ::= INTEGER (0..15)

   unknownFuel FuelType  ::= 0

   gasoline FuelType     ::= 1

   ethanol FuelType      ::= 2
@@ -787,7 +798,7 @@ FuelType ::= INTEGER (0..15) 
   hydrogen FuelType     ::= 6

   natGasLiquid FuelType ::= 7

   natGasComp FuelType   ::= 8

   propane FuelType      ::= 9

   propane FuelType      ::= 9*/



GNSSstatus ::= BIT STRING {

   unavailable               (0),
@@ -813,7 +824,9 @@ HeadingConfidenceDSRC ::= ENUMERATED { 


HeadingDSRC ::= INTEGER (0..28800)



/*

IntersectionID ::= INTEGER (0..65535)

*/



IntersectionStatusObject ::= BIT STRING {

    manualControlIsEnabled                (0),
@@ -901,7 +914,6 @@ LaneAttributes-TrackedVehicle ::= BIT STRING { 
   spec-otherRailType         (4)

} (SIZE (16))





LaneAttributes-Vehicle ::= BIT STRING {

   isVehicleRevocableLane       (0),

   isVehicleFlyOverLane         (1),
@@ -913,14 +925,18 @@ LaneAttributes-Vehicle ::= BIT STRING { 
   permissionOnRequest          (7)

} (SIZE (8,...))



/*

LaneConnectionID ::= INTEGER (0..255)

*/



LaneDirection ::= BIT STRING {

   ingressPath     (0),

   egressPath      (1)

} (SIZE (2))



--LaneID ::= INTEGER (0..255)

/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

LaneID ::= INTEGER (0..255)

*/



LayerID ::= INTEGER (0..100)
@@ -938,7 +954,9 @@ LayerType ::= ENUMERATED { 


LaneWidth ::= INTEGER (0..32767)



-- MergeDivergeNodeAngle ::= INTEGER (-180..180) 

/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

MergeDivergeNodeAngle ::= INTEGER (-180..180) 

*/



MinuteOfTheYear ::= INTEGER (0..527040)
@@ -956,9 +974,8 @@ MovementPhaseState ::= ENUMERATED { 
}



MsgCount ::= INTEGER (0..127)

/*

Offset-B09 ::= INTEGER (-256..255)



/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

Offset-B10 ::= INTEGER (-512..511)



Offset-B11 ::= INTEGER (-1024..1023)
@@ -971,6 +988,7 @@ Offset-B14 ::= INTEGER (-8192..8191) 


Offset-B16 ::= INTEGER (-32768..32767)

*/



PedestrianBicycleDetect ::= BOOLEAN



PositionConfidence ::= ENUMERATED {
@@ -991,7 +1009,8 @@ PositionConfidence ::= ENUMERATED { 
   a2cm   (14),

   a1cm   (15)

}

/*



/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

PrioritizationResponseStatus ::= ENUMERATED {

   unknown           (0),

   requested         (1),
@@ -1004,6 +1023,7 @@ PrioritizationResponseStatus ::= ENUMERATED { 
   ...

}

*/



PriorityRequestType ::= ENUMERATED {

   priorityRequestTypeReserved (0),

   priorityRequest             (1),
@@ -1012,11 +1032,13 @@ PriorityRequestType ::= ENUMERATED { 
   ...

}



-- RegionId ::= INTEGER (0..255)

/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

RegionId ::= INTEGER (0..255)

  noRegion     RegionId ::= 0

  addGrpA      RegionId ::= 1

  addGrpB      RegionId ::= 2

  addGrpC      RegionId ::= 3

*/



RequestID ::= INTEGER (0..255)
@@ -1082,7 +1104,9 @@ RoadRegulatorID ::= INTEGER (0..65535) 


RoadSegmentID ::= INTEGER (0..65535)



-- RoadwayCrownAngle ::= INTEGER (-128..127) 

/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

RoadwayCrownAngle ::= INTEGER (-128..127) 

*/



RTCMmessage ::= OCTET STRING (SIZE(1..1023))
@@ -1094,11 +1118,13 @@ RTCM-Revision ::= ENUMERATED { 
  ...

}



-- Scale-B12 ::= INTEGER (-2048..2047)

Scale-B12 ::= INTEGER (-2048..2047)



/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

SignalGroupID ::= INTEGER (0..255) 

*/



/*

/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

SegmentAttributeXY ::= ENUMERATED {

   reserved                  ,  

  doNotBlock                ,
@@ -1246,7 +1272,9 @@ TransmissionState ::= ENUMERATED { 
  unavailable  (7)

}



/*

VehicleHeight ::= INTEGER (0..127)

*/



VehicleType ::= ENUMERATED {

   none                 (0),
@@ -1268,7 +1296,9 @@ VehicleType ::= ENUMERATED { 
   ...

}



--Velocity ::= INTEGER (0..8191)

/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

Velocity ::= INTEGER (0..8191)

*/



WaitOnStopline ::= BOOLEAN

iso-patched/DSRC_noCircular.asn

+137 −102
Changes for iso-patched/DSRC_noCircular.asn: 137 added lines, 102 removed lines.
Original line number Diff line number Diff line 
DSRC-noCircular { 

  iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-nocurcular (12) version2 (2)

} 

-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-

-- 

-- module: DSRC

-- ISO TS 19091 30.08.2016

-- 

-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-

--FIXME RGY definitions are moved here from IS-DSRC and IS-REGION; created to cut circular import loops amongst ASN.1 files

DSRC-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-nocurcular (12) version (2) }



DEFINITIONS AUTOMATIC TAGS::= BEGIN 



IMPORTS

Longitude, Latitude FROM ITS-Container { itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (2) }



Longitude, Latitude, StationID

FROM ITS-Container { itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (2) }



Reg-LaneDataAttribute, Reg-NodeAttributeSetXY, Reg-NodeOffsetPointXY, Reg-ComputedLane

FROM REGION  {iso (1) standard (0) signalizedIntersection (19091) profilec(2) region (1) version2 (2)}

--NodeAttributeSet-addGrpC, LaneID FROM AddGrpC-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) addgrpc (0) version (1) }

;



REG-EXT-ID-AND-TYPE ::= CLASS {

  &id     RegionId UNIQUE,

  &Type

} WITH SYNTAX {&Type IDENTIFIED BY &id}

------------------------------------------------------

--FIXME RGY BELOW ARE DEFINITIONS MOVED FROM DSRC

------------------------------------------------------



RegionalExtension {REG-EXT-ID-AND-TYPE : Set} ::= SEQUENCE {

  regionId     REG-EXT-ID-AND-TYPE.&id( {Set} ),

  regExtValue  REG-EXT-ID-AND-TYPE.&Type( {Set}{@regionId} )

}

FuelType ::= INTEGER (0..15)

   unknownFuel FuelType  ::= 0

   gasoline FuelType     ::= 1

   ethanol FuelType      ::= 2

   diesel FuelType       ::= 3

   electric FuelType     ::= 4

   hybrid FuelType       ::= 5

   hydrogen FuelType     ::= 6

   natGasLiquid FuelType ::= 7

   natGasComp FuelType   ::= 8

   propane FuelType      ::= 9



RegionId ::= INTEGER (0..255)

VehicleHeight ::= INTEGER (0..127)



DeltaAngle ::= INTEGER (-150..150)

LaneID ::= INTEGER (0..255)



RoadwayCrownAngle ::= INTEGER (-128..127) 

LaneConnectionID ::= INTEGER (0..255)



MergeDivergeNodeAngle ::= INTEGER (-180..180) 

IntersectionID ::= INTEGER (0..65535)



LaneID ::= INTEGER (0..255)

Node ::= SEQUENCE {

  id              INTEGER,

  lane            LaneID           OPTIONAL,

  connectionID    LaneConnectionID OPTIONAL,

  intersectionID  IntersectionID   OPTIONAL,

  ...

}



DrivenLineOffsetLg ::= INTEGER (-32767..32767) 

NodeLink ::= SEQUENCE SIZE (1..5) OF Node



NodeAttributeSet-addGrpC  ::=	SEQUENCE {

  ptvRequest  PtvRequestType  OPTIONAL,

  nodeLink    NodeLink        OPTIONAL,

  node        Node            OPTIONAL,

  ...

}



DrivenLineOffsetSm ::= INTEGER (-2047..2047) 

PtvRequestType	::= ENUMERATED {

	preRequest,

	mainRequest,

	doorCloseRequest,

	cancelRequest,

	emergencyRequest,

	...

}



Angle ::= INTEGER (0..28800)

DeltaAngle ::= INTEGER (-150..150)



Scale-B12 ::= INTEGER (-2048..2047) 

DeltaTime ::= INTEGER (-122 .. 121)



LaneDataAttribute ::= CHOICE {

    pathEndPointAngle        DeltaAngle,
@@ -55,54 +83,19 @@ LaneDataAttribute ::= CHOICE { 


LaneDataAttributeList ::= SEQUENCE (SIZE(1..8)) OF LaneDataAttribute



ComputedLane ::= SEQUENCE {

  referenceLaneId    LaneID,

  offsetXaxis        CHOICE {

                        small   DrivenLineOffsetSm, 

                        large   DrivenLineOffsetLg

                        },  

  offsetYaxis        CHOICE {

                        small   DrivenLineOffsetSm, 

                        large   DrivenLineOffsetLg

                        },  

  rotateXY           Angle OPTIONAL, 

  scaleXaxis         Scale-B12 OPTIONAL, 

  scaleYaxis         Scale-B12 OPTIONAL, 

  regional  SEQUENCE (SIZE(1..4)) OF 

            RegionalExtension {{Reg-ComputedLane}} OPTIONAL,

  ... 

}



NodeAttributeSetXY ::= SEQUENCE {

  localNode    NodeAttributeXYList OPTIONAL,

  disabled     SegmentAttributeXYList OPTIONAL,

  enabled      SegmentAttributeXYList OPTIONAL,

  data         LaneDataAttributeList OPTIONAL,

  dWidth       Offset-B10 OPTIONAL,

  dElevation   Offset-B10 OPTIONAL,

  regional     SEQUENCE (SIZE(1..4)) OF 

               RegionalExtension {{Reg-NodeAttributeSetXY}} OPTIONAL,

  ...

}

MergeDivergeNodeAngle ::= INTEGER (-180..180)



NodeAttributeXY ::= ENUMERATED {

  reserved,  

  stopLine,

  roundedCapStyleA,

  roundedCapStyleB,

  mergePoint,

  divergePoint,

  downstreamStopLine,

  downstreamStartNode,

  closedToTraffic,

  safeIsland,

  curbPresentAtStepOff,

  hydrantPresent,

  ...

NodeOffsetPointXY ::= CHOICE {

   node-XY1         Node-XY-20b,

   node-XY2         Node-XY-22b,

   node-XY3         Node-XY-24b,

   node-XY4         Node-XY-26b,

   node-XY5         Node-XY-28b,

   node-XY6         Node-XY-32b,

   node-LatLon      Node-LLmD-64b,

   regional         RegionalExtension {{Reg-NodeOffsetPointXY}}

}



NodeAttributeXYList ::= SEQUENCE (SIZE(1..8)) OF NodeAttributeXY



Node-LLmD-64b ::= SEQUENCE {

   lon  Longitude,

   lat  Latitude
@@ -138,22 +131,7 @@ Node-XY-32b ::= SEQUENCE { 
   y  Offset-B16

}



NodeListXY ::= CHOICE {

  nodes     NodeSetXY,

  computed  ComputedLane,

  ...

}



NodeOffsetPointXY ::= CHOICE {

  node-XY1         Node-XY-20b,

  node-XY2         Node-XY-22b,

  node-XY3         Node-XY-24b,

  node-XY4         Node-XY-26b,

  node-XY5         Node-XY-28b,

  node-XY6         Node-XY-32b,

  node-LatLon      Node-LLmD-64b,

  regional         RegionalExtension {{Reg-NodeOffsetPointXY}}

}

NodeSetXY ::= SEQUENCE (SIZE(2..63)) OF NodeXY



NodeXY ::= SEQUENCE {

   delta       NodeOffsetPointXY,
@@ -161,7 +139,35 @@ NodeXY ::= SEQUENCE { 
   ...

}



NodeSetXY ::= SEQUENCE (SIZE(2..63)) OF NodeXY

NodeAttributeSetXY ::= SEQUENCE {

   localNode    NodeAttributeXYList OPTIONAL,

   disabled     SegmentAttributeXYList OPTIONAL,

   enabled      SegmentAttributeXYList OPTIONAL,

   data         LaneDataAttributeList OPTIONAL,

   dWidth       Offset-B10 OPTIONAL,

   dElevation   Offset-B10 OPTIONAL,

   regional     SEQUENCE (SIZE(1..4)) OF 

                RegionalExtension {{Reg-NodeAttributeSetXY}} OPTIONAL,

   ...

}



NodeAttributeXYList ::= SEQUENCE (SIZE(1..8)) OF NodeAttributeXY



NodeAttributeXY ::= ENUMERATED {

   reserved,

   stopLine,

   roundedCapStyleA,

   roundedCapStyleB,

   mergePoint,

   divergePoint,

   downstreamStopLine,

   downstreamStartNode,

   closedToTraffic,

   safeIsland,

   curbPresentAtStepOff,

   hydrantPresent,

   ...

}



Offset-B09 ::= INTEGER (-256..255)
@@ -177,6 +183,42 @@ Offset-B14 ::= INTEGER (-8192..8191) 


Offset-B16 ::= INTEGER (-32768..32767)



PrioritizationResponseStatus ::= ENUMERATED {

   unknown           (0),

   requested         (1),

   processing        (2),

   watchOtherTraffic (3),

   granted           (4),

   rejected          (5),

   maxPresence       (6),

   reserviceLocked   (7),

   ...

}



RegionId ::= INTEGER (0..255)

   noRegion     RegionId ::= 0

   addGrpA      RegionId ::= 1

   addGrpB      RegionId ::= 2

   addGrpC      RegionId ::= 3



REG-EXT-ID-AND-TYPE ::= CLASS {

   &id     RegionId UNIQUE,

   &Type

} WITH SYNTAX {&Type IDENTIFIED BY &id}



RegionalExtension {REG-EXT-ID-AND-TYPE : Set} ::= SEQUENCE {

   regionId     REG-EXT-ID-AND-TYPE.&id( {Set} ),

   regExtValue  REG-EXT-ID-AND-TYPE.&Type( {Set}{@regionId} )

}



RegulatorySpeedLimit ::= SEQUENCE {

   type        SpeedLimitType,

   speed       Velocity

   }



RoadwayCrownAngle ::= INTEGER (-128..127)



SegmentAttributeXYList ::= SEQUENCE (SIZE(1..8)) OF SegmentAttributeXY



SegmentAttributeXY ::= ENUMERATED {

   reserved,
@@ -220,15 +262,10 @@ SegmentAttributeXY ::= ENUMERATED { 
   ...

}



SegmentAttributeXYList ::= SEQUENCE (SIZE(1..8)) OF SegmentAttributeXY

SignalGroupID ::= INTEGER (0..255)



SpeedLimitList ::= SEQUENCE (SIZE(1..9)) OF RegulatorySpeedLimit



RegulatorySpeedLimit ::= SEQUENCE {

  type        SpeedLimitType, 

  speed       Velocity

}



SpeedLimitType ::= ENUMERATED {

    unknown,

    maxSpeedInSchoolZone,
@@ -248,16 +285,14 @@ SpeedLimitType ::= ENUMERATED { 


Velocity ::= INTEGER (0..8191)



PrioritizationResponseStatus ::= ENUMERATED {

  unknown           (0),

  requested         (1),

  processing        (2),

  watchOtherTraffic (3),

  granted           (4),

  rejected          (5),

  maxPresence       (6),

  reserviceLocked   (7),

Reg-LaneDataAttribute       REG-EXT-ID-AND-TYPE ::= { ... }



Reg-NodeOffsetPointXY       REG-EXT-ID-AND-TYPE ::= { ... }



Reg-NodeAttributeSetXY      REG-EXT-ID-AND-TYPE ::= {

    {NodeAttributeSet-addGrpC    IDENTIFIED BY addGrpC} ,

     ...

}



END

iso-patched/REGION.asn

+12 −12
Changes for iso-patched/REGION.asn: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -27,21 +27,13 @@ REGION { 
DEFINITIONS AUTOMATIC TAGS::= BEGIN



IMPORTS

REG-EXT-ID-AND-TYPE

FROM DSRC-noCircular { 

iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-nocurcular (12) version2 (2)

}



addGrpC 

FROM DSRC { 

  iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc (2) version2 (2)

}

NodeAttributeSet-addGrpC, addGrpC, REG-EXT-ID-AND-TYPE

FROM DSRC-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-nocurcular (12) version (2) }



ConnectionManeuverAssist-addGrpC, ConnectionTrajectory-addGrpC,

IntersectionState-addGrpC, LaneAttributes-addGrpC, MapData-addGrpC,

MovementEvent-addGrpC, NodeAttributeSet-addGrpC, Position3D-addGrpC, RequestorDescription-addGrpC, RestrictionUserType-addGrpC, SignalStatusPackage-addGrpC

ConnectionManeuverAssist-addGrpC, ConnectionTrajectory-addGrpC, IntersectionState-addGrpC, Position3D-addGrpC, RestrictionUserType-addGrpC, LaneAttributes-addGrpC, MovementEvent-addGrpC, RequestorDescription-addGrpC, SignalStatusPackage-addGrpC, MapData-addGrpC

FROM AddGrpC {iso (1) standard (0) signalizedIntersection (19091) profilec (2) addgrpc (0) version2 (2)};





Reg-AdvisorySpeed					REG-EXT-ID-AND-TYPE ::= { ... }



Reg-ComputedLane					REG-EXT-ID-AND-TYPE ::= { ... }
@@ -67,7 +59,10 @@ Reg-LaneAttributes REG-EXT-ID-AND-TYPE ::= { 
   {LaneAttributes-addGrpC IDENTIFIED BY addGrpC} ,

   ...

}



/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

Reg-LaneDataAttribute     	REG-EXT-ID-AND-TYPE ::= { ... }

*/



Reg-MapData								REG-EXT-ID-AND-TYPE ::= { 

    {MapData-addGrpC  IDENTIFIED BY addGrpC},
@@ -78,18 +73,23 @@ Reg-MovementEvent REG-EXT-ID-AND-TYPE ::= { 
   {MovementEvent-addGrpC IDENTIFIED BY addGrpC} ,

   ...

}



Reg-MovementState         	REG-EXT-ID-AND-TYPE ::= { ...  }



-- Reg-NodeAttributeSetLL       REG-EXT-ID-AND-TYPE ::= { ... }



/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

Reg-NodeAttributeSetXY    	REG-EXT-ID-AND-TYPE ::= {

	{NodeAttributeSet-addGrpC	IDENTIFIED BY addGrpC} ,

	 ...

}

*/



-- Reg-NodeOffsetPointLL	   REG-EXT-ID-AND-TYPE ::= { ... }



/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop

Reg-NodeOffsetPointXY     	REG-EXT-ID-AND-TYPE ::= { ... }

*/



Reg-Position3D            		REG-EXT-ID-AND-TYPE ::= {

	{Position3D-addGrpC IDENTIFIED BY addGrpC} ,

SREM_PDU_Descriptions.asn

+40 −40

File changed.

Contains only whitespace changes.

README.md

+30 −30

File changed.

Contains only whitespace changes.

RTCMEM_PDU_Descriptions.asn

+40 −40

File changed.

Contains only whitespace changes.

SSEM_PDU_Descriptions.asn

+40 −40

File changed.

Contains only whitespace changes.

syntax_check.bash

+106 −106

File changed.

Contains only whitespace changes.

IVIM_PDU_Descriptions.asn

+40 −40

File changed.

Contains only whitespace changes.

LICENSE

+22 −22

File changed.

Contains only whitespace changes.

MAPEM_PDU_Descriptions.asn

+39 −39

File changed.

Contains only whitespace changes.

.gitignore

+2 −2

File changed.

Contains only whitespace changes.

.gitmodules

+4 −4

File changed.

Contains only whitespace changes.

Dockerfile

+19 −19

File changed.

Contains only whitespace changes.

SPATEM_PDU_Descriptions.asn

+40 −40

File changed.

Contains only whitespace changes.