normalize CQL text support to CQL2 (#2015)

[tomkralidis]

Overview

Normalizes CQL text support for CQL2 only.

Related Issue / discussion

#2015

Additional information

Dependency policy (RFC2)

• I have ensured that this PR meets RFC2 requirements

Updates to public demo

• I have ensured that breaking changes to the pygeoapi master demo server have been addressed
  • https://github.com/geopython/demo.pygeoapi.io/blob/master/services/pygeoapi_master/local.config.yml

Contributions and licensing

(as per https://github.com/geopython/pygeoapi/blob/master/CONTRIBUTING.md#contributions-and-licensing)

• I'd like to contribute [feature X|bugfix Y|docs|something else] to pygeoapi. I confirm that my contributions to pygeoapi will be compatible with the pygeoapi license guidelines at the time of contribution
• I have already previously agreed to the pygeoapi Contributions and Licensing Guidelines

[teetin]

Could you also ensure that the appropriate entries to conformance page would be added if this provider is used
I assume those would be (al last,):
http://www.opengis.net/spec/cql2/1.0/conf/cql2-text
http://www.opengis.net/spec/cql2/1.0/conf/basic-cql2
for example QGIS is very strict on these and even with these additions the list is still uncomplete.

Supported filter types (cql2-text and cql2-json) should also be added to:

    LOGGER.debug('Processing filter-lang parameter')
    filter_lang = request.params.get('filter-lang')
    # Currently only cql-text is handled, but it is optional
    if filter_lang not in [None, 'cql-json', 'cql-text', 'cql2-text', 'cql2-json']:

[webb-ben]

@tomkralidis is this ready for review? (cc: @mikemahoney218-usgs )

[tomkralidis]

Could you also ensure that the appropriate entries to conformance page would be added if this provider is used I assume those would be (al last,): http://www.opengis.net/spec/cql2/1.0/conf/cql2-text http://www.opengis.net/spec/cql2/1.0/conf/basic-cql2 for example QGIS is very strict on these and even with these additions the list is still uncomplete.

Supported filter types (cql2-text and cql2-json) should also be added to:

    LOGGER.debug('Processing filter-lang parameter')
    filter_lang = request.params.get('filter-lang')
    # Currently only cql-text is handled, but it is optional
    if filter_lang not in [None, 'cql-json', 'cql-text', 'cql2-text', 'cql2-json']:

Thanks @teetin; PR updated.

[tomkralidis]

@tomkralidis is this ready for review? (cc: @mikemahoney218-usgs )

It is not ready (hence no reviewer assignment). CI (using pygeofilter main branch for testing) shows a pygeofilter error:

FAILED tests/provider/test_postgresql_provider.py::test_query_cql[connection_string-osm_id BETWEEN 80800000 AND 80900000 AND CASEI(waterway) LIKE 'sTrEam'-expected_ids2] - NotImplementedError: Failed to evaluate node of type <class 'pygeofilter.ast.Function'>

[mikemahoney218-usgs]

Just as a note, if you pass --force-reinstall to install pygeofilter from main and then wrap the literal in CASEI, you get a different lark grammar error -- I'm guessing I missed updating that file
mikemahoney218-usgs#1

[tomkralidis]

Thanks @mikemahoney218-usgs. Once this is addressed in pygeofilter proper, we can kick CI here again.

[mikemahoney218-usgs]

I've got a PR at geopython/pygeofilter#142 that should let CASEI work with LIKE statements. There's a few test cases that need to get updated to make this succeed, namely:

• Replace INTERSECTS with S_INTERSECTS and CROSSES with S_CROSSES
• Remove references to DWITHIN which is not part of CQL2

The "build" CI job succeeds after installing that pygeofilter PR (flake8 fails, but I figured fixing that on the fork would be more confusing than clarifying) -
https://github.com/mikemahoney218-usgs/pygeoapi/actions/runs/26538484746/job/78173573168

[mikemahoney218-usgs]

Suggested change

	'S_INTERSECTS(geometry, POINT(1 1))',

[mikemahoney218-usgs]

Suggested change

	'some_attribute = 10 AND S_INTERSECTS(geometry, POINT(1 1))',

[ricardogsilva]

@tomkralidis you may also be interested in this:

geopython/pygeofilter#143

pygeofilter does not currently implement the CQL2 BBOX literal correctly - fixing this would benefit pygeoapi as well IMO

[kalxas]

Perhaps wait for a new pygeofilter release?

[tomkralidis]

+1. Will keep this PR open until the next release of pygeofilter (thus removing the above).