gdal vector clip: fix 'SELECT COUNT(*) FROM' on it

Author: rouault

apps/gdalalg_vector_clip.cpp

@@ -76,30 +76,41 @@ class GDALVectorClipAlgorithmLayer final : public GDALVectorPipelineOutputLayer
           m_eSrcLayerGeomType(oSrcLayer.GetGeomType()),
           m_eFlattenSrcLayerGeomType(wkbFlatten(m_eSrcLayerGeomType)),
           m_bSrcLayerGeomTypeIsCollection(OGR_GT_IsSubClassOf(
-              m_eFlattenSrcLayerGeomType, wkbGeometryCollection))
+              m_eFlattenSrcLayerGeomType, wkbGeometryCollection)),
+          m_poFeatureDefn(oSrcLayer.GetLayerDefn()->Clone())
     {
         SetDescription(oSrcLayer.GetDescription());
         SetMetadata(oSrcLayer.GetMetadata());
         oSrcLayer.SetSpatialFilter(m_poClipGeom.get());
+        m_poFeatureDefn->Reference();
+    }
+
+    ~GDALVectorClipAlgorithmLayer()
+    {
+        m_poFeatureDefn->Release();
     }
 
     OGRFeatureDefn *GetLayerDefn() override
     {
-        return m_srcLayer.GetLayerDefn();
+        return m_poFeatureDefn;
     }
 
     void TranslateFeature(
         std::unique_ptr<OGRFeature> poSrcFeature,
         std::vector<std::unique_ptr<OGRFeature>> &apoOutFeatures) override
     {
+        std::unique_ptr<OGRGeometry> poIntersection;
         auto poGeom = poSrcFeature->GetGeometryRef();
-        if (!poGeom)
-            return;
-
-        auto poIntersection = std::unique_ptr<OGRGeometry>(
-            poGeom->Intersection(m_poClipGeom.get()));
+        if (poGeom)
+        {
+            poIntersection.reset(poGeom->Intersection(m_poClipGeom.get()));
+        }
         if (!poIntersection)
             return;
+        poIntersection->assignSpatialReference(
+            m_poFeatureDefn->GetGeomFieldDefn(0)->GetSpatialRef());
+
+        poSrcFeature->SetFDefnUnsafe(m_poFeatureDefn);
 
         const auto eFeatGeomType =
             wkbFlatten(poIntersection->getGeometryType());
@@ -156,10 +167,11 @@ class GDALVectorClipAlgorithmLayer final : public GDALVectorPipelineOutputLayer
     }
 
   private:
-    std::unique_ptr<OGRGeometry> m_poClipGeom{};
+    std::unique_ptr<OGRGeometry> const m_poClipGeom{};
     const OGRwkbGeometryType m_eSrcLayerGeomType;
     const OGRwkbGeometryType m_eFlattenSrcLayerGeomType;
     const bool m_bSrcLayerGeomTypeIsCollection;
+    OGRFeatureDefn *const m_poFeatureDefn;
 
     CPL_DISALLOW_COPY_ASSIGN(GDALVectorClipAlgorithmLayer)
 };

autotest/utilities/test_gdalalg_vector_clip.py

@@ -11,6 +11,7 @@
 # SPDX-License-Identifier: MIT
 ###############################################################################
 
+import gdaltest
 import ogrtest
 import pytest
 
@@ -997,3 +998,25 @@ def test_gdalalg_vector_clip_bbox_active_layer():
     out_lyr = out_ds.GetLayer(1)
     out_f = out_lyr.GetNextFeature()
     ogrtest.check_feature_geometry(out_f, "POLYGON ((10 10,10 11,11 11,10 10))")
+
+
+@pytest.mark.require_driver("GDALG")
+def test_gdalalg_vector_clip_test_ogrsf(tmp_path):
+
+    import test_cli_utilities
+
+    if test_cli_utilities.get_test_ogrsf_path() is None:
+        pytest.skip()
+
+    gdalg_filename = tmp_path / "tmp.gdalg.json"
+    open(gdalg_filename, "wb").write(
+        b'{"type": "gdal_streamed_alg","command_line": "gdal vector clip ../ogr/data/poly.shp --like ../ogr/data/poly.shp --output-format=stream foo","relative_paths_relative_to_this_file":false}'
+    )
+
+    ret = gdaltest.runexternal(
+        test_cli_utilities.get_test_ogrsf_path() + f" -ro {gdalg_filename}"
+    )
+
+    assert "INFO" in ret
+    assert "ERROR" not in ret
+    assert "FAILURE" not in ret