Commit 6b12f56f authored by wattelet's avatar wattelet
Browse files

CAM function corrected - PICS and PIXIT added for MAP SPAT

parent 080945ae

ttcn/CAM/LibItsCam_Functions.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ module LibItsCam_Functions { 
                p_referencePosition.latitude,

                p_referencePosition.longitude,

                p_offSet,

                p_referencePosition.positionConfidenceEllipse.semiMajorOrientation.headingValue,

                p_referencePosition.positionConfidenceEllipse.semiMajorOrientation,

                v_referencePosition.latitude,

                v_referencePosition.longitude

            );

ttcn/MapSpat/LibItsMapSpat_Pics.ttcn

+9 −0
Original line number Diff line number Diff line
@@ -10,5 +10,14 @@ module LibItsMapSpat_Pics { 
    // LibCommon

    import from LibCommon_BasicTypesAndValues all;



    group camMapSpatPics {



        /**

         * @desc Is IUT an RSU  

         */

        modulepar boolean PICS_RSU := true;

    

    } // end camMapSpatPics

   

      

} // end LibItsMapSpat_Pics

ttcn/MapSpat/LibItsMapSpat_Templates.ttcn

+6 −5
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ module LibItsMapSpat_Templates { 
    import from LibItsCommon_TypesAndValues all;

    import from LibItsMapSpat_TestSystem all;

    import from LibItsMapSpat_TypesAndValues all;

    import from LibItsMapSpat_Pixits all;

    import from ITS_Container language "ASN.1:1997" all;

    import from DSRC language "ASN.1:1997" all;

    import from EU language "ASN.1:1997" all;
@@ -198,7 +199,7 @@ module LibItsMapSpat_Templates { 
        template (value) MapData m_map := {

            msgID             := mapData_P,

            msgSubID          := 0,  

            msgIssueRevision  := 10,

            msgIssueRevision  := PX_MSG_ISSUE_REVISION,

            layerType         := omit,

            layerID           := omit,

            intersections     := omit,
@@ -276,8 +277,8 @@ module LibItsMapSpat_Templates { 
        template (value) IntersectionState m_intersection := {

            name           		:= omit,

            id           		:= m_intersectionReferenceID,

            revision     		:= 20,

            status       		:= '1000'O,

            revision     		:= PX_INTERSECTIONSTATE_REVISION,

            status       		:= PX_STATUS,

            moy           		:= omit,

            timeStamp     		:= omit,

            enabledLanes        := omit,
@@ -289,12 +290,12 @@ module LibItsMapSpat_Templates { 
        }

        template (value) IntersectionReferenceID m_intersectionReferenceID := {

            region           	:= omit,

            id					:= 'ABAB'O

            id					:= PX_INTERSECTION_ID

        }

        template (value) MovementList m_movements := { m_movement };

        template (value) MovementState m_movement := {

            movementName       	:= omit,

            signalGroup        	:= 128,    

            signalGroup        	:= PX_SIGNAL_GROUP_ID,    

            state_time_speed   	:= m_movementEventList,

            maneuverAssistList 	:= omit,

            regional           	:= omit