openapi: Attempt at fixing SwaggerUI validation issue

jerstlouis · Sep 15, 2023 · 6cff349 · 6cff349
1 parent 5d85cf9
commit 6cff349
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 38 deletions.
diff --git a/standard/openapi/ogcapi-coverages-1.bundled.json b/standard/openapi/ogcapi-coverages-1.bundled.json
@@ -1258,6 +1258,47 @@
         "minimum": 0,
         "example": 127
       },
+      "coverages": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/collections"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "collections": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/coverageInfo"
+                }
+              }
+            }
+          }
+        ]
+      },
+      "coverageInfo": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/collectionInfo"
+          },
+          {
+            "type": "object",
+            "required": [
+              "extent"
+            ],
+            "properties": {
+              "orderedAxes": {
+                "type": "array",
+                "minItems": 1,
+                "items": {
+                  "type": "string",
+                  "description": "axis labels of all dimensions listed in CRS order. Spatial dimensions should be listed separately here."
+                }
+              }
+            }
+          }
+        ]
+      },
       "coverageSchema": {
         "title": "Coverage object",
         "description": "Component of OGC Coverage Implementation Schema 1.1. Last updated: 2016-may-18. Copyright (c) 2016 Open Geospatial Consortium, Inc. All Rights Reserved. To obtain additional rights of use, visit http://www.opengeospatial.org/legal/.",
@@ -3141,22 +3182,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/collections"
-                },
-                {
-                  "type": "object",
-                  "properties": {
-                    "collections": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/responses/Collection/content/application~1json/schema"
-                      }
-                    }
-                  }
-                }
-              ]
+              "$ref": "#/components/schemas/coverages"
             },
             "example": {
               "links": [
@@ -3251,27 +3277,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/collectionInfo"
-                },
-                {
-                  "type": "object",
-                  "required": [
-                    "extent"
-                  ],
-                  "properties": {
-                    "orderedAxes": {
-                      "type": "array",
-                      "minItems": 1,
-                      "items": {
-                        "type": "string",
-                        "description": "axis labels of all dimensions listed in CRS order. Spatial dimensions should be listed separately here."
-                      }
-                    }
-                  }
-                }
-              ]
+              "$ref": "#/components/schemas/coverageInfo"
             },
             "example": {
               "id": "elevation",

diff --git a/standard/openapi/ogcapi-coverages-1.yaml b/standard/openapi/ogcapi-coverages-1.yaml
@@ -89,6 +89,12 @@ components:
       numberMatched:
          $ref: 'schemas/common-geodata/numberMatched.yaml'
 
+      # Coverages - Core (this adds `orderedAxes`, which could possibly be defined in Common as well?)
+      coverages:
+         $ref: 'schemas/coverages-core/coverages.yaml'
+      coverageInfo:
+         $ref: 'schemas/coverages-core/coverageInfo.yaml'
+
       # CIS
       coverageSchema:
          $ref: 'schemas/cis/coverage-schema.yaml'
@@ -141,7 +147,7 @@ components:
       bbox-crs:
          $ref: 'parameters/common-crs/bbox-crs.yaml'
 
-      # Coverages - Core (unspecified)
+      # Coverages - Core
       scale-factor:
          $ref: 'parameters/coverages-core/scale-factor.yaml'
       scale-axes: