Commit 6da76164 authored by grahamj's avatar grahamj Committed by canterburym
Browse files

TS 33.128 CR 0486 - Correction to the encoding of Uncertainty in Location

parent 94e52699
Loading
Loading
Loading
Loading
+22 −5
Original line number Diff line number Diff line
@@ -2792,7 +2792,10 @@ Point ::= SEQUENCE
PointUncertaintyCircle ::= SEQUENCE
{
    geographicalCoordinates             [1] GeographicalCoordinates,
    uncertainty                         [2] Uncertainty
-- 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
}

-- TS 29.572 [24], clause 6.1.6.2.8
@@ -2822,8 +2825,11 @@ PointAltitudeUncertainty ::= SEQUENCE
    point                               [1] GeographicalCoordinates,
    altitude                            [2] Altitude,
    uncertaintyEllipse                  [3] UncertaintyEllipse,
-- 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
    confidence                          [5] Confidence,
    uncertaintyAltitudeSBI              [6] UncertaintySBI OPTIONAL
}

-- TS 29.572 [24], clause 6.1.6.2.12
@@ -2831,10 +2837,13 @@ EllipsoidArc ::= SEQUENCE
{
    point                               [1] GeographicalCoordinates,
    innerRadius                         [2] InnerRadius,
-- 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
    confidence                          [6] Confidence,
    uncertaintyRadiusSBI                [7] UncertaintySBI OPTIONAL
}

-- TS 29.572 [24], clause 6.1.6.2.4
@@ -2848,9 +2857,15 @@ GeographicalCoordinates ::= SEQUENCE
-- TS 29.572 [24], clause 6.1.6.2.22
UncertaintyEllipse ::= SEQUENCE
{
-- 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
    orientationMajor                    [3] Orientation,
    semiMajorSBI                        [4] UncertaintySBI OPTIONAL,
    semiMinorSBI                        [5] UncertaintySBI OPTIONAL
}

-- TS 29.572 [24], clause 6.1.6.2.18
@@ -2891,7 +2906,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 +2916,8 @@ VerticalSpeed ::= UTF8String
SpeedUncertainty ::= UTF8String
BarometricPressure ::= INTEGER (30000..115000)

Uncertainty ::= INTEGER (0..127)

-- TS 29.572 [24], clause 6.1.6.3.13
VerticalDirection ::= ENUMERATED
{