Commit 79f9e0f1 authored by shumim's avatar shumim Committed by sunse
Browse files

Remove Ephemeris-Single and fix other change based on offlinle comments

parent 01116de3

OpenAPI/TS28541_NrNrm.yaml

+14 −21
Original line number Diff line number Diff line
@@ -606,6 +606,7 @@ components: 
            type: integer

          minValue:

            type: integer



    NTNTAClist:

      type: array

      items:
@@ -622,6 +623,8 @@ components: 
      properties:

        satelliteId:

          type: integer

          minimum: 0

          maximum: 99999

        epochTime:

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

        positionVelocity:
@@ -629,6 +632,11 @@ components: 
        orbital:

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



    EphemerisInfos:

      type: array

      items:

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



    PositionVelocity:

      type: object

      properties:
@@ -943,6 +951,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:
@@ -1986,7 +1996,7 @@ components: 
                  $ref: '#/components/schemas/PlmnInfoList'

                nTNTAClist:

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

            EphemerisInfoSet:

            ephemerisInfoSet:

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



    EphemerisInfoSet-Single:
@@ -1998,20 +2008,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 ----------------------
@@ -2180,10 +2178,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:
@@ -2252,5 +2246,4 @@ components: 
        - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single'

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

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

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