OpenAPI Definition: Updated

opengeospatial · Sep 7, 2023 · 4923547 · 4923547
1 parent 3a60696
commit 4923547
Show file tree

Hide file tree

Showing 13 changed files with 2,588 additions and 1,074 deletions.
diff --git a/standard/openapi/ogcapi-coverages-1.bundled.json b/standard/openapi/ogcapi-coverages-1.bundled.json
diff --git a/standard/openapi/ogcapi-coverages-1.yaml b/standard/openapi/ogcapi-coverages-1.yaml
@@ -40,14 +40,8 @@ paths:
    # OGC API - Coverages - Part 1: Core
    /collections/{collectionId}/coverage:
       $ref: 'paths/coverages-core/pCoverage.yaml'
-   /collections/{collectionId}/coverage/domainset:
-      $ref: 'paths/coverages-core/pDomainSet.yaml'
-   /collections/{collectionId}/coverage/rangetype:
-      $ref: 'paths/coverages-core/pRangeType.yaml'
-   /collections/{collectionId}/coverage/rangeset:
-      $ref: 'paths/coverages-core/pRangeSet.yaml'
-   /collections/{collectionId}/coverage/metadata:
-      $ref: 'paths/coverages-core/pMetadata.yaml'
+   /collections/{collectionId}/schema:
+      $ref: 'paths/coverages-core/pSchema.yaml'
 
    # Coverage Tiles
    /collections/{collectionId}/coverage/tiles:
@@ -96,12 +90,6 @@ components:
          $ref: 'schemas/common-geodata/numberMatched.yaml'
 
       # CIS
-      domainSet:
-         $ref: 'schemas/cis/domainSet.yaml'
-      rangeType:
-         $ref: 'schemas/cis/rangeType.yaml'
-      rangeSet:
-         $ref: 'schemas/cis/rangeSet.yaml'
       coverageSchema:
          $ref: 'schemas/cis/coverage-schema.yaml'
 
@@ -166,12 +154,6 @@ components:
       # Coverages - Core (unspecified)
       f-coverage:
          $ref: 'parameters/unspecified/f-coverage.yaml'
-      f-rangeset:
-         $ref: 'parameters/unspecified/f-rangeset.yaml'
-      f-domainset:
-         $ref: 'parameters/unspecified/f-domainset.yaml'
-      f-rangetype:
-         $ref: 'parameters/unspecified/f-rangetype.yaml'
 
       # Tiles - Core
       tileMatrix:

diff --git a/standard/openapi/paths/coverages-core/pDomainSet.yaml b/standard/openapi/paths/coverages-core/pDomainSet.yaml
diff --git a/standard/openapi/paths/coverages-core/pMetadata.yaml b/standard/openapi/paths/coverages-core/pMetadata.yaml
diff --git a/standard/openapi/paths/coverages-core/pRangeSet.yaml b/standard/openapi/paths/coverages-core/pRangeSet.yaml
diff --git a/standard/openapi/paths/coverages-core/pRangeType.yaml b/standard/openapi/paths/coverages-core/pRangeType.yaml
diff --git a/standard/openapi/paths/coverages-core/pSchema.yaml b/standard/openapi/paths/coverages-core/pSchema.yaml
@@ -0,0 +1,17 @@
+# Schema
+get:
+  tags:
+    - Coverage
+  summary: Retrieve the schema of the coverage identified by {collectionId}
+  description: |-
+    Schema for coverage identified by {collectionId}.
+    Use content negotiation to request required format.
+  operationId: getCoverageSchema
+  parameters:
+    - $ref: '../../parameters/common-geodata/collectionId-coverage.yaml'
+    - $ref: '../../parameters/unspecified/f-metadata.yaml'
+  responses:
+    '200':
+      $ref: '../../responses/coverages-core/rSchema.yaml'
+    default:
+      $ref: '../../responses/common-core/rException.yaml'
diff --git a/standard/openapi/responses/coverages-core/rCoverage.yaml b/standard/openapi/responses/coverages-core/rCoverage.yaml
@@ -1,13 +1,40 @@
-description: A full coverage.
+description: A coverage, including any self-describing information supported by the encoding.
 content:
+   application/prs.coverage+json:
+     schema:
+       $ref: 'https://schemas.opengis.net/covjson/1.0/coveragejson.json'
    application/json:
      schema:
        $ref: '../../schemas/cis/coverage-schema.yaml'
    image/tiff; application=geotiff:
      schema:
        type: string
        format: binary
-   multipart/related:
+   application/x-netcdf:
+     schema:
+       type: string
+       format: binary
+   vnd.las:
+     schema:
+       type: string
+       format: binary
+   vnd.laszip:
+     schema:
+       type: string
+       format: binary
+   image/png:
+     schema:
+       type: string
+       format: binary
+   image/jxl:
+     schema:
+       type: string
+       format: binary
+   image/jp2:
+     schema:
+       type: string
+       format: binary
+   application/x-zarr:
      schema:
        type: string
        format: binary

diff --git a/standard/openapi/responses/coverages-core/rDomainSet.yaml b/standard/openapi/responses/coverages-core/rDomainSet.yaml
diff --git a/standard/openapi/responses/coverages-core/rMetadata.yaml b/standard/openapi/responses/coverages-core/rMetadata.yaml
diff --git a/standard/openapi/responses/coverages-core/rRangeSet.yaml b/standard/openapi/responses/coverages-core/rRangeSet.yaml
diff --git a/standard/openapi/responses/coverages-core/rRangeType.yaml b/standard/openapi/responses/coverages-core/rRangeType.yaml
diff --git a/standard/openapi/schemas/tms/propertiesSchema.yaml b/standard/openapi/schemas/tms/propertiesSchema.yaml
@@ -73,13 +73,16 @@ properties:
            type: integer
            default: 0
            minimum: 0
-         observedProperty:
+         x-ogc-observedProperty:
            type: string
-         observedPropertyURI:
+         x-ogc-observedPropertyURI:
            type: string
            format: uri
-         uom:
+         x-ogc-uom:
            type: string
-         uomURI:
+         x-ogc-uomURI:
            type: string
            format: uri
+         x-ogc-fieldIndex:
+           type: integer
+           minimum: 0