Merge pull request #12437 from rouault/restore_gsbg

rouault · web-flow · commit 587c9eabb98c · 2025-05-22T14:59:16.000+01:00
Restore GSBG (Golden Software Surfer Binary Grid 6.0) support
diff --git a/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt b/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
@@ -58,6 +58,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
   WMS -raster- (rwvs): OGC Web Map Service
   MSGN -raster- (rov): EUMETSAT Archive native (.nat) (*.nat)
   RST -raster- (rw+v): Idrisi Raster A.1 (*.rst)
+  GSBG -raster- (rw+v): Golden Software Binary Grid (.grd) (*.grd)
   GS7BG -raster- (rw+v): Golden Software 7 Binary Grid (.grd) (*.grd)
   COSAR -raster- (rov): COSAR Annotated Binary Matrix (TerraSAR-X)
   TSX -raster- (rov): TerraSAR-X Product
diff --git a/.github/workflows/windows_conda_expected_gdalinfo_formats.txt b/.github/workflows/windows_conda_expected_gdalinfo_formats.txt
@@ -59,6 +59,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
   MSGN -raster- (rov): EUMETSAT Archive native (.nat) (*.nat)
   MSG -raster- (ro): MSG HRIT Data
   RST -raster- (rw+v): Idrisi Raster A.1 (*.rst)
+  GSBG -raster- (rw+v): Golden Software Binary Grid (.grd) (*.grd)
   GS7BG -raster- (rw+v): Golden Software 7 Binary Grid (.grd) (*.grd)
   COSAR -raster- (rov): COSAR Annotated Binary Matrix (TerraSAR-X)
   TSX -raster- (rov): TerraSAR-X Product
diff --git a/autotest/gdrivers/data/gsg/gsg_binary.grd b/autotest/gdrivers/data/gsg/gsg_binary.grd
diff --git a/autotest/gdrivers/gsg.py b/autotest/gdrivers/gsg.py
@@ -18,12 +18,36 @@
 # Perform simple read tests.
 
 
+def test_gsg_1():
+
+    tst = gdaltest.GDALTest("gsbg", "gsg/gsg_binary.grd", 1, 4672)
+    tst.testOpen(check_gt=(440720, 60, 0, 3751320, 0, -60))
+
+
 def test_gsg_3():
 
     tst = gdaltest.GDALTest("gs7bg", "gsg/gsg_7binary.grd", 1, 4672)
     tst.testOpen(check_gt=(440720, 60, 0, 3751320, 0, -60))
 
 
+###############################################################################
+# Create simple copy and check.
+
+
+def test_gsg_4():
+
+    tst = gdaltest.GDALTest("gsbg", "gsg/gsg_binary.grd", 1, 4672)
+
+    tst.testCreateCopy(check_gt=1)
+
+
+def test_gsg_6():
+
+    tst = gdaltest.GDALTest("gsbg", "gsg/gsg_binary.grd", 1, 4672)
+
+    tst.testCreate(out_bands=1)
+
+
 def test_gsg_7():
 
     tst = gdaltest.GDALTest("gs7bg", "gsg/gsg_7binary.grd", 1, 4672)
diff --git a/doc/source/drivers/raster/gs7bg.rst b/doc/source/drivers/raster/gs7bg.rst
@@ -10,6 +10,8 @@ GS7BG -- Golden Software Surfer 7 Binary Grid File Format
 
 This is the binary (non-human-readable) version of one of the raster
 formats used by Golden Software products (such as the Surfer series).
+This format differs from the :ref:`raster.gsbg` format (also known as
+Surfer 6 binary grid format), it is more complicated and flexible.
 
 NOTE: Implemented as :source_file:`frmts/gsg/gs7bgdataset.cpp`.
 
diff --git a/doc/source/drivers/raster/gsbg.rst b/doc/source/drivers/raster/gsbg.rst
@@ -0,0 +1,31 @@
+.. _raster.gsbg:
+
+================================================================================
+GSBG -- Golden Software Binary Grid File Format
+================================================================================
+
+.. shortname:: GSBG
+
+.. built_in_by_default::
+
+This is the binary (non-human-readable) version of one of the raster
+formats used by Golden Software products (such as the Surfer series).
+This format is supported for both reading and
+writing (including create, delete, and copy). Currently the associated
+formats for color, metadata, and shapes are not supported.
+
+Surfer 8 uses a fixed nodata value at 1.701410009187828e+38. When writing a
+GSBG dataset, GDAL remaps the user-specified input nodata value to 1.701410009187828e+38.
+
+NOTE: Implemented as :source_file:`frmts/gsg/gsbgdataset.cpp`.
+
+Driver capabilities
+-------------------
+
+.. supports_createcopy::
+
+.. supports_create::
+
+.. supports_georeferencing::
+
+.. supports_virtualio::
diff --git a/doc/source/drivers/raster/index.rst b/doc/source/drivers/raster/index.rst
@@ -16,7 +16,7 @@ Raster drivers
 
     The following drivers have been removed in GDAL 3.5: BPG, E00GRID, EPSILON, IGNFHeightASCIIGrid, NTv1
 
-    The following drivers have been removed in GDAL 3.11: BLX, BT, CTable2, FIT, GSAG (Golden Software ASCII grid), GSBG (Golden Software 6.0 binary grid), JP2Lura, OZI, Rasterlite (v1), R object data store (.rda), RDB, SDTS, SGI, XPM
+    The following drivers have been removed in GDAL 3.11: BLX, BT, CTable2, FIT, GSAG (Golden Software ASCII grid), JP2Lura, OZI, Rasterlite (v1), R object data store (.rda), RDB, SDTS, SGI, XPM
 
     Write support for the following formats has been removed in GDAL 3.11: ADRG, BYN, ELAS, LAN, MFF, MFF2/HKV, ISIS2, PAux, USGSDEM
 
@@ -71,6 +71,7 @@ Raster drivers
    grassasciigrid
    grib
    gs7bg
+   gsbg
    gsc
    gdalg
    gta
diff --git a/frmts/drivers.ini b/frmts/drivers.ini
@@ -81,6 +81,7 @@ WMS
 MSGN
 MSG
 RST
+GSBG
 GS7BG
 COSAR
 TSX
diff --git a/frmts/gdalallregister.cpp b/frmts/gdalallregister.cpp
@@ -550,6 +550,7 @@ void CPL_STDCALL GDALAllRegister()
 #endif
 
 #ifdef FRMT_gsg
+    GDALRegister_GSBG();
     GDALRegister_GS7BG();
 #endif
 
diff --git a/frmts/gsg/CMakeLists.txt b/frmts/gsg/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_gdal_driver(
   TARGET gdal_GSG
-  SOURCES gs7bgdataset.cpp
+  SOURCES gs7bgdataset.cpp gsbgdataset.cpp
   BUILTIN)
 # FIXME should be 'PLUGIN_CAPABLE NO_DEPS' but requires some code to glue the registration of the 3 drivers
 gdal_standard_includes(gdal_GSG)
diff --git a/frmts/gsg/gsbgdataset.cpp b/frmts/gsg/gsbgdataset.cpp
diff --git a/gcore/gdal_frmts.h b/gcore/gdal_frmts.h

-Original file line number
+Diff line change
 MSGN
 MSG
 RST
 +GSBG
 GS7BG
 COSAR
 TSX