Skip to content

Commit 3b517e6

Browse files
authored
Update filter conformance uris (#540)
* fix: update filter conformance uris * fix: names, add more conformance
1 parent 6db83a9 commit 3b517e6

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
* Support `intersects` in GET requests ([#521](https://github.com/stac-utils/stac-fastapi/pull/521))
3030
* Deleting items that had repeated ids in other collections ([#520](https://github.com/stac-utils/stac-fastapi/pull/520))
3131
* 404 for missing collection on /items for sqlalchemy ([#528](https://github.com/stac-utils/stac-fastapi/pull/528))
32+
* Conformance URIs for the filter extension ([#540](https://github.com/stac-utils/stac-fastapi/pull/540))
3233

3334
### Deprecated
3435

stac_fastapi/extensions/stac_fastapi/extensions/core/filter/filter.py

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,24 @@ class FilterConformanceClasses(str, Enum):
2626
"http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/features-filter"
2727
)
2828
ITEM_SEARCH_FILTER = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter"
29-
CQL_TEXT = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:cql-text"
30-
CQL_JSON = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:cql-json"
31-
BASIC_CQL = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:basic-cql"
32-
BASIC_SPATIAL_OPERATORS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:basic-spatial-operators"
33-
BASIC_TEMPORAL_OPERATORS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:basic-temporal-operators"
34-
ENHANCED_COMPARISON_OPERATORS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:enhanced-comparison-operators"
35-
ENHANCED_SPATIAL_OPERATORS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:enhanced-spatial-operators"
36-
ENHANCED_TEMPORAL_OPERATORS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:enhanced-temporal-operators"
37-
FUNCTIONS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:functions"
38-
ARITHMETIC = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:arithmetic"
39-
ARRAYS = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:arrays"
40-
QUERYABLE_SECOND_OPERAND = "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter:queryable-second-operand"
29+
CQL2_TEXT = "http://www.opengis.net/spec/cql2/1.0/conf/cql2-text"
30+
CQL2_JSON = "http://www.opengis.net/spec/cql2/1.0/conf/cql2-json"
31+
BASIC_CQL2 = "http://www.opengis.net/spec/cql2/1.0/conf/basic-cql2"
32+
BASIC_SPATIAL_OPERATORS = (
33+
"http://www.opengis.net/spec/cql2/1.0/conf/basic-spatial-operators"
34+
)
35+
TEMPORAL_OPERATORS = " http://www.opengis.net/spec/cql2/1.0/conf/temporal-operators"
36+
ADVANCED_COMPARISON_OPERATORS = (
37+
"http://www.opengis.net/spec/cql2/1.0/conf/advanced-comparison-operators"
38+
)
39+
SPATIAL_OPERATORS = "http://www.opengis.net/spec/cql2/1.0/conf/spatial-operators"
40+
FUNCTIONS = "http://www.opengis.net/spec/cql2/1.0/conf/functions"
41+
ARITHMETIC = "http://www.opengis.net/spec/cql2/1.0/conf/arithmetic"
42+
ARRAYS = "http://www.opengis.net/spec/cql2/1.0/conf/array-operators"
43+
PROPERTY_PROPERTY = "http://www.opengis.net/spec/cql2/1.0/conf/property-property"
44+
ACCENT_CASE_INSENSITIVE_COMPARISON = (
45+
"http://www.opengis.net/spec/cql2/1.0/conf/accent-case-insensitive-comparison"
46+
)
4147

4248

4349
@attr.s
@@ -68,8 +74,8 @@ class FilterExtension(ApiExtension):
6874
FilterConformanceClasses.FILTER,
6975
FilterConformanceClasses.FEATURES_FILTER,
7076
FilterConformanceClasses.ITEM_SEARCH_FILTER,
71-
FilterConformanceClasses.BASIC_CQL,
72-
FilterConformanceClasses.CQL_TEXT,
77+
FilterConformanceClasses.BASIC_CQL2,
78+
FilterConformanceClasses.CQL2_TEXT,
7379
]
7480
)
7581
router: APIRouter = attr.ib(factory=APIRouter)

0 commit comments

Comments
 (0)