Fixed DENM templates after ASN.1 update (f556f1df) · Commits · TTCN-3 Libraries / LibIts

Common/LibItsCommon_Functions.ttcn

+1 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,7 @@ module LibItsCommon_Functions {
		*/
		function f_getTsCurrentPosition() return ReferencePosition {

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

		} // end f_getTsCurrentPosition

+33 −2

Original line number	Diff line number	Diff line
		@@ -540,6 +540,35 @@ module LibItsDenm_Templates {

		group decentralizedSituationLocationTemplates {

		/**
		* @desc Send template for relevance area
		* @param p_refPosition Reference position of event
		*/
		template (value) RelevanceArea m_denmRelevanceArea(
		ReferencePosition p_refPosition
		) := {
		geoAreaCenterLatitude := p_refPosition.latitude,
		geoAreaCenterLongitude := p_refPosition.longitude,
		shape := {
		circle := {
		radius := 1000 /* FIXME hard-coded value */
		}
		},
		directionalityFilter := omit,
		disseminationAreaSize := same
		}

		/**
		* @desc Receive template for relevance area
		*/
		template RelevanceArea mw_denmRelevanceArea := {
		geoAreaCenterLatitude := ?,
		geoAreaCenterLongitude := ?,
		shape := ?,
		directionalityFilter := *,
		disseminationAreaSize := ?
		}

		/**
		* @desc Send template for situation location
		* @param p_eventPosition Event position
		@@ -550,7 +579,8 @@ module LibItsDenm_Templates {
		template (value) DecentralizedSituationLocation.locationRef p_locationRef
		) := {
		eventPosition := p_eventPosition,
		locationRef := p_locationRef
		locationRef := p_locationRef,
		relevanceArea := m_denmRelevanceArea(p_eventPosition.eventPositionCurrentDefinition.refPosition)
		}

		/**
		@@ -563,7 +593,8 @@ module LibItsDenm_Templates {
		template (present) DecentralizedSituationLocation.locationRef p_locationRef
		) := {
		eventPosition := p_eventPosition,
		locationRef := p_locationRef
		locationRef := p_locationRef,
		relevanceArea := mw_denmRelevanceArea
		}

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -368,7 +368,7 @@ module LibIts_Interface {
		DenmPdu msgOut
		}
		with {
		encode (msgIn) "LibItsDenm_asn1"
		encode (msgOut) "LibItsDenm_asn1"
		}

		} // end fa1Primitives