update CQL2 BETWEEN syntax

Author: jamesfisher-geo

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/app.py

@@ -26,7 +26,7 @@
 
 filter_extension = FilterExtension(client=EsAsyncBaseFiltersClient())
 filter_extension.conformance_classes.append(
-    "http://www.opengis.net/spec/cql2/1.0/req/advanced-comparison-operators"
+    "http://www.opengis.net/spec/cql2/1.0/conf/advanced-comparison-operators"
 )
 
 extensions = [

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/extensions/filter.py

@@ -191,18 +191,16 @@ def to_es(self):
                 "wildcard": {
                     to_es(self.args[0]): {
                         "value": cql2_like_to_es(str(to_es(self.args[1]))),
-                        "case_insensitive": "true",
+                        "case_insensitive": "false",
                     }
                 }
             }
         elif self.op == AdvancedComparisonOp.between:
-            if not isinstance(self.args[1], List):
-                raise RuntimeError(f"Arg {self.args[1]} is not a list")
             return {
                 "range": {
                     to_es(self.args[0]): {
-                        "gte": to_es(self.args[1][0]),
-                        "lte": to_es(self.args[1][1]),
+                        "gte": to_es(self.args[1]),
+                        "lte": to_es(self.args[2]),
                     }
                 }
             }

stac_fastapi/elasticsearch/tests/extensions/cql2/example21.json

@@ -7,10 +7,8 @@
                 {
                     "property": "cloud_cover"
                 },
-                [
-                    0.1,
-                    0.2
-                ]
+                0.1,
+                0.2
             ]
         },
         {

stac_fastapi/elasticsearch/tests/extensions/test_filter.py

@@ -369,31 +369,6 @@ async def test_search_filter_extension_in_no_list(app_client, ctx):
 async def test_search_filter_extension_between(app_client, ctx):
     sun_elevation = ctx.item["properties"]["view:sun_elevation"]
 
-    params = {
-        "filter": {
-            "op": "and",
-            "args": [
-                {"op": "=", "args": [{"property": "id"}, ctx.item["id"]]},
-                {
-                    "op": "between",
-                    "args": [
-                        {"property": "properties.view:sun_elevation"},
-                        [sun_elevation - 0.01, sun_elevation + 0.01],
-                    ],
-                },
-            ],
-        }
-    }
-    resp = await app_client.post("/search", json=params)
-
-    assert resp.status_code == 200
-    assert len(resp.json()["features"]) == 1
-
-
-@pytest.mark.asyncio
-async def test_search_filter_extension_between_no_list(app_client, ctx):
-    sun_elevation = ctx.item["properties"]["view:sun_elevation"]
-
     params = {
         "filter": {
             "op": "and",
@@ -412,7 +387,5 @@ async def test_search_filter_extension_between_no_list(app_client, ctx):
     }
     resp = await app_client.post("/search", json=params)
 
-    assert resp.status_code == 400
-    assert resp.json() == {
-        "detail": f"Error with cql2_json filter: Arg {sun_elevation - 0.01} is not a list"
-    }
+    assert resp.status_code == 200
+    assert len(resp.json()["features"]) == 1