Commit 84a726d1 authored by garciay's avatar garciay
Browse files

Add missing 'valueof' 

Uses inbound TTCN-3 function instead of 'null' comparison
parent 4f10dcc8

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+6 −7
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ module LibItsGeoNetworking_Functions { 
    import from LibItsCommon_Functions all;

    import from LibItsCommon_Functions all;

    import from LibItsCommon_TestSystem all;

    import from LibItsCommon_TestSystem all;

    import from LibItsCommon_TypesAndValues all;

    import from LibItsCommon_TypesAndValues all;

    import from LibItsGeoNetworking_Functions all;

    import from LibItsGeoNetworking_TestSystem all;

    import from LibItsGeoNetworking_TestSystem all;

    import from LibItsGeoNetworking_TypesAndValues all;

    import from LibItsGeoNetworking_TypesAndValues all;

    import from LibItsGeoNetworking_Templates all;

    import from LibItsGeoNetworking_Templates all;
@@ -809,7 +808,7 @@ module LibItsGeoNetworking_Functions { 
                }

                }

            }

            }

            

            

            if((v_return != null) and (v_return.timestamp == 0)) {

            if (isbound(v_return) and (v_return.timestamp == 0)) {

                v_return.timestamp := f_computeGnTimestamp();

                v_return.timestamp := f_computeGnTimestamp();

            }

            }

            return v_return;

            return v_return;
@@ -2191,7 +2190,7 @@ module LibItsGeoNetworking_Functions { 
        function f_getIutShortPosVector() runs on ItsGeoNetworking return ShortPosVector {

        function f_getIutShortPosVector() runs on ItsGeoNetworking return ShortPosVector {

            var LongPosVector v_longPosVectorIut := f_getPosition(c_compIut);

            var LongPosVector v_longPosVectorIut := f_getPosition(c_compIut);

            

            

            if (v_longPosVectorIut == null) {

            if (not isbound(v_longPosVectorIut)) {

                v_longPosVectorIut := f_getIutLongPosVector();

                v_longPosVectorIut := f_getIutLongPosVector();

            }

            }

            return f_longPosVector2ShortPosVector(v_longPosVectorIut);

            return f_longPosVector2ShortPosVector(v_longPosVectorIut);

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+6 −6
Original line number Original line Diff line number Diff line
@@ -1506,9 +1506,9 @@ module LibItsGeoNetworking_Templates { 
            template LongPosVector mw_longPosVectorPosition_withDelta(

            template LongPosVector mw_longPosVectorPosition_withDelta(

                in template (value) LongPosVector p_longPosVector

                in template (value) LongPosVector p_longPosVector

            ) modifies mw_longPosVectorPosition := {

            ) modifies mw_longPosVectorPosition := {

                    latitude := f_getDelta32(p_longPosVector.latitude, PX_POS_DELTA),

                    latitude := f_getDelta32(valueof(p_longPosVector.latitude), PX_POS_DELTA),

                    longitude := f_getDelta32(p_longPosVector.longitude, PX_POS_DELTA),

                    longitude := f_getDelta32(valueof(p_longPosVector.longitude), PX_POS_DELTA),

                    speed := f_getDelta15(p_longPosVector.speed, PX_POS_DELTA)

                    speed := f_getDelta15(valueof(p_longPosVector.speed), PX_POS_DELTA)

            }

            }

            

            

            /**

            /**
@@ -1531,8 +1531,8 @@ module LibItsGeoNetworking_Templates { 
            template ShortPosVector mw_shortPosVectorPosition_withDelta(

            template ShortPosVector mw_shortPosVectorPosition_withDelta(

                in template (value) ShortPosVector p_shortPosVector

                in template (value) ShortPosVector p_shortPosVector

            ) modifies mw_shortPosVectorPosition := {

            ) modifies mw_shortPosVectorPosition := {

                    latitude := f_getDelta32(p_shortPosVector.latitude, PX_POS_DELTA),

                    latitude := f_getDelta32(valueof(p_shortPosVector.latitude), PX_POS_DELTA),

                    longitude := f_getDelta32(p_shortPosVector.longitude, PX_POS_DELTA)

                    longitude := f_getDelta32(valueof(p_shortPosVector.longitude), PX_POS_DELTA)

            }

            }

            

            

            /**

            /**
@@ -2195,7 +2195,7 @@ module LibItsGeoNetworking_Templates { 
    

    

    group geoTemplateFunctions {

    group geoTemplateFunctions {

        

        

        function f_adaptPayload_m(in octetstring p_finalPayload) return template (value) Payload {

        function f_adaptPayload_m(in template (value) octetstring p_finalPayload) return template (value) Payload {

            var template (value) Payload v_payload;

            var template (value) Payload v_payload;

            

            

            if(PX_GN_UPPER_LAYER == e_any) {

            if(PX_GN_UPPER_LAYER == e_any) {