From 1737f8640309aa8a72cba300ef96b105f05e9dfb Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Tue, 13 Feb 2024 11:20:29 -0500 Subject: [PATCH] Coverage Tiles: (#174) /coverage/tiles -> /tiles --- README.md | 6 +++--- standard/clause_6_overview.adoc | 12 ++++++------ standard/openapi/ogcapi-coverages-1.bundled.json | 6 +++--- standard/openapi/ogcapi-coverages-1.yaml | 6 +++--- .../requirements_class_coverage_tiles.adoc | 10 +++++----- standard/requirements/requirements_class_scenes.adoc | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index e9b4ee2..cd105f0 100644 --- a/README.md +++ b/README.md @@ -82,15 +82,15 @@ This resource is comparable to a WCS *_GetCoverage_* response. #### Defined in _Tiles - Part 1_ (_Coverage Tiles_) -`{root}/collections/{collectionId}/coverage/tiles` +`{root}/collections/{collectionId}/tiles` Returns the list of tilesets available for this coverage. -`{root}/collections/{collectionId}/coverage/tiles/{tileSetId}` +`{root}/collections/{collectionId}/tiles/{tileSetId}` Returns an individual coverage [tileset](https://github.com/opengeospatial/ogcapi-coverages/blob/master/standard/openapi/schemas/tms/tileSet.yaml) for a particular 2D Tile Matrix Set -`{root}/collections/{collectionId}/coverage/tiles/{tileSetId}/{tileMatrix}/{tileRow}/{tileCol}` +`{root}/collections/{collectionId}/tiles/{tileSetId}/{tileMatrix}/{tileRow}/{tileCol}` Returns an individual coverage tile for a particular 2D Tile Matrix Set, tile matrix, tile row and tile column diff --git a/standard/clause_6_overview.adoc b/standard/clause_6_overview.adoc index 0170367..eb556ee 100644 --- a/standard/clause_6_overview.adoc +++ b/standard/clause_6_overview.adoc @@ -61,17 +61,17 @@ The following table summarizes the resource paths defined in this standard, as w |`{root}/collections/{collectionId}` `/schema` |Returns the schema for the coverage fields or properties of values available at each direct position. At minimum, a _JSON Schema_ representation of this resource is available. This resource is comparable to the CIS _range type_ portion of the WCS *_DescribeCoverage_* response, and is retrieved separately from the collection description to accommodate more complex record schemas including several record fields and/or detailed semantic annotations. |`{root}/collections/{collectionId}` `/coverage` |Returns the coverage data, including any self-describing information (such as the _domain set_, _range type_ and _metadata_ components in addition to the _range set_ of CIS). This resource is comparable to a WCS *_GetCoverage_* response. 2+|**_OGC API - Tiles - Part 1_** -|`{root}/collections/{collectionId}` `/coverage/tiles` |Returns the list of tilesets available for this coverage. -|`{root}/collections/{collectionId}` `/coverage/tiles/{tileSetId}` |Returns an individual coverage tileset for a particular 2D Tile Matrix Set -|`{root}/collections/{collectionId}` `/coverage/tiles/{tileSetId}/{tileMatrix}/{tileRow}/{tileCol}` |Returns an individual coverage tile for a particular 2D Tile Matrix Set, tile matrix, tile row and tile column +|`{root}/collections/{collectionId}` `/tiles` |Returns the list of tilesets available for this coverage. +|`{root}/collections/{collectionId}` `/tiles/{tileSetId}` |Returns an individual coverage tileset for a particular 2D Tile Matrix Set +|`{root}/collections/{collectionId}` `/tiles/{tileSetId}/{tileMatrix}/{tileRow}/{tileCol}` |Returns an individual coverage tile for a particular 2D Tile Matrix Set, tile matrix, tile row and tile column 2+|**_OGC API - Coverages - Part 1_ (Scenes requirements class)** |`{root}/collections/{collectionId}` `/scenes` |Returns the list of scenes available for this coverage (for multi-scenes coverages, when the _Scenes_ requirement class is supported) |`{root}/collections/{collectionId}` `/scenes/{sceneId}` |Returns the scene metadata for an individual scene |`{root}/collections/{collectionId}` `/scenes/{sceneId}/coverage` |Returns the coverage data for an individual scene 2+|**_OGC API - Tiles - Part 1_ (for multi-scene coverage)** -|`{root}/collections/{collectionId}` `/scenes/{sceneId}/coverage/tiles` |Returns the list of tilesets available for this scene's coverage -|`{root}/collections/{collectionId}` `/scenes/{sceneId}/coverage/tiles/{tileSetId}` |Returns an individual scene coverage tileset for a particular 2D Tile Matrix Set -|`{root}/collections/{collectionId}` `/scenes/{sceneId}/coverage/tiles/{tileSetId}/{tileMatrix}/{tileRow}/{tileCol}` |Returns an individual scene coverage tile for a particular 2D Tile Matrix Set, tile matrix, tile row and tile column +|`{root}/collections/{collectionId}` `/scenes/{sceneId}/tiles` |Returns the list of tilesets available for this scene's coverage +|`{root}/collections/{collectionId}` `/scenes/{sceneId}/tiles/{tileSetId}` |Returns an individual scene coverage tileset for a particular 2D Tile Matrix Set +|`{root}/collections/{collectionId}` `/scenes/{sceneId}/tiles/{tileSetId}/{tileMatrix}/{tileRow}/{tileCol}` |Returns an individual scene coverage tile for a particular 2D Tile Matrix Set, tile matrix, tile row and tile column |=== Where: diff --git a/standard/openapi/ogcapi-coverages-1.bundled.json b/standard/openapi/ogcapi-coverages-1.bundled.json index 2a0828c..9c6c543 100644 --- a/standard/openapi/ogcapi-coverages-1.bundled.json +++ b/standard/openapi/ogcapi-coverages-1.bundled.json @@ -514,7 +514,7 @@ } } }, - "/collections/{collectionId}/coverage/tiles": { + "/collections/{collectionId}/tiles": { "get": { "tags": [ "Coverage Tiles" @@ -545,7 +545,7 @@ } } }, - "/collections/{collectionId}/coverage/tiles/{tileMatrixSetId}": { + "/collections/{collectionId}/tiles/{tileMatrixSetId}": { "get": { "tags": [ "Coverage Tiles" @@ -579,7 +579,7 @@ } } }, - "/collections/{collectionId}/coverage/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}": { + "/collections/{collectionId}/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}": { "get": { "tags": [ "Coverage Tiles" diff --git a/standard/openapi/ogcapi-coverages-1.yaml b/standard/openapi/ogcapi-coverages-1.yaml index 45981be..2f63eef 100644 --- a/standard/openapi/ogcapi-coverages-1.yaml +++ b/standard/openapi/ogcapi-coverages-1.yaml @@ -44,11 +44,11 @@ paths: $ref: 'paths/coverages-core/pSchema.yaml' # Coverage Tiles - /collections/{collectionId}/coverage/tiles: + /collections/{collectionId}/tiles: $ref: 'paths/tiles-core/collection-tiles/coverage-tiles/pCollectionCoverageTileSetsList.yaml' - /collections/{collectionId}/coverage/tiles/{tileMatrixSetId}: + /collections/{collectionId}/tiles/{tileMatrixSetId}: $ref: 'paths/tiles-core/collection-tiles/coverage-tiles/pCollectionCoverageTileSet.yaml' - /collections/{collectionId}/coverage/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}: + /collections/{collectionId}/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}: $ref: 'paths/tiles-core/collection-tiles/coverage-tiles/pCollectionCoverageTile.yaml' components: diff --git a/standard/requirements/requirements_class_coverage_tiles.adoc b/standard/requirements/requirements_class_coverage_tiles.adoc index 35947ec..b435222 100644 --- a/standard/requirements/requirements_class_coverage_tiles.adoc +++ b/standard/requirements/requirements_class_coverage_tiles.adoc @@ -10,7 +10,7 @@ === Requirements -==== Coverage tilesets (`/collections/{collectionId}/coverage/tiles`) +==== Coverage tilesets (`/collections/{collectionId}/tiles`) The capability to request tiles is defined in the following Requirement: [[req_coverage_tiles-definition]] @@ -18,12 +18,12 @@ The capability to request tiles is defined in the following Requirement: |=== ^|*Requirement {counter:req-id}* |*/req/coverage-tiles/tilesets* ^|A |The coverage SHALL have an associated list of at least one coverage tilesets accessible at + - `.../{collectionId}/coverage/tiles`, conforming to OGC API - Tiles - Part 1: Core + `.../{collectionId}/tiles`, conforming to OGC API - Tiles - Part 1: Core ^|B |The coverage's collection description document at `.../{collectionId}` SHALL include a link with relation type http://www.opengis.net/def/rel/ogc/1.0/tilesets-coverage linking to that resource listing available coverage tilesets ^|C |This list of coverage tilesets SHALL include a link to the full descriptions of these tilesets accessible at + - `.../{collectionId}/coverage/tiles/{tileMatrixSetId}` + `.../{collectionId}/tiles/{tileMatrixSetId}` ^|D |The tiles making up the tilesets SHALL be accessible from + - `.../{collectionId}/coverage/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}` + `.../{collectionId}/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}` ^|E |The responses for the list of tilesets, tileset metadata and tiles SHALL comply to all requirements of the OGC API - Tiles specifications ^|F |The response to a request for an individual tile SHALL return a subset of the coverage trimmed on the axes defined by the 2D Tile Matrix Set to cover the exact geospatial extent of the tile. @@ -33,7 +33,7 @@ to cover the exact geospatial extent of the tile. As an example, considering that the _WorldCRS84Quad_ Tile Matrix Set has tile pixel sizes defined as 256 x 256, a request for tile + -`.../coverage/tiles/WorldCRS84Quad/1/0/0` of a point coverage is equivalent to: +`.../tiles/WorldCRS84Quad/1/0/0` of a point coverage is equivalent to: `.../coverage?subset=Lat(0:90),Lon(-180:-90)&scale-size=257,257` diff --git a/standard/requirements/requirements_class_scenes.adoc b/standard/requirements/requirements_class_scenes.adoc index 7ef08f1..79d3436 100644 --- a/standard/requirements/requirements_class_scenes.adoc +++ b/standard/requirements/requirements_class_scenes.adoc @@ -73,13 +73,13 @@ as defined by the _OGC API - Records_ Local Resource Catalogues requirements cla ^|E |The response for the scene coverage SHALL otherwise follow all of the same requirements as defined in the _Core_ requirements class for a collection coverage response. |=== -==== Scene coverage tiles (`/collections/{collectionId}/scenes/{sceneId}/coverage/tiles`) +==== Scene coverage tiles (`/collections/{collectionId}/scenes/{sceneId}/tiles`) [[req_scenes-scene_coverage_tiles]] [width="90%",cols="2,6a"] |=== ^|*Requirement {counter:req-id}* |*/req/scenes/scene-coverage-tiles* -^|A |If the _Coverage Tiles_ requirements class is also supported, tilesets resources at `/collections/{collectionId}/scenes/{sceneId}/coverage/tiles` SHALL be supported, as defined by that requirement class and _OGC API - Tiles_. +^|A |If the _Coverage Tiles_ requirements class is also supported, tilesets resources at `/collections/{collectionId}/scenes/{sceneId}/tiles` SHALL be supported, as defined by that requirement class and _OGC API - Tiles_. |=== ==== Scene queryables