Merge pull request #202 from philvarner/conformance-classes-realign

Filter Extension - Conformance classes realign
radiantearth · Oct 5, 2021 · 7206ae9 · 7206ae9
2 parents 2e96574 + 63dac3d
commit 7206ae9
Show file tree

Hide file tree

Showing 5 changed files with 296 additions and 241 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [Unreleased - v1.0.0-beta4] - TBD
 
 ### Added
 
@@ -16,6 +16,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Filter Extension - query language is now referred to as "CQL2" rather than CQL
+- Filter Extension now uses OAFeat Part 3 conformance class URIs
+- Filter Extension - The following changes have been made to the Filter Extension conformance classes to align with changes to the OAFeat CQL draft. All classes
+  whose names have changed also have changed conformance URI strings.
+  - "Basic CQL" now includes the "not equal" operator (`<>`)
+  - "Basic CQL" has always supported datetime comparisons, but this is now explicitly mentioned
+  - "Enhanced Comparison Operators" has been renamed "Advanced Comparison Operators". This is the same as the OAFeat CQL definition, except
+    that it does not require the `upper` and `lower` functions.
+  - "Enhanced Spatial Operators" has been renamed to just "Spatial Operators" (not to be confused with Basic Spatial Operators)
+  - "Basic Temporal Operators" and "Enhanced Temporal Operators" have merged into "Temporal Operators"
+  - "Functions" has been renamed "Custom Functions"
+  - "Arithmetic" has been renamed "Arithmetic Expressions"
+  - "Arrays" has been renamed "Array Operators"
+  - "Queryable Second Operand" has been renamed "Property-Property Comparisons"
 - The required Link Relations and endpoints for each conformance class now use the wording of 'shall' 
   instead of 'should'. While this technically changes the semantics, it was generally understood 
   previously the semantics were those of 'shall' (must).

diff --git a/collections/README.md b/collections/README.md
@@ -1,6 +1,7 @@
 # STAC API - Collections
 
 - [STAC API - Collections](#stac-api---collections)
+  - [Link Relations](#link-relations)
   - [Endpoints](#endpoints)
   - [Example](#example)
 
@@ -19,22 +20,24 @@ Data](http://docs.opengeospatial.org/DRAFTS/20-024.html) as the [Collections req
 class](http://docs.opengeospatial.org/DRAFTS/20-024.html#rc_collections-section). Once the Common version is released we will 
 aim to align with it. But it still seems to be in flux.*
 
+## Link Relations
+
 The following Link relations shall exist in the Landing Page (root).
 
 | **rel**        | **href**             | **From**       | **Description**                                                                                                                                                         |
 | -------------- | -------------------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `root`         | `/`                  | STAC Core      | The root URI                                                                                                                                                            |
 | `self`         | `/`                  | OAFeat         | Self reference, same as root URI                                                                                                                                        |
 | `service-desc` | `/api` | OAFeat OpenAPI | The OpenAPI service description. Uses the `application/vnd.oai.openapi+json;version=3.0` media type to refer to the OpenAPI 3.0 document that defines the service's API. The path for this endpoint is only recommended to be `/api`, but may be another path. |
-| `data`         | `/collections`       | OAFeat         | List of Collections                                                                                                                                                     |
-A `service-doc` endpoint is recommended, but not required.
+| `data`         | `/collections`       | OAFeat         | List of Collections   |
 
+A `service-doc` endpoint is recommended, but not required.
 
 | **rel**       | **href**                  | **From**       | **Description**  |
 | ------------- | ------------------------- | -------------- | ----------------------------------------------------------------------------------------------------------------------- |
 | `service-doc` | `/api.html` | OAFeat OpenAPI | An HTML service description.  Uses the `text/html` media type to refer to a human-consumable description of the service. The path for this endpoint is only recommended to be `/api.html`, but may be another path. |
 
-Additionally, these relations may exist:
+Additionally, `child` relations may exist to individual catalogs and collections.
 
 | **rel**        | **href**             | **From**       | **Description**                                                                                                                                                         |
 | -------------- | -------------------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- |

diff --git a/extensions.md b/extensions.md
@@ -69,11 +69,19 @@ the service supports. This are listed at the top of each extension description,
   - <https://api.stacspec.org/v1.0.0-beta.4/item-search#fields>
   - <https://api.stacspec.org/v1.0.0-beta.4/ogcapi-features#fields>
 - [Filter](item-search/README.md#filter)
-  - <https://api.stacspec.org/v1.0.0-beta.4/item-search#filter:filter>
-  - <https://api.stacspec.org/v1.0.0-beta.4/item-search#filter:simple-cql>
+  - <http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/filter>
+  - <http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/basic-cql>
   - <https://api.stacspec.org/v1.0.0-beta.4/item-search#filter:item-search-filter>
-  - <https://api.stacspec.org/v1.0.0-beta.4/item-search#filter:cql-text>
-  - <https://api.stacspec.org/v1.0.0-beta.4/item-search#filter:cql-json>
+  - <http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/cql-text>
+  - <http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/cql-json>
+  - <http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/advanced-comparison-operators>
+  - <http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/basic-spatial-operators>
+  - <http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/spatial-operators>
+  - <http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/temporal-operators>
+  - <http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/functions>
+  - <http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/arithmetic>
+  - <http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/array-operators>
+  - <http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/property-property>
 - [Context](item-search/README.md#context)
   - <https://api.stacspec.org/v1.0.0-beta.4/item-search#context>
   - <https://api.stacspec.org/v1.0.0-beta.4/ogcapi-features#context>