Commit 85f318b3 authored by sunse's avatar sunse
Browse files

Merge branch 'TS28.541_Rel18_CR1110_Update_definitions_of_Ephemeris' into... 

Merge branch 'TS28.541_Rel18_CR1110_Update_definitions_of_Ephemeris' into 'Integration_Rel18_SA5_152_YAML'

TS28.541_Rel18_CR1110_Update_definitions_of_Ephemeris

See merge request !932
parents 888dc77d 3d5af4ef

OpenAPI/TS28541_NrNrm.yaml

+26 −24
Original line number Diff line number Diff line
@@ -606,18 +606,35 @@ components: 
            type: integer

          minValue:

            type: integer



    NTNTAClist:

      type: array

      items:

        $ref: '#/components/schemas/NrTac'

    

    Ephemeris:

      type: object

      oneOf:

        - $ref: '#/components/schemas/PositionVelocity'

        - $ref: '#/components/schemas/Orbital'

        - required: [ positionVelocity ]

        - required: [ orbital ]

      required:

        - satelliteId

        - epochTime

      properties:

        satelliteId:

          type: integer

          type: string

          pattern: '^[0-9]{5}$'

        epochTime:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

        positionVelocity:

          $ref: '#/components/schemas/PositionVelocity'

        orbital:

          $ref: '#/components/schemas/Orbital'



    EphemerisInfos:

      type: array

      items:

        $ref: '#/components/schemas/Ephemeris'



    PositionVelocity:

      type: object
@@ -933,6 +950,8 @@ components: 
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    dynamic5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    ephemerisInfoSetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    dCHOControl:

                      type: boolean

                    dDAPSHOControl:
@@ -1976,7 +1995,7 @@ components: 
                  $ref: '#/components/schemas/PlmnInfoList'

                nTNTAClist:

                  $ref: '#/components/schemas/NrTacList'

            EphemerisInfoSet:

            ephemerisInfoSet:

              $ref: '#/components/schemas/EphemerisInfoSet-Multiple'



    EphemerisInfoSet-Single:
@@ -1988,20 +2007,8 @@ components: 
              allOf:

                - type: object

                  properties:

                    EphemerisInfos:

                      $ref: '#/components/schemas/Ephemeris-Multiple'



    Ephemeris-Single:

      allOf:

              - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

              - type: object

                oneOf:

                  - $ref: '#/components/schemas/PositionVelocity'

                  - $ref: '#/components/schemas/Orbital'

                properties:

                  satelliteId:

                    type: integer



                    ephemerisInfos:

                      $ref: '#/components/schemas/EphemerisInfos'



#-------- Definition of JSON arrays for name-contained IOCs ----------------------
@@ -2170,10 +2177,6 @@ components: 
      items:

        $ref: '#/components/schemas/EphemerisInfoSet-Single'



    Ephemeris-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/Ephemeris-Single'

#-------- Definitions in TS 28.541 for TS 28.532 ---------------------------------



    resources-nrNrm:
@@ -2242,5 +2245,4 @@ components: 
        - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single'

        - $ref: '#/components/schemas/NTNFunction-Single'

        - $ref: '#/components/schemas/EphemerisInfoSet-Single'

        - $ref: '#/components/schemas/Ephemeris-Single'