From 01116de3ae303028f2d4418a600cbb0eb0363ff7 Mon Sep 17 00:00:00 2001 From: shumim Date: Fri, 3 Nov 2023 06:14:15 +0000 Subject: [PATCH 1/3] Update_definitions_of_Ephemeris --- OpenAPI/TS28541_NrNrm.yaml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 23ae0bec9..70add6d8c 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -610,15 +610,25 @@ components: 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 - + epochTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + positionVelocity: + $ref: '#/components/schemas/PositionVelocity' + orbital: + $ref: '#/components/schemas/Orbital' + PositionVelocity: type: object properties: -- GitLab From 79f9e0f1c13348220463020a973235fb9cff0640 Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 9 Nov 2023 08:17:09 +0000 Subject: [PATCH 2/3] Remove Ephemeris-Single and fix other change based on offlinle comments --- OpenAPI/TS28541_NrNrm.yaml | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 70add6d8c..51039e05d 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -606,11 +606,12 @@ components: type: integer minValue: type: integer + NTNTAClist: type: array items: $ref: '#/components/schemas/NrTac' - + Ephemeris: type: object oneOf: @@ -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' -- GitLab From 3d5af4ef3c832e3a9c0ac33c6a9ef320e3289b5c Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 16 Nov 2023 14:04:12 +0000 Subject: [PATCH 3/3] change satelliteId from interger to string --- OpenAPI/TS28541_NrNrm.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 51039e05d..ec4d20d03 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -622,9 +622,8 @@ components: - epochTime properties: satelliteId: - type: integer - minimum: 0 - maximum: 99999 + type: string + pattern: '^[0-9]{5}$' epochTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' positionVelocity: -- GitLab