Commit e13a6938 authored by canterburym's avatar canterburym
Browse files

Merge branch 'cr/33128/0664' into 'meeting/SA104' 

TS 33.128 CR0664 - Location acquisition based on measurement reporting

See merge request !265
parents 3d7a1496 ed4d75a8

33128/r19/TS33128Dictionaries.xml

+10 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
            </DictionaryEntry>

            <DictionaryEntry>

                <Value>LocationAcquisition</Value>

                <Meaning>A request for location information of the target, consisting at least of the TAI and the NCGI.</Meaning>

                <Meaning>A request for location acquisition information of the target.</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>
@@ -80,9 +80,17 @@ 
        <Owner>3GPP</Owner>

        <Name>LIHILAFlags</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>LocationInformation</Value>

                <Meaning>Indicates whether location information of the UE is requested.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>ReqCurrentLoc</Value>

                <Meaning>Indicates whether the current location of the UE is requested.</Meaning>

                <Meaning>Indicates whether the current location of the UE is requested in case location information of the UE is requested.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>ECIDMeasurements</Value>

                <Meaning>Indicates whether E-CID measurements of the UE are requested.</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

33128/r19/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r18:v3" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v4" targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r18:v3" elementFormDefault="qualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r19:v0" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r19:v0" targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r19:v0" elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>

  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

  <xs:import namespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v4"/>

  <xs:import namespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r19:v0"/>



  <xs:complexType name="IdentityAssociationRequest">

    <xs:complexContent>

33128/r19/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd

+47 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v4" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:etsi103120common="http://uri.etsi.org/03120/common/2016/02/Common" targetNamespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v4" elementFormDefault="qualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPLIQueryExtensions:r19:v0" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:etsi103120common="http://uri.etsi.org/03120/common/2016/02/Common" targetNamespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r19:v0" elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>

  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
@@ -121,6 +121,18 @@ 
    </xs:choice>

  </xs:complexType>



  <xs:complexType name="ListOfGPSI">

    <xs:sequence>

      <xs:element name="GPSI" type="GPSI" minOccurs="0" maxOccurs="unbounded"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="ListOfMSISDNs">

    <xs:sequence>

      <xs:element name="MSISDN" type="common:InternationalE164" minOccurs="0" maxOccurs="unbounded"/>

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="MCC">

    <xs:restriction base="xs:string">

      <xs:pattern value="[0-9]{3}"/>
@@ -157,6 +169,40 @@ 
    <xs:restriction base="xs:base64Binary"/>

  </xs:simpleType>



  <xs:complexType name="ExternalASNType">

    <xs:sequence>

      <xs:element name="ModuleIdentifier" type="ASN1OID"/>

      <xs:element name="ExternalASNReference" type="ExternalASNReference" minOccurs="0"/>

      <xs:element name="EncodedASNValue" type="ExternalASNValue"/>

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="ASN1OID">

    <xs:restriction base="xs:string">

      <xs:maxLength value="255"/>

      <xs:pattern value="[0-2](\.(0|[1-9][0-9]*))*"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="ExternalASNReference">

    <xs:restriction base="xs:string"/>

  </xs:simpleType>



  <xs:complexType name="ExternalASNValue">

    <xs:choice>

      <xs:element name="BER" type="BER"/>

      <xs:element name="AlignedPER" type="AlignedPER"/>

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="AlignedPER">

    <xs:restriction base="xs:base64Binary"/>

  </xs:simpleType>



  <xs:simpleType name="BER">

    <xs:restriction base="xs:base64Binary"/>

  </xs:simpleType>



  <xs:complexType name="NCGI">

    <xs:sequence>

      <xs:element name="PLMNID" type="PLMNID"/>

33128/r19/urn_3GPP_ns_li_3GPPStateTransfer.xsd

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsiX1="http://uri.etsi.org/03221/X1/2017/10" xmlns="urn:3GPP:ns:li:3GPPStateTransfer:r18:v0" targetNamespace="urn:3GPP:ns:li:3GPPStateTransfer:r18:v0" elementFormDefault="qualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsiX1="http://uri.etsi.org/03221/X1/2017/10" xmlns="urn:3GPP:ns:li:3GPPStateTransfer:r19:v0" targetNamespace="urn:3GPP:ns:li:3GPPStateTransfer:r19:v0" elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>

33128/r19/urn_3GPP_ns_li_3GPPX1Extensions.xsd

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r18:v5" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r18:v5" elementFormDefault="qualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r19:v0" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r19:v0" elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>