Commit 94e52699 authored by canterburym's avatar canterburym
Browse files

Merge branch 'cr/33128/0485' into 'meeting/SA99' 

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

See merge request !136
parents baf6e03a cbdcf26f

33128/r15/TS33128Payloads.asn

+23 −6
Original line number Diff line number Diff line
@@ -1200,7 +1200,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
@@ -1230,8 +1233,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
@@ -1239,10 +1245,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
@@ -1255,9 +1264,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
@@ -1298,16 +1313,18 @@ 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..65535)

InnerRadius ::= INTEGER (0..327675)

AgeOfLocationEstimate ::= INTEGER (0..32767)

HorizontalSpeed ::= UTF8String

VerticalSpeed ::= UTF8String

SpeedUncertainty ::= UTF8String

BarometricPressure ::= INTEGER (30000..155000)



Uncertainty ::= INTEGER (0..127)



-- TS 29.572 [24], clause 6.1.6.3.13

VerticalDirection ::= ENUMERATED

{