Merge pull request OSGeo#12809 from rouault/fix_12806

gdal raster index: emit error if using --dst-crs and non existing input dataset

Author: rouault

apps/gdalalg_raster_index.cpp

@@ -105,6 +105,9 @@ void GDALRasterIndexAlgorithm::AddCommonOptions()
                                 { return ParseAndValidateKeyValue(arg); });
         arg.AddHiddenAlias("mo");
     }
+
+    AddArg("skip-errors", 0, _("Skip errors related to input datasets"),
+           &m_skipErrors);
 }
 
 /************************************************************************/
@@ -135,6 +138,12 @@ bool GDALRasterIndexAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
         return false;
 
     CPLStringList aosOptions;
+    aosOptions.push_back("--invoked-from-gdal-raster-index");
+
+    if (m_skipErrors)
+    {
+        aosOptions.push_back("-skip_errors");
+    }
     if (m_recursive)
     {
         aosOptions.push_back("-recursive");

apps/gdalalg_raster_index.h

@@ -61,6 +61,7 @@ class CPL_DLL GDALRasterIndexAlgorithm /* non final */
     std::string m_sourceCrsName{};
     std::string m_sourceCrsFormat = "auto";
     std::vector<std::string> m_metadata{};
+    bool m_skipErrors = false;
 };
 
 //! @endcond

apps/gdaltindex_lib.cpp

@@ -56,7 +56,9 @@ struct GDALTileIndexRasterMetadata
 
 struct GDALTileIndexOptions
 {
+    bool bInvokedFromGdalRasterIndex = false;
     bool bOverwrite = false;
+    bool bSkipErrors = false;
     std::string osFormat{};
     std::string osIndexLayerName{};
     std::string osLocationField = "location";
@@ -106,6 +108,16 @@ static std::unique_ptr<GDALArgumentParser> GDALTileIndexAppOptionsGetParser(
         _("For more details, see the full documentation for gdaltindex at\n"
           "https://gdal.org/programs/gdaltindex.html"));
 
+    // Hidden as used by gdal raster index
+    argParser->add_argument("--invoked-from-gdal-raster-index")
+        .store_into(psOptions->bInvokedFromGdalRasterIndex)
+        .hidden();
+
+    // Hidden as used by gdal raster index
+    argParser->add_argument("-skip_errors")
+        .store_into(psOptions->bSkipErrors)
+        .hidden();
+
     argParser->add_argument("-overwrite")
         .flag()
         .store_into(psOptions->bOverwrite)
@@ -605,6 +617,10 @@ GDALDatasetH GDALTileIndexInternal(const char *pszDest,
                  : nullptr;
     const int nMaxFieldSize = pszVal ? atoi(pszVal) : 0;
 
+    const bool bFailOnErrors =
+        psOptions->bInvokedFromGdalRasterIndex && !psOptions->bSkipErrors;
+    bool bSkipFirstTile = false;
+
     if (poLayer)
     {
         bExistingLayer = true;
@@ -665,15 +681,30 @@ GDALDatasetH GDALTileIndexInternal(const char *pszDest,
                 return nullptr;
             }
             oGDALTileIndexTileIterator.reset();
+            std::unique_ptr<CPLTurnFailureIntoWarningBackuper>
+                poFailureIntoWarning;
+            if (!bFailOnErrors)
+                poFailureIntoWarning =
+                    std::make_unique<CPLTurnFailureIntoWarningBackuper>();
+            CPL_IGNORE_RET_VAL(poFailureIntoWarning);
             auto poSrcDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
                 osFilename.c_str(), GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
                 nullptr, nullptr, nullptr));
             if (!poSrcDS)
-                return nullptr;
-
-            auto poSrcSRS = poSrcDS->GetSpatialRef();
-            if (poSrcSRS)
-                oSRS = *poSrcSRS;
+            {
+                CPLError(bFailOnErrors ? CE_Failure : CE_Warning,
+                         CPLE_AppDefined, "Unable to open %s%s.",
+                         osFilename.c_str(), bFailOnErrors ? "" : ", skipping");
+                if (bFailOnErrors)
+                    return nullptr;
+                bSkipFirstTile = true;
+            }
+            else
+            {
+                auto poSrcSRS = poSrcDS->GetSpatialRef();
+                if (poSrcSRS)
+                    oSRS = *poSrcSRS;
+            }
         }
 
         poLayer = poTileIndexDS->CreateLayer(
@@ -964,6 +995,11 @@ GDALDatasetH GDALTileIndexInternal(const char *pszDest,
         const std::string osSrcFilename = oGDALTileIndexTileIterator.next();
         if (osSrcFilename.empty())
             break;
+        if (bSkipFirstTile)
+        {
+            bSkipFirstTile = false;
+            continue;
+        }
 
         std::string osFileNameToWrite;
         VSIStatBuf sStatBuf;
@@ -991,23 +1027,39 @@ GDALDatasetH GDALTileIndexInternal(const char *pszDest,
             continue;
         }
 
-        auto poSrcDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
-            osSrcFilename.c_str(), GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
-            nullptr, nullptr, nullptr));
-        if (poSrcDS == nullptr)
+        std::unique_ptr<GDALDataset> poSrcDS;
         {
-            CPLError(CE_Warning, CPLE_AppDefined,
-                     "Unable to open %s, skipping.", osSrcFilename.c_str());
-            continue;
+            std::unique_ptr<CPLTurnFailureIntoWarningBackuper>
+                poFailureIntoWarning;
+            if (!bFailOnErrors)
+                poFailureIntoWarning =
+                    std::make_unique<CPLTurnFailureIntoWarningBackuper>();
+            CPL_IGNORE_RET_VAL(poFailureIntoWarning);
+
+            poSrcDS.reset(GDALDataset::Open(
+                osSrcFilename.c_str(), GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
+                nullptr, nullptr, nullptr));
+            if (poSrcDS == nullptr)
+            {
+                CPLError(bFailOnErrors ? CE_Failure : CE_Warning,
+                         CPLE_AppDefined, "Unable to open %s%s.",
+                         osSrcFilename.c_str(),
+                         bFailOnErrors ? "" : ", skipping");
+                if (bFailOnErrors)
+                    return nullptr;
+                continue;
+            }
         }
 
         GDALGeoTransform gt;
         if (poSrcDS->GetGeoTransform(gt) != CE_None)
         {
-            CPLError(CE_Warning, CPLE_AppDefined,
+            CPLError(bFailOnErrors ? CE_Failure : CE_Warning, CPLE_AppDefined,
                      "It appears no georeferencing is available for\n"
-                     "`%s', skipping.",
-                     osSrcFilename.c_str());
+                     "`%s'%s.",
+                     osSrcFilename.c_str(), bFailOnErrors ? "" : ", skipping");
+            if (bFailOnErrors)
+                return nullptr;
             continue;
         }
 
@@ -1049,9 +1101,11 @@ GDALDatasetH GDALTileIndexInternal(const char *pszDest,
         const int nYSize = poSrcDS->GetRasterYSize();
         if (nXSize == 0 || nYSize == 0)
         {
-            CPLError(CE_Warning, CPLE_AppDefined,
-                     "%s has 0 width or height. Skipping",
-                     osSrcFilename.c_str());
+            CPLError(bFailOnErrors ? CE_Failure : CE_Warning, CPLE_AppDefined,
+                     "%s has 0 width or height%s", osSrcFilename.c_str(),
+                     bFailOnErrors ? "" : ", skipping");
+            if (bFailOnErrors)
+                return nullptr;
             continue;
         }
 
@@ -1081,13 +1135,16 @@ GDALDatasetH GDALTileIndexInternal(const char *pszDest,
                     OGRCreateCoordinateTransformation(poSrcSRS, &oTargetSRS));
                 if (!poCT || !poCT->Transform(5, adfX, adfY, nullptr))
                 {
-                    CPLError(CE_Warning, CPLE_AppDefined,
+                    CPLError(bFailOnErrors ? CE_Failure : CE_Warning,
+                             CPLE_AppDefined,
                              "unable to transform points from source "
-                             "SRS `%s' to target SRS `%s' for file `%s' - file "
-                             "skipped",
+                             "SRS `%s' to target SRS `%s' for file `%s'%s",
                              poSrcDS->GetProjectionRef(),
                              psOptions->osTargetSRS.c_str(),
-                             osFileNameToWrite.c_str());
+                             osFileNameToWrite.c_str(),
+                             bFailOnErrors ? "" : ", skipping");
+                    if (bFailOnErrors)
+                        return nullptr;
                     continue;
                 }
             }

autotest/pymod/gdaltest.py

@@ -2124,7 +2124,6 @@ def error_raised(type, match=""):
         gdal.CE_Debug: "CE_Debug",
         gdal.CE_Failure: "CE_Failure",
         gdal.CE_Fatal: "CE_Fatal",
-        gdal.CE_None: "CE_None",
         gdal.CE_Warning: "CE_Warning",
     }
 
@@ -2136,9 +2135,12 @@ def handler(lvl, no, msg):
     with error_handler(handler):
         yield
 
-    assert any(
-        [err["level"] == type and match in err["message"] for err in errors]
-    ), f'Did not receive an error of type {err_levels[type]} matching "{match}". Received: {[(err["level"], err["message"]) for err in errors]}'
+    if type == gdal.CE_None:
+        assert not any([err["level"] != gdal.CE_Debug for err in errors])
+    else:
+        assert any(
+            [err["level"] == type and match in err["message"] for err in errors]
+        ), f'Did not receive an error of type {err_levels[type]} matching "{match}". Received: {[(err["level"], err["message"]) for err in errors]}'
 
 
 ###############################################################################

autotest/utilities/test_gdalalg_raster_index.py

@@ -13,6 +13,7 @@
 
 import os
 
+import gdaltest
 import pytest
 
 from osgeo import gdal, ogr
@@ -204,7 +205,10 @@ def test_gdalalg_raster_index_min_pixel_size(min_pixel_size, expected_count):
     alg["output-format"] = "MEM"
     alg["layer"] = "out"
     alg["min-pixel-size"] = min_pixel_size
-    assert alg.Run()
+    with gdaltest.error_raised(
+        gdal.CE_Warning if min_pixel_size == 61 else gdal.CE_None
+    ):
+        assert alg.Run()
     ds = alg["output"].GetDataset()
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == expected_count
@@ -229,3 +233,46 @@ def test_gdalalg_raster_index_crs():
         f.GetGeometryRef().ExportToWkt()
         == "POLYGON ((-117.641168620797 33.9023526904272,-117.628190189534 33.9024195619211,-117.628110837847 33.8915970129623,-117.641087629972 33.8915301685907,-117.641168620797 33.9023526904272))"
     )
+
+
+def test_gdalalg_raster_error():
+
+    alg = get_alg()
+    alg["input"] = "/i/do/not/exist"
+    alg["output"] = ""
+    alg["output-format"] = "MEM"
+    alg["layer"] = "out"
+    alg["dst-crs"] = "EPSG:4267"
+    with pytest.raises(Exception, match="Unable to open /i/do/not/exist"):
+        alg.Run()
+
+
+def test_gdalalg_raster_skip_errors_with_crs():
+
+    alg = get_alg()
+    alg["input"] = "/i/do/not/exist"
+    alg["output"] = ""
+    alg["output-format"] = "MEM"
+    alg["layer"] = "out"
+    alg["dst-crs"] = "EPSG:4267"
+    alg["skip-errors"] = True
+    with gdaltest.error_raised(gdal.CE_Warning):
+        assert alg.Run()
+    ds = alg["output"].GetDataset()
+    lyr = ds.GetLayer(0)
+    assert lyr.GetFeatureCount() == 0
+
+
+def test_gdalalg_raster_skip_errors_without_crs():
+
+    alg = get_alg()
+    alg["input"] = "/i/do/not/exist"
+    alg["output"] = ""
+    alg["output-format"] = "MEM"
+    alg["layer"] = "out"
+    alg["skip-errors"] = True
+    with gdaltest.error_raised(gdal.CE_Warning):
+        assert alg.Run()
+    ds = alg["output"].GetDataset()
+    lyr = ds.GetLayer(0)
+    assert lyr.GetFeatureCount() == 0

doc/source/programs/gdal_raster_index.rst

@@ -123,6 +123,12 @@ Standard options
     metadata.
     This option may be repeated.
 
+.. option:: --skip-errors
+
+    .. versionadded:: 3.12
+
+    Skip errors related to input datasets.
+
 Examples
 --------