Commit 2e681548 authored by berge's avatar berge
Browse files

Mantis #6149: TS position no more hard-coded in TA. 

Introduced new TA params
Changed PX_TS_POSITION to PX_TS_LATITUDE, PX_TS_LONGITUDE
LibItsCommon_Functions and LibItsCommon_Pixits no more dependent on DENM
parent 716708cd

ttcn/CAM/LibItsCam_Functions.ttcn

+2 −2
Original line number Original line Diff line number Diff line
@@ -281,7 +281,7 @@ module LibItsCam_Functions { 
                    f_getCurrentTime(),

                    f_getCurrentTime(),

                    f_getTsStationId(),

                    f_getTsStationId(),

                    v_stationCharacteristics,

                    v_stationCharacteristics,

                    f_getTsCurrentPosition()

                    m_tsPosition

                );

                );

            }

            }

            else {

            else {
@@ -291,7 +291,7 @@ module LibItsCam_Functions { 
                    f_getCurrentTime(),

                    f_getCurrentTime(),

                    f_getTsStationId(),

                    f_getTsStationId(),

                    v_stationCharacteristics,

                    v_stationCharacteristics,

                    f_getTsCurrentPosition()

                    m_tsPosition

                );

                );

            }

            }

        } // end f_getTesterValidCam

        } // end f_getTesterValidCam

ttcn/CAM/LibItsCam_Templates.ttcn

+18 −1
Original line number Original line Diff line number Diff line
@@ -7,6 +7,8 @@ 
 */

 */

module LibItsCam_Templates {

module LibItsCam_Templates {





    // LibIts

    import from LibItsCommon_Functions all;

    import from LibItsCam_TestSystem all;

    import from LibItsCam_TestSystem all;

    import from LibItsCam_TypesAndValues all;

    import from LibItsCam_TypesAndValues all;

    import from LibItsCam_Pixits all;

    import from LibItsCam_Pixits all;
@@ -229,6 +231,21 @@ module LibItsCam_Templates { 
        

        

    } // end group Primitives

    } // end group Primitives





    group positionTemplates {

        

        template (value) ReferencePosition m_tsPosition := {

            longitude := f_getTsLongitude(),

            latitude := f_getTsLatitude(),

            elevation := 0,

            heading := omit, //present if mobileItsStation flag is TRUE

            streetName := omit,

            positionConfidence := omit, //present if mobileItsStation flag is TRUE

            elevationConfidence := omit, //present if mobileItsStation flag is TRUE

            roadSegmentID := omit

        }

        

    } // end positionTemplates

        

    /**

    /**

     * @desc    Default Receive template for CAM PDU

     * @desc    Default Receive template for CAM PDU

     */

     */

ttcn/Common/LibItsCommon_Functions.ttcn

+16 −7
Original line number Original line Diff line number Diff line
@@ -108,22 +108,31 @@ module LibItsCommon_Functions { 
         * @see     PX_TESTER_STATION_ID

         * @see     PX_TESTER_STATION_ID

         */

         */

        function f_getTsStationId()

        function f_getTsStationId()

        return StationID {

        return integer {

            

            

            return PX_TESTER_STATION_ID;

            return PX_TESTER_STATION_ID;

                

                

        } // end f_getTsStationId

        } // end f_getTsStationId

        

        

        /**

        /**

         * @desc    Gets the current position of test system

         * @desc    Gets the current latitude of test system

         * @return  Test system's position

         * @return  Test system's latitude

         */

        function f_getTsLatitude() return integer {

            

            return PX_TS_LATITUDE;

            

        } // end f_getTsLatitude



        /**

         * @desc    Gets the current longitude of test system

         * @return  Test system's latitude

         */

         */

        function f_getTsCurrentPosition() return ReferencePosition {

        function f_getTsLongitude() return integer {

            

            

            /* TODO: consider getting position from TA (as it is done for GN) */

            return PX_TS_LONGITUDE;

            return PX_TS_POSITION;

            

            

        } // end f_getTsCurrentPosition

        } // end f_getTsLongitude

                

                

    } // end itsFunctions       

    } // end itsFunctions

ttcn/Common/LibItsCommon_Pixits.ttcn

+9 −14
Original line number Original line Diff line number Diff line
@@ -7,26 +7,21 @@ 
 */

 */

module LibItsCommon_Pixits {

module LibItsCommon_Pixits {

    

    

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

    

    /**

    /**

     * @desc Tester Station Id

     * @desc Tester Station Id

     *       Station Id used in CAM/DENM messages sent by the tester

     *       Station Id used in CAM/DENM messages sent by the tester

     */

     */

    modulepar StationID PX_TESTER_STATION_ID := 111111;

    modulepar integer PX_TESTER_STATION_ID := 111111;

    

    

    /**

    /**

     *  @desc The position of the tester.

     *  @desc The Latitude of the tester.

     */

     */

    modulepar ReferencePosition PX_TS_POSITION := {

    modulepar integer PX_TS_LATITUDE := 436175790;

        longitude := {hemisphere := east, degree := 0},



        latitude := {hemisphere := north, degree := 0},

    /**

        elevation := 0,

     *  @desc The Longitude of the tester.

        heading := 0,

     */

        streetName := omit,

    modulepar integer PX_TS_LONGITUDE := 70546480;

        positionConfidence := omit,



        elevationConfidence := omit,

        roadSegmentID :=0

    }

    

    

} // end LibItsCommon_Pixits
 
} // end LibItsCommon_Pixits
 
 No newline at end of file

ttcn/DENM/LibItsDenm_Functions.ttcn

+1 −1
Original line number Original line Diff line number Diff line
@@ -248,7 +248,7 @@ module LibItsDenm_Functions { 
                    m_denmReq(

                    m_denmReq(

                    	m_denmPdu(

                    	m_denmPdu(

                          f_getCurrentTime(),

                          f_getCurrentTime(),

                        	m_denmWithCause(c_dataVersionCancellation, p_event, m_eventPosition(f_getTsCurrentPosition()), f_getTsStationId())

                        	m_denmWithCause(c_dataVersionCancellation, p_event, m_eventPosition(m_tsPosition), f_getTsStationId())

                        )

                        )

                    )

                    )

                );

                );