gdalinfo: support again -wkt_format WKT1_ESRI

Fixes #13906

Author: rouault

apps/gdalinfo_lib.cpp

@@ -298,8 +298,9 @@ GDALInfoAppOptionsGetParser(GDALInfoOptions *psOptions,
                 "system."));
 
     argParser->add_argument("-wkt_format")
-        .metavar("<WKT1|WKT2|WKT2_2015|WKT2_2018|WKT2_2019>")
-        .choices("WKT1", "WKT2", "WKT2_2015", "WKT2_2018", "WKT2_2019")
+        .metavar("<WKT1|WKT1_ESRI|WKT2|WKT2_2015|WKT2_2018|WKT2_2019>")
+        .choices("WKT1", "WKT1_ESRI", "WKT2", "WKT2_2015", "WKT2_2018",
+                 "WKT2_2019")
         .store_into(psOptions->osWKTFormat)
         .help(_("WKT format used for SRS."));
 

autotest/utilities/test_gdalinfo_lib.py

@@ -375,3 +375,22 @@ def test_gdalinfo_lib_no_driver():
     assert ds2.GetDriver() is None
     gdal.Info(ds2)
     gdal.Info(ds2, format="json")
+
+
+###############################################################################
+# Test fix for https://github.com/OSGeo/gdal/issues/13906
+
+
+@pytest.mark.parametrize(
+    "wkt_format,expected",
+    [
+        ("WKT1", """PROJCS["NAD27 / UTM zone 11N","""),
+        ("WKT1_ESRI", """PROJCS["NAD_1927_UTM_Zone_11N","""),
+        ("WKT2", """PROJCRS["NAD27 / UTM zone 11N","""),
+    ],
+)
+def test_gdalinfo_lib_wkt_format(wkt_format, expected):
+
+    ds = gdal.Open("../gcore/data/byte.tif")
+    ret = gdal.Info(ds, options="-json -wkt_format " + wkt_format)
+    assert ret["coordinateSystem"]["wkt"].startswith(expected)

doc/source/programs/gdalinfo.rst

@@ -114,13 +114,15 @@ The following command line parameters can appear in any order
 
     Only display the first file of the file list.
 
-.. option:: -wkt_format WKT1|WKT2|WKT2_2015|WKT2_2018|WKT2_2019
+.. option:: -wkt_format WKT1|WKT1_ESRI|WKT2|WKT2_2015|WKT2_2018|WKT2_2019
 
     WKT format used to display the SRS.
     Currently the supported values are:
 
     ``WKT1``
 
+    ``WKT1_ESRI``
+
     ``WKT2`` (latest WKT version, currently *WKT2_2019*)
 
     ``WKT2_2015``