Commit 04d315ba authored by tepelmann's avatar tepelmann
Browse files

Removed locationContainer in UtDenmTrigger - fix for http://forge.etsi.org/mantis/view.php?id=7032. 

Merged with latest from branch 484 validation.
parent 9999c3c2

ttcn/DENM/LibItsDenm_Templates.ttcn

+1 −3
Original line number Original line Diff line number Diff line
@@ -133,7 +133,6 @@ module LibItsDenm_Templates { 
             */

             */

            template (value) UtDenmTrigger m_utTriggerEvent(

            template (value) UtDenmTrigger m_utTriggerEvent(

                template (value) SituationContainer p_situation,

                template (value) SituationContainer p_situation,

                template (value) LocationContainer p_location,

                template (omit) ValidityDuration p_validityDuration := c_duration_2sec,

                template (omit) ValidityDuration p_validityDuration := c_duration_2sec,

                template (omit) ValidityDuration p_repetitionDuration := omit,

                template (omit) ValidityDuration p_repetitionDuration := omit,

                template (omit) TransmissionInterval p_repetitionInterval := omit,

                template (omit) TransmissionInterval p_repetitionInterval := omit,
@@ -144,7 +143,6 @@ module LibItsDenm_Templates { 
                validityDuration := p_validityDuration,

                validityDuration := p_validityDuration,

                repetitionDuration := p_repetitionDuration,

                repetitionDuration := p_repetitionDuration,

                situation := p_situation,

                situation := p_situation,

                location := p_location,

                relevanceDistance := lessThan50m,

                relevanceDistance := lessThan50m,

                relevanceTrafficDirection := allTrafficDirections,

                relevanceTrafficDirection := allTrafficDirections,

                transmissionInterval := p_transmissionInterval,

                transmissionInterval := p_transmissionInterval,
@@ -425,7 +423,7 @@ module LibItsDenm_Templates { 
            template (value) ActionID p_actionID,

            template (value) ActionID p_actionID,

            template (value) StationType p_stationType

            template (value) StationType p_stationType

        ) := {

        ) := {

            management := m_denmMgmtConTermination(p_actionID, p_stationType, -, -, -, -, isCancellation), 

            management := m_denmMgmtConTermination(p_actionID, p_stationType, 1, -, -, -, isCancellation), 

            situation := omit, 

            situation := omit, 

            location := omit,

            location := omit,

            alacarte := omit

            alacarte := omit

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

+0 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,6 @@ module LibItsDenm_TypesAndValues { 
            ValidityDuration validityDuration optional,

            ValidityDuration validityDuration optional,

            ValidityDuration repetitionDuration optional,

            ValidityDuration repetitionDuration optional,

            SituationContainer situation,

            SituationContainer situation,

            LocationContainer location optional, /* FIXME: remove from all templates */

            RelevanceDistance relevanceDistance,

            RelevanceDistance relevanceDistance,

            RelevanceTrafficDirection relevanceTrafficDirection,

            RelevanceTrafficDirection relevanceTrafficDirection,

            TransmissionInterval transmissionInterval optional,

            TransmissionInterval transmissionInterval optional,