Commit 3709e921 authored by canterburym's avatar canterburym
Browse files

Translating changes to R19 as required

parent 138d61d6

33128/r18/TS33128Dictionaries.xml

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

            <DictionaryEntry>

                <Value>LocationAcquisition</Value>

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

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

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>
@@ -80,17 +80,9 @@ 
        <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 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>

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

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd

+0 −46
Original line number Diff line number Diff line
@@ -121,18 +121,6 @@ 
    </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}"/>
@@ -169,40 +157,6 @@ 
    <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/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd

+2 −36
Original line number Diff line number Diff line
@@ -9,9 +9,7 @@ 
    <xs:complexContent>

      <xs:extension base="liqr:LIQueryRequest">

        <xs:sequence>

          <xs:element name="LocationInformation" type="xs:boolean" default="false"/>

          <xs:element name="ReqCurrentLoc" type="xs:boolean" default="false"/>

          <xs:element name="ECIDMeasurements" type="xs:boolean" default="false"/>

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

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

        </xs:sequence>
@@ -48,8 +46,6 @@ 
    <xs:sequence>

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

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

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

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

    </xs:sequence>

  </xs:complexType>
@@ -65,22 +61,10 @@ 
    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="ECIDMeasurementsOutcomes">

    <xs:sequence>

      <xs:element name="ECIDMeasurementsOutcome" type="ECIDMeasurementsOutcome" maxOccurs="unbounded"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="EPCECIDMeasurementsOutcomes">

    <xs:sequence>

      <xs:element name="EPCECIDMeasurementsOutcome" type="EPCECIDMeasurementsOutcome" maxOccurs="unbounded"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="LocationOutcome">

    <xs:sequence>

      <xs:element name="SUPI" type="liqr:SUPI"/>

      <xs:element name="GPSI" type="liqr:ListOfGPSI"/>

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

      <xs:element name="Location" type="liqr:TS29518Location" minOccurs="0"/>

      <xs:element name="FailureCause" type="liqr:ErrorInformation" minOccurs="0"/>

    </xs:sequence>
@@ -89,28 +73,10 @@ 
  <xs:complexType name="EPCLocationOutcome">

    <xs:sequence>

      <xs:element name="IMSI" type="common:IMSI"/>

      <xs:element name="MSISDNs" type="liqr:ListOfMSISDNs"/>

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

      <xs:element name="Location" type="liqr:TS29272Location" minOccurs="0"/>

      <xs:element name="FailureCause" type="liqr:ErrorInformation" minOccurs="0"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="ECIDMeasurementsOutcome">

    <xs:sequence>

      <xs:element name="SUPI" type="liqr:SUPI"/>

      <xs:element name="GPSI" type="liqr:ListOfGPSI"/>

      <xs:element name="ECIDMeasurements" type="liqr:ExternalASNType" minOccurs="0"/>

      <xs:element name="FailureCause" type="liqr:ExternalASNType" minOccurs="0"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="EPCECIDMeasurementsOutcome">

    <xs:sequence>

      <xs:element name="IMSI" type="common:IMSI"/>

      <xs:element name="MSISDNs" type="liqr:ListOfMSISDNs"/>

      <xs:element name="ECIDMeasurements" type="liqr:ExternalASNType" minOccurs="0"/>

      <xs:element name="FailureCause" type="liqr:ExternalASNType" minOccurs="0"/>

    </xs:sequence>

  </xs:complexType>



</xs:schema>

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_3GPPLIQueryExtensions.xsd

+46 −0
Original line number Diff line number Diff line
@@ -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"/>