From 10f8fa1ef7e915bb780433d9b5704ebd8b09bd8b Mon Sep 17 00:00:00 2001 From: m-burgoyne Date: Mon, 13 Nov 2023 09:08:56 +0000 Subject: [PATCH 1/9] Inherit common properties from DataQuery.yml --- .../schemas/collections/areaDataQuery.yaml | 33 +++---------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/core/standard/openapi/schemas/collections/areaDataQuery.yaml b/core/standard/openapi/schemas/collections/areaDataQuery.yaml index 329e9f8e0..646f6dab7 100644 --- a/core/standard/openapi/schemas/collections/areaDataQuery.yaml +++ b/core/standard/openapi/schemas/collections/areaDataQuery.yaml @@ -1,36 +1,11 @@ -description: Property to contain any extra metadata information that is specific - to an individual data queries -type: object +allOf: + - $ref: DataQuery.yaml +required: + - query_type properties: - title: - description: title of the query - type: string - example: Area query - description: - description: description of the query - type: string - example: Query to return data for a defined area query_type: description: Type of EDR query type: string enum: - area example: area - output_formats: - description: list of output formats supported by the Area query - type: array - items: - type: string - example: - - CoverageJSON - - GeoJSON - - IWXXM - - GRIB - default_output_format: - description: default output format for the Area query - type: string - crs_details: - description: List of key/value definitions for the CRS's supported by the Area query. The key is the query parameter and the value is the Well Known Text description - type: array - items: - $ref: crsObject.yaml From 9068315061fb7e2b606fb9dce3aa8e999a22baeb Mon Sep 17 00:00:00 2001 From: m-burgoyne Date: Mon, 13 Nov 2023 09:10:47 +0000 Subject: [PATCH 2/9] Create DataQuery.yaml --- .../schemas/collections/DataQuery.yaml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 core/standard/openapi/schemas/collections/DataQuery.yaml diff --git a/core/standard/openapi/schemas/collections/DataQuery.yaml b/core/standard/openapi/schemas/collections/DataQuery.yaml new file mode 100644 index 000000000..4380d1f21 --- /dev/null +++ b/core/standard/openapi/schemas/collections/DataQuery.yaml @@ -0,0 +1,36 @@ +description: Property to contain any extra metadata information that is specific + to an individual data queries +type: object +required: + - title + - description + - output_formats + - default_output_format + - crs_details +properties: + title: + description: title of the query + type: string + example: Position query + description: + description: description of the query + type: string + example: Query to return data for a defined well known text point + output_formats: + description: list of output formats supported by the Position query + type: array + items: + type: string + example: + - CoverageJSON + - GeoJSON + - IWXXM + - GRIB + default_output_format: + description: default output format for the Position query + type: string + crs_details: + description: List of key/value definitions for the CRS's supported by the Position query. The key is the query parameter and the value is the Well Known Text description + type: array + items: + $ref: crsObject.yaml From e518089d32ea5701fda6342e40abb1db08ce8424 Mon Sep 17 00:00:00 2001 From: m-burgoyne Date: Mon, 13 Nov 2023 09:11:34 +0000 Subject: [PATCH 3/9] Inherit common properties from DataQuery.yml --- .../collections/corridorDataQuery.yaml | 33 +++---------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/core/standard/openapi/schemas/collections/corridorDataQuery.yaml b/core/standard/openapi/schemas/collections/corridorDataQuery.yaml index 89a332715..dd3f8886c 100644 --- a/core/standard/openapi/schemas/collections/corridorDataQuery.yaml +++ b/core/standard/openapi/schemas/collections/corridorDataQuery.yaml @@ -1,15 +1,8 @@ -description: Property to contain any extra metadata information that is specific - to an individual data queries -type: object +allOf: + - $ref: DataQuery.yaml +required: + - query_type properties: - title: - description: title of the query - type: string - example: Corridor query - description: - description: description of the query - type: string - example: Query to return data for a defined corridor query_type: description: Type of EDR query type: string @@ -32,21 +25,3 @@ properties: example: - m - hPa - output_formats: - description: list of output formats the supported by the Corridor query - type: array - items: - type: string - example: - - CoverageJSON - - GeoJSON - - IWXXM - - GRIB - default_output_format: - description: default output format for the Corridor query - type: string - crs_details: - description: List of key/value definitions for the CRS's supported by the Corridor query. The key is the query parameter and the value is the Well Known Text description - type: array - items: - $ref: crsObject.yaml From 5c1e66473a2beb539462e6d14679271ece4937b8 Mon Sep 17 00:00:00 2001 From: m-burgoyne Date: Mon, 13 Nov 2023 09:12:20 +0000 Subject: [PATCH 4/9] Inherit common properties from DataQuery.yml --- .../schemas/collections/cubeDataQuery.yaml | 39 ++++--------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/core/standard/openapi/schemas/collections/cubeDataQuery.yaml b/core/standard/openapi/schemas/collections/cubeDataQuery.yaml index ab04f2f4e..83d2f3eca 100644 --- a/core/standard/openapi/schemas/collections/cubeDataQuery.yaml +++ b/core/standard/openapi/schemas/collections/cubeDataQuery.yaml @@ -1,44 +1,19 @@ -description: Property to contain any extra metadata information that is specific - to an individual data queries -type: object +allOf: + - $ref: DataQuery.yaml +required: + - query_type properties: - title: - description: title of the query - type: string - example: Cube query - description: - description: description of the query - type: string - example: Query to return data for a defined well known text point query_type: description: Type of EDR query type: string enum: - cube - example: cube + example: cube height_units: - description: list of height distance units distance values can be specified in + description: list of z distance units vertical values can be specified in type: array items: type: string example: - m - - hPa - output_formats: - description: list of output formats supported by the Cube query - type: array - items: - type: string - example: - - CoverageJSON - - GeoJSON - - IWXXM - - GRIB - default_output_format: - description: default output format of the Cube query - type: string - crs_details: - description: List of key/value definitions for the CRS's supported by the Cube query. The key is the query parameter and the value is the Well Known Text description - type: array - items: - $ref: crsObject.yaml + - hPa From 65dd47895ab9d0d98340a169de077239ac5c1192 Mon Sep 17 00:00:00 2001 From: m-burgoyne Date: Mon, 13 Nov 2023 09:12:58 +0000 Subject: [PATCH 5/9] Inherit common properties from DataQuery.yml --- .../collections/locationsDataQuery.yaml | 33 +++---------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/core/standard/openapi/schemas/collections/locationsDataQuery.yaml b/core/standard/openapi/schemas/collections/locationsDataQuery.yaml index a5e9959e7..5b5087d55 100644 --- a/core/standard/openapi/schemas/collections/locationsDataQuery.yaml +++ b/core/standard/openapi/schemas/collections/locationsDataQuery.yaml @@ -1,36 +1,11 @@ -description: Property to contain any extra metadata information that is specific - to an individual data queries -type: object +allOf: + - $ref: DataQuery.yaml +required: + - query_type properties: - title: - description: title of the query - type: string - example: Locations query - description: - description: description of the query - type: string - example: Query to return data for a defined well known text point query_type: description: Type of EDR query type: string enum: - locations example: locations - output_formats: - description: list of output formats supported by the Locations query - type: array - items: - type: string - example: - - CoverageJSON - - GeoJSON - - IWXXM - - GRIB - default_output_format: - description: default output format of the Locations query - type: string - crs_details: - description: List of key/value definitions for the CRS's supported by the Locations query. The key is the query parameter and the value is the Well Known Text description - type: array - items: - $ref: crsObject.yaml From 8b82b6f4691665fc3809523b19eefa8da65ef409 Mon Sep 17 00:00:00 2001 From: m-burgoyne Date: Mon, 13 Nov 2023 09:13:42 +0000 Subject: [PATCH 6/9] Inherit common properties from DataQuery.yml --- .../collections/positionDataQuery.yaml | 33 +++---------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/core/standard/openapi/schemas/collections/positionDataQuery.yaml b/core/standard/openapi/schemas/collections/positionDataQuery.yaml index 899c16eca..c236d6b88 100644 --- a/core/standard/openapi/schemas/collections/positionDataQuery.yaml +++ b/core/standard/openapi/schemas/collections/positionDataQuery.yaml @@ -1,36 +1,11 @@ -description: Property to contain any extra metadata information that is specific - to an individual data queries -type: object +allOf: + - $ref: DataQuery.yaml +required: + - query_type properties: - title: - description: title of the query - type: string - example: Position query - description: - description: description of the query - type: string - example: Query to return data for a defined well known text point query_type: description: Type of EDR query type: string enum: - position example: position - output_formats: - description: list of output formats supported by the Position query - type: array - items: - type: string - example: - - CoverageJSON - - GeoJSON - - IWXXM - - GRIB - default_output_format: - description: default output format for the Position query - type: string - crs_details: - description: List of key/value definitions for the CRS's supported by the Position query. The key is the query parameter and the value is the Well Known Text description - type: array - items: - $ref: crsObject.yaml From 91fe4d92b122c29580f26238f3ffcc060dde34dc Mon Sep 17 00:00:00 2001 From: m-burgoyne Date: Mon, 13 Nov 2023 09:14:23 +0000 Subject: [PATCH 7/9] Inherit common properties from DataQuery.yml --- .../schemas/collections/radiusDataQuery.yaml | 31 ++----------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/core/standard/openapi/schemas/collections/radiusDataQuery.yaml b/core/standard/openapi/schemas/collections/radiusDataQuery.yaml index 2df4d1448..fb31980ad 100644 --- a/core/standard/openapi/schemas/collections/radiusDataQuery.yaml +++ b/core/standard/openapi/schemas/collections/radiusDataQuery.yaml @@ -1,15 +1,6 @@ -description: Property to contain any extra metadata information that is specific - to an individual data queries -type: object +allOf: + - $ref: DataQuery.yaml properties: - title: - description: title of the query - type: string - example: Radius query - description: - description: description of the query - type: string - example: Query to return data for a defined well known text point query_type: description: Type of EDR query type: string @@ -24,21 +15,3 @@ properties: example: - km - miles - output_formats: - description: list of formats supported by the Radius query - type: array - items: - type: string - example: - - CoverageJSON - - GeoJSON - - IWXXM - - GRIB - default_output_format: - description: default outputformat for the Radius query - type: string - crs_details: - description: List of key/value definitions for the CRS's supported by the Radius query. The key is the query parameter and the value is the Well Known Text description - type: array - items: - $ref: crsObject.yaml From 272eeb93232403310e8128b66a4d8f6ccf07870e Mon Sep 17 00:00:00 2001 From: m-burgoyne Date: Mon, 13 Nov 2023 09:15:01 +0000 Subject: [PATCH 8/9] Inherit common properties from DataQuery.yml --- .../collections/trajectoryDataQuery.yaml | 31 ++----------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/core/standard/openapi/schemas/collections/trajectoryDataQuery.yaml b/core/standard/openapi/schemas/collections/trajectoryDataQuery.yaml index a111b1c6c..141069ebf 100644 --- a/core/standard/openapi/schemas/collections/trajectoryDataQuery.yaml +++ b/core/standard/openapi/schemas/collections/trajectoryDataQuery.yaml @@ -1,36 +1,9 @@ -description: Property to contain any extra metadata information that is specific - to an individual data queries -type: object +allOf: + - $ref: DataQuery.yaml properties: - title: - description: title of the query - type: string - example: Trajectory query - description: - description: description of the query - type: string - example: Query to return data for a defined well known text point query_type: description: Type of EDR query type: string enum: - trajectory example: trajectory - output_formats: - description: list of ouputformats supported by the Trajectory query - type: array - items: - type: string - example: - - CoverageJSON - - GeoJSON - - IWXXM - - GRIB - default_output_format: - description: default outputformat for the Trajectory query - type: string - crs_details: - description: List of key/value definitions for the CRS's supported by a Trajectory query. The key is the query parameter and the value is the Well Known Text description - type: array - items: - $ref: crsObject.yaml From 0d3e474087d9d2370cf21f6773bd2ad75e8f0d94 Mon Sep 17 00:00:00 2001 From: Chris Little Date: Thu, 23 Nov 2023 14:28:12 +0000 Subject: [PATCH 9/9] Update DataQuery.yaml Improve Grammar --- core/standard/openapi/schemas/collections/DataQuery.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/standard/openapi/schemas/collections/DataQuery.yaml b/core/standard/openapi/schemas/collections/DataQuery.yaml index 4380d1f21..3972a3563 100644 --- a/core/standard/openapi/schemas/collections/DataQuery.yaml +++ b/core/standard/openapi/schemas/collections/DataQuery.yaml @@ -1,5 +1,5 @@ description: Property to contain any extra metadata information that is specific - to an individual data queries + to an individual data query type: object required: - title