Update intersect.py

Author: webb-ben

.github/workflows/main.yml

@@ -54,3 +54,10 @@ jobs:
           pytest tests/test_sitemap_process.py
           pytest tests/test_sparql_provider.py
           pytest tests/test_xml_formatter.py
+      - name: Failed Tests
+        if: failure()
+        run: |
+          echo "Tests failed. Collecting logs..."
+          docker ps -a
+          docker logs pygeoapi-plugins-pygeoapi-1
+          pip3 freeze

Dockerfile

@@ -7,6 +7,4 @@ ADD . /pygeoapi_plugins
 RUN /venv/bin/python3 -m pip install -r /pygeoapi_plugins/requirements.txt \
     && /venv/bin/python3 -m pip install -e /pygeoapi_plugins
 
-RUN /venv/bin/python3 -m pip install GDAL>=3.12.0
-
 ENTRYPOINT [ "/entrypoint.sh" ]

docker-compose.yml

@@ -3,4 +3,4 @@ services:
     build:
       context: .
     ports:
-      - 5000:80
+      - 5555:80

docker/pygeoapi.config.yml

@@ -2,7 +2,7 @@ server:
   bind:
     host: 0.0.0.0
     port: 80
-  url: http://localhost:5000
+  url: http://localhost:5555
   mimetype: application/json; charset=UTF-8
   encoding: utf-8
   gzip: false

pygeoapi_plugins/process/intersect.py

@@ -32,8 +32,9 @@
 from osgeo import gdal, ogr
 from typing import Tuple
 from zipfile import ZipFile
+from pyproj import CRS
 
-
+from pygeoapi.crs import DEFAULT_CRS, transform_bbox
 from pygeoapi.config import get_config
 from pygeoapi.plugin import load_plugin
 from pygeoapi.process.base import BaseProcessor, ProcessorExecuteError
@@ -226,20 +227,19 @@ def get_layer(
 
             ds = gdal.OpenEx(url, gdal.OF_VECTOR)
             if ds is None:
-                raise ProcessorExecuteError("GDAL could not open feature.")
+                raise ProcessorExecuteError('GDAL could not open feature.')
 
             layer = ds.GetLayer()
-            (minx, maxx, miny, maxy) = ds.GetExtentWGS84LongLat()
-
+            srs = layer.GetSpatialRef()
         elif file:
             if not isinstance(file, bytes):
                 file = bytes(file, 'utf-8')
 
             # Use /vsistdin/ to read bytes in-memory
             if file[:2] == b'PK':
-                ext = ".zip"
+                ext = '.zip'
             elif file[:4] == b'PAR1':
-                ext = ".parquet"
+                ext = '.parquet'
             else:
                 ext = ''
 
@@ -258,19 +258,26 @@ def get_layer(
 
                 ds = gdal.OpenEx(tmp_path, gdal.OF_VECTOR)
                 if ds is None:
-                    raise ProcessorExecuteError("GDAL could not open feature from bytes (temp file fallback).")  # noqa
+                    raise ProcessorExecuteError('GDAL could not open feature from bytes (temp file fallback).')  # noqa
 
                 layer = ds.GetLayer()
-                (minx, maxx, miny, maxy) = ds.GetExtentWGS84LongLat()
+                srs = layer.GetSpatialRef()
         else:
-            raise ProcessorExecuteError("No input provided.")
+            raise ProcessorExecuteError('No input provided.')
 
         union = ogr.Geometry(ogr.wkbGeometryCollection)
         for feat in layer:
             geom = feat.GetGeometryRef()
             union.AddGeometry(geom)
 
+        (minx, maxx, miny, maxy) = layer.GetExtent()
         bbox = (minx, miny, maxx, maxy)
+
+        if srs:
+            bbox = transform_bbox(
+                bbox, CRS(srs.ExportToWkt()), CRS('EPSG:4326')
+            )
+
         return (union, bbox)
 
     def __repr__(self):

tests/test_intersect_process.py

@@ -78,27 +78,27 @@ def test_execute_raises_when_missing_collection(process_def, bytes_data):
     [
         (
             "http://geoconnex.us/ref/states/08",
-            (-109.060253, 36.992426, -102.041524, 41.003443999999995),
+            [-109.060253, 36.992426, -102.041524, 41.003443999999995],
             contextlib.nullcontext(),
         ),
         (
             "https://reference.geoconnex.us/collections/states/items",
-            (-179.148909, -14.548699, 179.77847011250077, 71.365162),
+            [-179.148909, -14.548699, 179.77847011250077, 71.365162],
             contextlib.nullcontext(),
         ),
         (
             "https://www.hydroshare.org/resource/3295a17b4cc24d34bd6a5c5aaf753c50/data/contents/hu02.gpkg",
-            (-179.2294679909685, -14.42442, 179.85648417282215, 71.439451),
+            [-179.2294676, -14.42442,  179.8564841, 71.439451],
             contextlib.nullcontext(),
         ),
         (
             "https://github.com/geopython/pygeoapi/raw/refs/heads/master/tests/data/dutch_addresses_shape_28992.zip",
-            (
+            [
+                52.04308374228452,
                 5.670269218772358,
-                52.04259660083967,
+                52.12327124702764,
                 5.829358202203319,
-                52.12375952869009,
-            ),
+            ],
             contextlib.nullcontext(),
         ),
         (
@@ -109,16 +109,16 @@ def test_execute_raises_when_missing_collection(process_def, bytes_data):
         ("https://example.com", None, pytest.raises(Exception)),  # Error case - bad URL
     ],
 )
-def test_get_bbox_partial(process_def, url, bounds, ctx):
+def test_get_bbox(process_def, url, bounds, ctx):
     proc = intersect.IntersectionProcessor(process_def)
     with ctx:
         _, bbox = proc.get_layer(url=url, as_bbox=True)
-        assert bbox == bounds
+        assert pytest.approx(bbox) == bounds
 
     with ctx:
         content = requests.get(url).content
-        _, bbox, _ = proc.get_layer(file=content, as_bbox=True)
-        assert bbox == bounds
+        _, bbox= proc.get_layer(file=content, as_bbox=True)
+        assert pytest.approx(bbox) == bounds
 
 
 @pytest.mark.parametrize(

tests/test_sitemap_process.py

@@ -35,7 +35,7 @@
 
 from pygeoapi.util import url_join
 
-PYGEOAPI_URL = 'http://localhost:5000'
+PYGEOAPI_URL = 'http://localhost:5555'
 PROCESS_URL = url_join(PYGEOAPI_URL, 'processes/sitemap-generator/execution')
 HTTP = Session()