From d13313e364f0d0a71dc8e69e3e7bd698e59069bf Mon Sep 17 00:00:00 2001 From: grahamj Date: Sat, 14 Jan 2023 01:00:46 +0000 Subject: [PATCH 1/4] Update 33128/r16/TS33128Payloads.asn --- 33128/r16/TS33128Payloads.asn | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 11c9a7a9..fcfbed51 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -2792,7 +2792,8 @@ Point ::= SEQUENCE PointUncertaintyCircle ::= SEQUENCE { geographicalCoordinates [1] GeographicalCoordinates, - uncertainty [2] Uncertainty + uncertaintyGAD [2] UncertaintyGAD, + uncertaintySBI [3] UncertaintySBI OPTIONAL } -- TS 29.572 [24], clause 6.1.6.2.8 @@ -2822,8 +2823,9 @@ PointAltitudeUncertainty ::= SEQUENCE point [1] GeographicalCoordinates, altitude [2] Altitude, uncertaintyEllipse [3] UncertaintyEllipse, - uncertaintyAltitude [4] Uncertainty, - confidence [5] Confidence + uncertaintyAltitudeGAD [4] UncertaintyGAD, + confidence [5] Confidence, + uncertaintyAltitudeSBI [6] UncertaintySBI OPTIONAL } -- TS 29.572 [24], clause 6.1.6.2.12 @@ -2831,10 +2833,11 @@ EllipsoidArc ::= SEQUENCE { point [1] GeographicalCoordinates, innerRadius [2] InnerRadius, - uncertaintyRadius [3] Uncertainty, + uncertaintyRadiusGAD [3] UncertaintyGAD, offsetAngle [4] Angle, includedAngle [5] Angle, - confidence [6] Confidence + confidence [6] Confidence, + uncertaintyRadiusSBI [7] UncertaintySBI OPTIONAL } -- TS 29.572 [24], clause 6.1.6.2.4 @@ -2848,9 +2851,11 @@ GeographicalCoordinates ::= SEQUENCE -- TS 29.572 [24], clause 6.1.6.2.22 UncertaintyEllipse ::= SEQUENCE { - semiMajor [1] Uncertainty, - semiMinor [2] Uncertainty, - orientationMajor [3] Orientation + semiMajorGAD [1] UncertaintyGAD, + semiMinorGAD [2] UncertaintyGAD, + orientationMajor [3] Orientation, + semiMajorSBI [4] UncertaintySBI OPTIONAL, + semiMinorSBI [5] UncertaintySBI OPTIONAL } -- TS 29.572 [24], clause 6.1.6.2.18 @@ -2891,7 +2896,7 @@ HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE -- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1 Altitude ::= UTF8String Angle ::= INTEGER (0..360) -Uncertainty ::= INTEGER (0..127) +UncertaintySBI ::= UTF8String Orientation ::= INTEGER (0..180) Confidence ::= INTEGER (0..100) InnerRadius ::= INTEGER (0..327675) @@ -2901,6 +2906,9 @@ VerticalSpeed ::= UTF8String SpeedUncertainty ::= UTF8String BarometricPressure ::= INTEGER (30000..115000) +-- Translate TS 29.572 [24], table 6.1.6.3.2-1 to INTEGER per TS 23.032 [XX], clause 6.2 or clause 6.4 for uncertaintyAltitudeGAD +UncertaintyGAD ::= INTEGER (0..127) + -- TS 29.572 [24], clause 6.1.6.3.13 VerticalDirection ::= ENUMERATED { -- GitLab From 24c796f45603b19c151519464f642cba0a325536 Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 16 Jan 2023 05:22:22 +0000 Subject: [PATCH 2/4] Update 33128/r16/TS33128Payloads.asn --- 33128/r16/TS33128Payloads.asn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index fcfbed51..1036380f 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -2906,7 +2906,8 @@ VerticalSpeed ::= UTF8String SpeedUncertainty ::= UTF8String BarometricPressure ::= INTEGER (30000..115000) --- Translate TS 29.572 [24], table 6.1.6.3.2-1 to INTEGER per TS 23.032 [XX], clause 6.2 or clause 6.4 for uncertaintyAltitudeGAD +-- This parameter has been deprecated and shall always be set to 0. +-- The uncertainty should be indicated using the UncertaintySBI parameter. UncertaintyGAD ::= INTEGER (0..127) -- TS 29.572 [24], clause 6.1.6.3.13 -- GitLab From 6eaf3d91f5cecc19c5c7a2985e81fc07e91d91de Mon Sep 17 00:00:00 2001 From: grahamj Date: Wed, 25 Jan 2023 20:48:38 +0000 Subject: [PATCH 3/4] Update 33128/r16/TS33128Payloads.asn --- 33128/r16/TS33128Payloads.asn | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 1036380f..250037a3 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -2792,7 +2792,7 @@ Point ::= SEQUENCE PointUncertaintyCircle ::= SEQUENCE { geographicalCoordinates [1] GeographicalCoordinates, - uncertaintyGAD [2] UncertaintyGAD, + uncertainty [2] Uncertainty,--This parameter has been deprecated and shall be set to 0. The uncertaintySBI parameter shall be used instead. uncertaintySBI [3] UncertaintySBI OPTIONAL } @@ -2823,7 +2823,7 @@ PointAltitudeUncertainty ::= SEQUENCE point [1] GeographicalCoordinates, altitude [2] Altitude, uncertaintyEllipse [3] UncertaintyEllipse, - uncertaintyAltitudeGAD [4] UncertaintyGAD, + uncertaintyAltitude [4] Uncertainty,--This parameter has been deprecated and shall be set to 0. The uncertaintyAltitudeSBI parameter shall be used instead. confidence [5] Confidence, uncertaintyAltitudeSBI [6] UncertaintySBI OPTIONAL } @@ -2833,7 +2833,7 @@ EllipsoidArc ::= SEQUENCE { point [1] GeographicalCoordinates, innerRadius [2] InnerRadius, - uncertaintyRadiusGAD [3] UncertaintyGAD, + uncertaintyRadius [3] Uncertainty,--This parameter has been deprecated and shall be set to 0. The uncertaintyRadiusSBI parameter shall be used instead. offsetAngle [4] Angle, includedAngle [5] Angle, confidence [6] Confidence, @@ -2851,8 +2851,8 @@ GeographicalCoordinates ::= SEQUENCE -- TS 29.572 [24], clause 6.1.6.2.22 UncertaintyEllipse ::= SEQUENCE { - semiMajorGAD [1] UncertaintyGAD, - semiMinorGAD [2] UncertaintyGAD, + semiMajor [1] Uncertainty,--This parameter has been deprecated and shall be set to 0. The semiMajorSBI parameter shall be used instead. + semiMinor [2] Uncertainty,--This parameter has been deprecated and shall be set to 0. The semiMinorSBI parameter shall be used instead. orientationMajor [3] Orientation, semiMajorSBI [4] UncertaintySBI OPTIONAL, semiMinorSBI [5] UncertaintySBI OPTIONAL @@ -2906,9 +2906,7 @@ VerticalSpeed ::= UTF8String SpeedUncertainty ::= UTF8String BarometricPressure ::= INTEGER (30000..115000) --- This parameter has been deprecated and shall always be set to 0. --- The uncertainty should be indicated using the UncertaintySBI parameter. -UncertaintyGAD ::= INTEGER (0..127) +Uncertainty ::= INTEGER (0..127) -- TS 29.572 [24], clause 6.1.6.3.13 VerticalDirection ::= ENUMERATED -- GitLab From c416371098395c859fab57dee3eac9bd678e86ff Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 26 Jan 2023 16:57:29 +0000 Subject: [PATCH 4/4] Update 33128/r16/TS33128Payloads.asn --- 33128/r16/TS33128Payloads.asn | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 250037a3..166a9b54 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -2792,7 +2792,9 @@ Point ::= SEQUENCE PointUncertaintyCircle ::= SEQUENCE { geographicalCoordinates [1] GeographicalCoordinates, - uncertainty [2] Uncertainty,--This parameter has been deprecated and shall be set to 0. The uncertaintySBI parameter shall be used instead. +-- The uncertainty parameter has been deprecated and shall be set to 0. +-- The uncertaintySBI parameter shall be used instead. + uncertainty [2] Uncertainty, uncertaintySBI [3] UncertaintySBI OPTIONAL } @@ -2823,7 +2825,9 @@ PointAltitudeUncertainty ::= SEQUENCE point [1] GeographicalCoordinates, altitude [2] Altitude, uncertaintyEllipse [3] UncertaintyEllipse, - uncertaintyAltitude [4] Uncertainty,--This parameter has been deprecated and shall be set to 0. The uncertaintyAltitudeSBI parameter shall be used instead. +-- The uncertaintyAltitude parameter has been deprecated and shall be set to 0. +-- The uncertaintyAltitudeSBI parameter shall be used instead. + uncertaintyAltitude [4] Uncertainty, confidence [5] Confidence, uncertaintyAltitudeSBI [6] UncertaintySBI OPTIONAL } @@ -2833,7 +2837,9 @@ EllipsoidArc ::= SEQUENCE { point [1] GeographicalCoordinates, innerRadius [2] InnerRadius, - uncertaintyRadius [3] Uncertainty,--This parameter has been deprecated and shall be set to 0. The uncertaintyRadiusSBI parameter shall be used instead. +-- The uncertaintyRadius parameter has been deprecated and shall be set to 0. +-- The uncertaintyRadiusSBI parameter shall be used instead. + uncertaintyRadius [3] Uncertainty, offsetAngle [4] Angle, includedAngle [5] Angle, confidence [6] Confidence, @@ -2851,8 +2857,12 @@ GeographicalCoordinates ::= SEQUENCE -- TS 29.572 [24], clause 6.1.6.2.22 UncertaintyEllipse ::= SEQUENCE { - semiMajor [1] Uncertainty,--This parameter has been deprecated and shall be set to 0. The semiMajorSBI parameter shall be used instead. - semiMinor [2] Uncertainty,--This parameter has been deprecated and shall be set to 0. The semiMinorSBI parameter shall be used instead. +-- The semiMajor parameter has been deprecated and shall be set to 0. +-- The semiMajorSBI parameter shall be used instead. + semiMajor [1] Uncertainty, +-- The semiMinor parameter has been deprecated and shall be set to 0. +-- The semiMinorSBI parameter shall be used instead. + semiMinor [2] Uncertainty, orientationMajor [3] Orientation, semiMajorSBI [4] UncertaintySBI OPTIONAL, semiMinorSBI [5] UncertaintySBI OPTIONAL -- GitLab