Skip to content

Commit

Permalink
Update filter conformance uris (#540)
Browse files Browse the repository at this point in the history
* fix: update filter conformance uris

* fix: names, add more conformance
  • Loading branch information
gadomski authored Mar 8, 2023
1 parent 6db83a9 commit 3b517e6
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
* Support `intersects` in GET requests ([#521](https://github.com/stac-utils/stac-fastapi/pull/521))
* Deleting items that had repeated ids in other collections ([#520](https://github.com/stac-utils/stac-fastapi/pull/520))
* 404 for missing collection on /items for sqlalchemy ([#528](https://github.com/stac-utils/stac-fastapi/pull/528))
* Conformance URIs for the filter extension ([#540](https://github.com/stac-utils/stac-fastapi/pull/540))

### Deprecated

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,24 @@ class FilterConformanceClasses(str, Enum):
"http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/features-filter"
)
ITEM_SEARCH_FILTER = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter"
CQL_TEXT = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:cql-text"
CQL_JSON = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:cql-json"
BASIC_CQL = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:basic-cql"
BASIC_SPATIAL_OPERATORS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:basic-spatial-operators"
BASIC_TEMPORAL_OPERATORS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:basic-temporal-operators"
ENHANCED_COMPARISON_OPERATORS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:enhanced-comparison-operators"
ENHANCED_SPATIAL_OPERATORS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:enhanced-spatial-operators"
ENHANCED_TEMPORAL_OPERATORS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:enhanced-temporal-operators"
FUNCTIONS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:functions"
ARITHMETIC = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:arithmetic"
ARRAYS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:arrays"
QUERYABLE_SECOND_OPERAND = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:queryable-second-operand"
CQL2_TEXT = "http://www.opengis.net/spec/cql2/1.0/conf/cql2-text"
CQL2_JSON = "http://www.opengis.net/spec/cql2/1.0/conf/cql2-json"
BASIC_CQL2 = "http://www.opengis.net/spec/cql2/1.0/conf/basic-cql2"
BASIC_SPATIAL_OPERATORS = (
"http://www.opengis.net/spec/cql2/1.0/conf/basic-spatial-operators"
)
TEMPORAL_OPERATORS = " http://www.opengis.net/spec/cql2/1.0/conf/temporal-operators"
ADVANCED_COMPARISON_OPERATORS = (
"http://www.opengis.net/spec/cql2/1.0/conf/advanced-comparison-operators"
)
SPATIAL_OPERATORS = "http://www.opengis.net/spec/cql2/1.0/conf/spatial-operators"
FUNCTIONS = "http://www.opengis.net/spec/cql2/1.0/conf/functions"
ARITHMETIC = "http://www.opengis.net/spec/cql2/1.0/conf/arithmetic"
ARRAYS = "http://www.opengis.net/spec/cql2/1.0/conf/array-operators"
PROPERTY_PROPERTY = "http://www.opengis.net/spec/cql2/1.0/conf/property-property"
ACCENT_CASE_INSENSITIVE_COMPARISON = (
"http://www.opengis.net/spec/cql2/1.0/conf/accent-case-insensitive-comparison"
)


@attr.s
Expand Down Expand Up @@ -68,8 +74,8 @@ class FilterExtension(ApiExtension):
FilterConformanceClasses.FILTER,
FilterConformanceClasses.FEATURES_FILTER,
FilterConformanceClasses.ITEM_SEARCH_FILTER,
FilterConformanceClasses.BASIC_CQL,
FilterConformanceClasses.CQL_TEXT,
FilterConformanceClasses.BASIC_CQL2,
FilterConformanceClasses.CQL2_TEXT,
]
)
router: APIRouter = attr.ib(factory=APIRouter)
Expand Down

0 comments on commit 3b517e6

Please sign in to comment.