gdal_grid/gdal vector grid: add better progress report for COG output

Author: rouault

apps/gdal_grid_lib.cpp

@@ -794,6 +794,8 @@ GDALDatasetH GDALGrid(const char *pszDest, GDALDatasetH hSrcDataset,
     bool bIsYExtentSet = psOptions->bIsYExtentSet;
     CPLErr eErr = CE_None;
 
+    const bool bCloseReportsProgress = poDstDS->GetCloseReportsProgress();
+
     /* -------------------------------------------------------------------- */
     /*      Process SQL request.                                            */
     /* -------------------------------------------------------------------- */
@@ -808,14 +810,21 @@ GDALDatasetH GDALGrid(const char *pszDest, GDALDatasetH hSrcDataset,
             return nullptr;
         }
 
+        std::unique_ptr<void, decltype(&GDALDestroyScaledProgress)>
+            pScaledProgressArg(
+                GDALCreateScaledProgress(0.0, bCloseReportsProgress ? 0.5 : 1.0,
+                                         psOptions->pfnProgress,
+                                         psOptions->pProgressData),
+                GDALDestroyScaledProgress);
+
         // Custom layer will be rasterized in the first band.
         eErr = ProcessLayer(
             poLayer, poDstDS.get(), psOptions->poSpatialFilter.get(), nXSize,
             nYSize, 1, bIsXExtentSet, bIsYExtentSet, dfXMin, dfXMax, dfYMin,
             dfYMax, psOptions->osBurnAttribute, psOptions->dfIncreaseBurnValue,
             psOptions->dfMultiplyBurnValue, psOptions->eOutputType,
             psOptions->eAlgorithm, psOptions->pOptions.get(), psOptions->bQuiet,
-            psOptions->pfnProgress, psOptions->pProgressData);
+            GDALScaledProgress, pScaledProgressArg.get());
 
         poSrcDS->ReleaseResultSet(poLayer);
     }
@@ -861,14 +870,21 @@ GDALDatasetH GDALGrid(const char *pszDest, GDALDatasetH hSrcDataset,
                 osOutputSRS = poSRS->exportToWkt();
         }
 
+        std::unique_ptr<void, decltype(&GDALDestroyScaledProgress)>
+            pScaledProgressArg(
+                GDALCreateScaledProgress(0.0, bCloseReportsProgress ? 0.5 : 1.0,
+                                         psOptions->pfnProgress,
+                                         psOptions->pProgressData),
+                GDALDestroyScaledProgress);
+
         eErr = ProcessLayer(
             poLayer, poDstDS.get(), psOptions->poSpatialFilter.get(), nXSize,
             nYSize, i + 1 + nBands - nLayerCount, bIsXExtentSet, bIsYExtentSet,
             dfXMin, dfXMax, dfYMin, dfYMax, psOptions->osBurnAttribute,
             psOptions->dfIncreaseBurnValue, psOptions->dfMultiplyBurnValue,
             psOptions->eOutputType, psOptions->eAlgorithm,
-            psOptions->pOptions.get(), psOptions->bQuiet,
-            psOptions->pfnProgress, psOptions->pProgressData);
+            psOptions->pOptions.get(), psOptions->bQuiet, GDALScaledProgress,
+            pScaledProgressArg.get());
         if (eErr != CE_None)
             break;
     }
@@ -897,6 +913,46 @@ GDALDatasetH GDALGrid(const char *pszDest, GDALDatasetH hSrcDataset,
         return nullptr;
     }
 
+    if (bCloseReportsProgress)
+    {
+        std::unique_ptr<void, decltype(&GDALDestroyScaledProgress)>
+            pScaledProgressArg(
+                GDALCreateScaledProgress(0.5, 1.0, psOptions->pfnProgress,
+                                         psOptions->pProgressData),
+                GDALDestroyScaledProgress);
+
+        const bool bCanReopenWithCurrentDescription =
+            poDstDS->CanReopenWithCurrentDescription();
+
+        eErr = poDstDS->Close(GDALScaledProgress, pScaledProgressArg.get());
+        poDstDS.reset();
+        if (eErr != CE_None)
+            return nullptr;
+
+        if (bCanReopenWithCurrentDescription)
+        {
+            {
+                CPLErrorStateBackuper oBackuper(CPLQuietErrorHandler);
+                poDstDS.reset(GDALDataset::Open(pszDest,
+                                                GDAL_OF_RASTER | GDAL_OF_UPDATE,
+                                                nullptr, nullptr, nullptr));
+            }
+            if (!poDstDS)
+                poDstDS.reset(GDALDataset::Open(
+                    pszDest, GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR, nullptr,
+                    nullptr, nullptr));
+        }
+        else
+        {
+            struct DummyDataset final : public GDALDataset
+            {
+                DummyDataset() = default;
+            };
+
+            poDstDS = std::make_unique<DummyDataset>();
+        }
+    }
+
     return GDALDataset::ToHandle(poDstDS.release());
 }
 

autotest/utilities/test_gdalalg_vector_grid.py

@@ -572,3 +572,27 @@ def test_gdalalg_vector_grid_autocomplete():
         f"{gdal_path} completion gdal vector grid invdist last_word_is_complete=true"
     ).split(" ")
     assert out == [""]
+
+
+@pytest.mark.require_driver("COG")
+def test_gdalalg_vector_grid_to_cog(tmp_vsimem):
+
+    last_pct = [0]
+
+    def my_progress(pct, msg, user_data):
+        assert pct >= last_pct[0]
+        last_pct[0] = pct
+        return True
+
+    with gdal.alg.vector.grid.invdist(
+        input=get_src_ds(False),
+        output_format="COG",
+        output=tmp_vsimem / "out.tif",
+        size=[512, 512],
+        zfield="z",
+        progress=my_progress,
+    ) as alg:
+        assert last_pct[0] == 1
+        ds = alg.Output()
+        assert ds.GetRasterBand(1).Checksum() == pytest.approx(6875, abs=3)
+        assert ds.GetMetadataItem("LAYOUT", "IMAGE_STRUCTURE") == "COG"