gdallocationinfo: in -E echo mode, always report input coordinates, n…

…ot pixel,line
OSGeo · Aug 13, 2024 · 028f632 · 028f632
1 parent d2d00c1
commit 028f632
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/apps/gdallocationinfo.cpp b/apps/gdallocationinfo.cpp
@@ -342,6 +342,8 @@ MAIN_START(argc, argv)
     while (inputAvailable)
     {
         int iPixel, iLine;
+        const double dfXIn = dfGeoX;
+        const double dfYIn = dfGeoY;
 
         if (hCT)
         {
@@ -411,7 +413,7 @@ MAIN_START(argc, argv)
         }
         else if (bEcho)
         {
-            printf("%d%s%d%s", iPixel, osFieldSep.c_str(), iLine,
+            printf("%.15g%s%.15g%s", dfXIn, osFieldSep.c_str(), dfYIn,
                    osFieldSep.c_str());
         }
 

diff --git a/autotest/utilities/test_gdallocationinfo.py b/autotest/utilities/test_gdallocationinfo.py
@@ -255,6 +255,20 @@ def test_gdallocationinfo_echo(gdallocationinfo_path):
     )
     assert "1,2,132" in ret
 
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path
+        + ' -geoloc -E -valonly -field_sep "," ../gcore/data/byte.tif',
+        strin="440780.5 3751200.5",
+    )
+    assert "440780.5,3751200.5,132" in ret
+
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path
+        + ' -geoloc -E -valonly -field_sep "," ../gcore/data/byte.tif',
+        strin="440780.5 3751200.5 extra_content",
+    )
+    assert "440780.5,3751200.5,132,extra_content" in ret
+
 
 ###############################################################################
 # Test out of raster coordinates