From 3341ea6d1457cf67ad944fba384f3395daf6fa0a Mon Sep 17 00:00:00 2001 From: grahamj Date: Sat, 14 Jan 2023 00:55:07 +0000 Subject: [PATCH 1/4] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 5949fe56..8d120abe 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -5143,7 +5143,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 @@ -5173,8 +5174,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 @@ -5182,10 +5184,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 @@ -5199,9 +5202,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 @@ -5242,7 +5247,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) @@ -5252,6 +5257,10 @@ 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 019a1c87af69035bd75d30d65171f65cfaa8e05a Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 16 Jan 2023 05:43:56 +0000 Subject: [PATCH 2/4] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 8d120abe..212b8700 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -5257,8 +5257,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 1e4783f3890e79753b3e64dc8a5f0e5b29c9c900 Mon Sep 17 00:00:00 2001 From: grahamj Date: Wed, 25 Jan 2023 20:54:01 +0000 Subject: [PATCH 3/4] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 212b8700..e93dd548 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -5143,7 +5143,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 } @@ -5174,7 +5174,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 } @@ -5184,7 +5184,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, @@ -5202,8 +5202,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 @@ -5257,9 +5257,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 02d59bf5703e16afbbd76c466f2b3b6b4fed4f5d Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 26 Jan 2023 17:45:22 +0000 Subject: [PATCH 4/4] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index e93dd548..5f0f8fd4 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -5143,7 +5143,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 } @@ -5174,7 +5176,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 } @@ -5184,7 +5188,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, @@ -5202,8 +5208,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