Commit c55ea49d authored by berge's avatar berge
Browse files

Changed simulated nodes position computation

parent ded092fe

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+8 −6
Original line number Original line Diff line number Diff line
@@ -819,10 +819,10 @@ module LibItsGeoNetworking_Functions { 
        /**

        /**

         * @desc    Compute a position based on reference point and distance factors

         * @desc    Compute a position based on reference point and distance factors

         * @param   p_refPosition       Reference point

         * @param   p_refPosition       Reference point

         * @param   p_longitudeFactor   Number of PX_DISTANCE_UNIT applied for computing longitude

         * @param   p_longitudeFactor   Number of DISTANCE_UNIT applied for computing longitude

         * @param   p_latitudeFactor    Number of PX_DISTANCE_UNIT applied for computing latitude

         * @param   p_latitudeFactor    Number of DISTANCE_UNIT applied for computing latitude

         * @return  LongPosVector - Computed position

         * @return  LongPosVector - Computed position

         * @see     PX_DISTANCE_UNIT

         * @see     PICS_GN_DEFAULT_MAX_COMMUNICATION_RANGE

         */

         */

        function f_computePosition(

        function f_computePosition(

            in LongPosVector p_refPosition,

            in LongPosVector p_refPosition,
@@ -830,10 +830,12 @@ module LibItsGeoNetworking_Functions { 
            in integer p_latitudeFactor

            in integer p_latitudeFactor

        ) return LongPosVector {

        ) return LongPosVector {

            

            

            const integer c_distance2Gps := 100;

            var LongPosVector v_return := p_refPosition;                        

            var LongPosVector v_return := p_refPosition;                        

            var UInt32 v_distanceUnit := (c_distance2Gps * PICS_GN_DEFAULT_MAX_COMMUNICATION_RANGE) / 10;

            

            

            v_return.latitude := v_return.latitude + p_latitudeFactor * PX_DISTANCE_UNIT;

            v_return.latitude := v_return.latitude + p_latitudeFactor * v_distanceUnit;

            v_return.longitude := v_return.longitude + p_longitudeFactor * PX_DISTANCE_UNIT;

            v_return.longitude := v_return.longitude + p_longitudeFactor * v_distanceUnit;

            v_return.timestamp := f_computeGnTimestamp();

            v_return.timestamp := f_computeGnTimestamp();

            

            

            return v_return;

            return v_return;

ttcn/GeoNetworking/LibItsGeoNetworking_Pixits.ttcn

+0 −7
Original line number Original line Diff line number Diff line
@@ -92,13 +92,6 @@ module LibItsGeoNetworking_Pixits { 
             */

             */

            modulepar integer PX_MAX_NR_NEIGHBOUR := 50;

            modulepar integer PX_MAX_NR_NEIGHBOUR := 50;

            

            

            /**

             * @desc    Number of 1/10 micro degrees in one unit of distance

             * @remark  This Pixit is used to position nodes relatively to each other.

             *          It corresponds to the distance betwen 2 nodes (10000 ~ 100m).

             */

            modulepar UInt32 PX_DISTANCE_UNIT := 10000;

            

            /**

            /**

             * @desc Maximum number of application retransmissions

             * @desc Maximum number of application retransmissions

             */

             */

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ module LibItsGeoNetworking_TypesAndValues { 
        

        

        const integer c_latitudeFactorNodeA := 10;

        const integer c_latitudeFactorNodeA := 10;

        const integer c_latitudeFactorNodeB := 2;

        const integer c_latitudeFactorNodeB := 2;

        const integer c_latitudeFactorNodeC := -10;

        const integer c_latitudeFactorNodeC := -6;

        const integer c_latitudeFactorNodeD := 1;

        const integer c_latitudeFactorNodeD := 1;

        const integer c_latitudeFactorNodeE := -1;

        const integer c_latitudeFactorNodeE := -1;

        const integer c_latitudeFactorNodeF := 2;

        const integer c_latitudeFactorNodeF := 2;