Commit ea06cf3d authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parent 655d99bf

33128/r18/TS33128Payloads.asn

+50 −6
Original line number Diff line number Diff line
@@ -5560,7 +5560,8 @@ Location ::= SEQUENCE 
    positioningInfo             [2] PositioningInfo OPTIONAL,

    locationPresenceReport      [3] LocationPresenceReport OPTIONAL,

    fourGPositioningInfo        [4] FourGPositioningInfo OPTIONAL,

    fourGLocationInfo           [5] FourGLocationInfo OPTIONAL

    fourGLocationInfo           [5] FourGLocationInfo OPTIONAL,

    iMSLocation                 [4961] IMSLocation OPTIONAL

}



CellSiteInformation ::= SEQUENCE
@@ -5596,7 +5597,7 @@ EUTRALocation ::= SEQUENCE 
{

    tAI                         [1] TAI,

    eCGI                        [2] ECGI,

    ageOfLocationInfo           [3] INTEGER OPTIONAL,

    ageOfLocationInfo           [3] AgeOfLocation OPTIONAL,

    uELocationTimestamp         [4] Timestamp OPTIONAL,

    geographicalInformation     [5] UTF8String OPTIONAL,

    geodeticInformation         [6] UTF8String OPTIONAL,
@@ -5612,7 +5613,7 @@ NRLocation ::= SEQUENCE 
{

    tAI                         [1] TAI,

    nCGI                        [2] NCGI,

    ageOfLocationInfo           [3] INTEGER OPTIONAL,

    ageOfLocationInfo           [3] AgeOfLocation OPTIONAL,

    uELocationTimestamp         [4] Timestamp OPTIONAL,

    geographicalInformation     [5] UTF8String OPTIONAL,

    geodeticInformation         [6] UTF8String OPTIONAL,
@@ -5634,7 +5635,7 @@ N3GALocation ::= SEQUENCE 
    gLI                         [8] GLI OPTIONAL,

    w5GBANLineType              [9] W5GBANLineType OPTIONAL,

    gCI                         [10] GCI OPTIONAL,

    ageOfLocationInfo           [11] INTEGER OPTIONAL,

    ageOfLocationInfo           [11] AgeOfLocation OPTIONAL,

    uELocationTimestamp         [12] Timestamp OPTIONAL,

    protocol                    [13] TransportProtocol OPTIONAL

}
@@ -5670,6 +5671,13 @@ GERALocation ::= SEQUENCE 
    cellSiteInformation         [12] CellSiteInformation OPTIONAL

}



IMSLocation ::= SEQUENCE

{

    pANIHeaderInfo        [1] SEQUENCE OF PANIHeaderInfo OPTIONAL,

    geolocationHeaderInfo [2] SEQUENCE OF SIPGeolocationHeaderInfo OPTIONAL,

    cNIHeaderInfo         [3] SEQUENCE OF SIPCNIHeaderInfo OPTIONAL

}



-- TS 38.413 [23], clause 9.3.2.4

IPAddr ::= SEQUENCE

{
@@ -5892,7 +5900,7 @@ LocationData ::= SEQUENCE 
{

    locationEstimate            [1] GeographicArea,

    accuracyFulfilmentIndicator [2] AccuracyFulfilmentIndicator OPTIONAL,

    ageOfLocationEstimate       [3] AgeOfLocationEstimate OPTIONAL,

    ageOfLocationEstimate       [3] AgeOfLocation OPTIONAL,

    velocityEstimate            [4] VelocityEstimate OPTIONAL,

    civicAddress                [5] CivicAddress OPTIONAL,

    positioningDataList         [6] SET OF PositioningMethodAndUsage OPTIONAL,
@@ -6334,7 +6342,7 @@ UncertaintySBI ::= UTF8String 
Orientation ::= INTEGER (0..180)

Confidence ::= INTEGER (0..100)

InnerRadius ::= INTEGER (0..327675)

AgeOfLocationEstimate ::= INTEGER (0..32767)

AgeOfLocation ::= INTEGER (0..32767)

HorizontalSpeed ::= UTF8String

VerticalSpeed ::= UTF8String

SpeedUncertainty ::= UTF8String
@@ -6409,12 +6417,48 @@ OGCURN ::= UTF8String 
-- TS 29.572 [24], clause 6.1.6.2.15

MethodCode ::= INTEGER (16..31)



PANIHeaderInfo ::= SEQUENCE

{

    accessNetworkInformation [1] SIPAccessNetworkInformation,

    accessInfo               [2] SEQUENCE OF SIPAccessInfo OPTIONAL,

    pANILocation             [3] SEQUENCE OF SIPLocationInfo OPTIONAL

}



SIPGeolocationHeaderInfo ::= SEQUENCE

{

    locationValue [1] UTF8String,

    cidInfo       [2] UTF8String OPTIONAL

}



SIPAccessInfo ::= UTF8String



SIPCellularAccessInfo ::= SEQUENCE

{

    accessInfo  [1] SIPAccessInfo,

    cellInfoAge [2] SIPCNICellInfoAge

}



SIPCNICellInfoAge ::= INTEGER(0..999999999)



SIPLocationInfo ::= SEQUENCE

{

    locationInfo    [1] LocationInfo OPTIONAL,

    cellInformation [2] CellInformation OPTIONAL

}



SIPAccessNetworkInformation ::= SEQUENCE

{

    accessNetworkInfo [1] UTF8String,

    servingPLMN       [2] PLMNID OPTIONAL

}



SIPCNIHeaderInfo ::= SEQUENCE

{

    cellularNetworkInformation [1] SIPCellularNetworkInformation,

    cellularAccessInfo         [2] SEQUENCE OF SIPCellularAccessInfo OPTIONAL,

    cNILocation                [3] SEQUENCE OF SIPLocationInfo OPTIONAL

}



SIPCellularNetworkInformation ::= SEQUENCE

{

    cellularNetworkInfo  [1] UTF8String,