gdal raster resample: switch to 'nearest' as official name, and 'near…

…' as allowed hidden alias
OSGeo · Jan 8, 2025 · d43d1ed · d43d1ed
1 parent 92bf531
commit d43d1ed
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/apps/gdalalg_raster_reproject.cpp b/apps/gdalalg_raster_reproject.cpp
@@ -36,9 +36,10 @@ GDALRasterReprojectAlgorithm::GDALRasterReprojectAlgorithm(bool standaloneStep)
         .SetIsCRSArg()
         .AddHiddenAlias("t_srs");
     AddArg("resampling", 'r', _("Resampling method"), &m_resampling)
-        .SetChoices("near", "bilinear", "cubic", "cubicspline", "lanczos",
+        .SetChoices("nearest", "bilinear", "cubic", "cubicspline", "lanczos",
                     "average", "rms", "mode", "min", "max", "med", "q1", "q3",
-                    "sum");
+                    "sum")
+        .SetHiddenChoices("near");
 
     auto &resArg =
         AddArg("resolution", 0,

diff --git a/autotest/utilities/test_gdal.py b/autotest/utilities/test_gdal.py
@@ -393,4 +393,4 @@ def test_gdal_completion_pipeline(gdal_path, subcommand):
         out = gdaltest.runexternal(
             f"{gdal_path} completion gdal {subcommand} pipeline read foo ! reproject --resampling"
         ).split(" ")
-        assert "near" in out
+        assert "nearest" in out
diff --git a/doc/source/programs/gdal_raster_reproject.rst b/doc/source/programs/gdal_raster_reproject.rst
@@ -38,7 +38,7 @@ Synopsis
       --overwrite                                          Whether overwriting existing output is allowed
       -s, --src-crs <SRC-CRS>                              Source CRS
       -d, --dst-crs <DST-CRS>                              Destination CRS
-      -r, --resampling <RESAMPLING>                        Resampling method. RESAMPLING=near|bilinear|cubic|cubicspline|lanczos|average|rms|mode|min|max|med|q1|q3|sum
+      -r, --resampling <RESAMPLING>                        Resampling method. RESAMPLING=nearest|bilinear|cubic|cubicspline|lanczos|average|rms|mode|min|max|med|q1|q3|sum
       --resolution <xres>,<yres>                           Target resolution (in destination CRS units)
       --bbox <xmin>,<ymin>,<xmax>,<ymax>                   Target bounding box (in destination CRS units)
       --target-aligned-pixels                              Round target extent to target resolution