From 6a3f075731255f2ddeb1013d534a872b5fad1be6 Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Wed, 10 Apr 2024 19:46:06 -0400 Subject: [PATCH] schema: Remove crs property from uad-extent - Add definition as alternative to required properties - Clarify meaning of crs in extent.yaml, to avoid confusion with storageCrsBbox --- standard/openapi/ogcapi-coverages-1.bundled.json | 8 ++------ standard/openapi/schemas/common-geodata/extent-uad.yaml | 5 +---- standard/openapi/schemas/common-geodata/extent.yaml | 8 +++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/standard/openapi/ogcapi-coverages-1.bundled.json b/standard/openapi/ogcapi-coverages-1.bundled.json index 045d106..728e978 100644 --- a/standard/openapi/ogcapi-coverages-1.bundled.json +++ b/standard/openapi/ogcapi-coverages-1.bundled.json @@ -1004,7 +1004,7 @@ } }, "crs": { - "description": "Coordinate reference system of the coordinates in the spatial extent\n(property `bbox`). The default reference system is WGS 84 longitude/latitude.\nIn the Core the only other supported coordinate reference system is\nWGS 84 longitude/latitude/ellipsoidal height for coordinates with height.\nExtensions may support additional coordinate reference systems and add\nadditional enum values.", + "description": "Coordinate reference system of the coordinates of the `bbox` property.\nThe default reference system is WGS 84 longitude/latitude.\nWGS 84 longitude/latitude/ellipsoidal height for coordinates with height.\nFor non-terrestrial coordinate reference system, another CRS may be specified.", "type": "string", "enum": [ "http://www.opengis.net/def/crs/OGC/1.3/CRS84", @@ -1157,7 +1157,7 @@ { "required": [ "interval", - "crs" + "definition" ] }, { @@ -1201,10 +1201,6 @@ ] } }, - "crs": { - "type": "string", - "description": "generic coordinate reference system suitable for any type of dimensions" - }, "trs": { "type": "string", "description": "temporal coordinate reference system (e.g. as defined by Features for 'temporal')" diff --git a/standard/openapi/schemas/common-geodata/extent-uad.yaml b/standard/openapi/schemas/common-geodata/extent-uad.yaml index 775654d..0e25313 100644 --- a/standard/openapi/schemas/common-geodata/extent-uad.yaml +++ b/standard/openapi/schemas/common-geodata/extent-uad.yaml @@ -10,7 +10,7 @@ allOf: The domain intervals for any additional dimensions of the extent (envelope) beyond those described in temporal and spatial. type: object oneOf: - - required: [ interval, crs ] + - required: [ interval, definition ] - required: [ interval, trs ] - required: [ interval, vrs ] properties: @@ -40,9 +40,6 @@ allOf: - '2011-11-11T12:22:11Z' - 32.5 - null - crs: - type: string - description: generic coordinate reference system suitable for any type of dimensions trs: type: string description: temporal coordinate reference system (e.g. as defined by Features for 'temporal') diff --git a/standard/openapi/schemas/common-geodata/extent.yaml b/standard/openapi/schemas/common-geodata/extent.yaml index 9612055..d1a7782 100644 --- a/standard/openapi/schemas/common-geodata/extent.yaml +++ b/standard/openapi/schemas/common-geodata/extent.yaml @@ -108,12 +108,10 @@ properties: - 90 crs: description: |- - Coordinate reference system of the coordinates in the spatial extent - (property `bbox`). The default reference system is WGS 84 longitude/latitude. - In the Core the only other supported coordinate reference system is + Coordinate reference system of the coordinates of the `bbox` property. + The default reference system is WGS 84 longitude/latitude. WGS 84 longitude/latitude/ellipsoidal height for coordinates with height. - Extensions may support additional coordinate reference systems and add - additional enum values. + For non-terrestrial coordinate reference system, another CRS may be specified. type: string enum: - 'http://www.opengis.net/def/crs/OGC/1.3/CRS84'