Fix PostgreSQL bbox query (#2051)

* Add test for PostgreSQL bbox

* Fix PostgreSQL bbox query

Prefer using `ST_Intersects` and specify the storage_crs when creating a SQL envelope

Author: webb-ben

pygeoapi/provider/sql.py

@@ -60,7 +60,7 @@
 from typing import Optional
 
 from geoalchemy2 import Geometry  # noqa - this isn't used explicitly but is needed to process Geometry columns
-from geoalchemy2.functions import ST_MakeEnvelope
+from geoalchemy2.functions import ST_MakeEnvelope, ST_Intersects
 from geoalchemy2.shape import to_shape, from_shape
 from pygeofilter.backends.sqlalchemy.evaluate import to_filter
 import pyproj
@@ -91,7 +91,7 @@
     ProviderQueryError,
     ProviderItemNotFoundError
 )
-from pygeoapi.util import get_transform_from_crs
+from pygeoapi.util import get_transform_from_crs, get_crs_from_uri
 
 
 LOGGER = logging.getLogger(__name__)
@@ -720,9 +720,11 @@ def _get_bbox_filter(self, bbox: list[float]):
             return True  # Let everything through if no bbox
 
         # Since this provider uses postgis, we can use ST_MakeEnvelope
-        envelope = ST_MakeEnvelope(*bbox)
+        storage_srid = get_crs_from_uri(self.storage_crs).to_epsg()
+        envelope = ST_MakeEnvelope(*bbox, storage_srid or 4326)
+
         geom_column = getattr(self.table_model, self.geom)
-        bbox_filter = geom_column.intersects(envelope)
+        bbox_filter = ST_Intersects(envelope, geom_column)
 
         return bbox_filter
 

tests/test_postgresql_provider.py

@@ -381,6 +381,18 @@ def test_query_cql_properties_bbox_filters(config):
     assert ids == expected_ids
 
 
+def test_bbox_is_same_as_cql(config):
+    provider = PostgreSQLProvider(config)
+
+    bbox = [30.560389, -3.134991, 30.604849, -3.061970]
+    fc_bbox = provider.query(bbox=bbox)
+
+    bbox_cql = parse('BBOX(foo_geom, {}, {}, {}, {})'.format(*bbox))
+    fc_bbox_cql = provider.query(filterq=bbox_cql)
+
+    assert fc_bbox == fc_bbox_cql
+
+
 def test_get_fields_types(config_types):
     provider = PostgreSQLProvider(config_types)