Remove Golden Software ASCII and old Binary Grid (GS 6.0) drivers. Ke…

…eping GS7BG
rouault · Jan 28, 2025 · b8bb32b · b8bb32b
1 parent 4d2e653
commit b8bb32b
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 2,954 deletions.
diff --git a/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt b/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
@@ -63,8 +63,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   WMS -raster- (rwvs): OGC Web Map Service
   MSGN -raster- (rov): EUMETSAT Archive native (.nat) (*.nat)
   RST -raster- (rw+v): Idrisi Raster A.1 (*.rst)
-  GSAG -raster- (rwv): Golden Software ASCII Grid (.grd) (*.grd)
-  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
@@ -64,8 +64,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   MSGN -raster- (rov): EUMETSAT Archive native (.nat) (*.nat)
   MSG -raster- (ro): MSG HRIT Data
   RST -raster- (rw+v): Idrisi Raster A.1 (*.rst)
-  GSAG -raster- (rwv): Golden Software ASCII Grid (.grd) (*.grd)
-  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_ascii.grd b/autotest/gdrivers/data/gsg/gsg_ascii.grd
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,49 +18,12 @@
 # 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_2():
-
-    tst = gdaltest.GDALTest("gsag", "gsg/gsg_ascii.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_5():
-
-    tst = gdaltest.GDALTest("gsag", "gsg/gsg_ascii.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,8 +10,6 @@ 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/gsag.rst b/doc/source/drivers/raster/gsag.rst
diff --git a/doc/source/drivers/raster/gsbg.rst b/doc/source/drivers/raster/gsbg.rst
diff --git a/doc/source/drivers/raster/index.rst b/doc/source/drivers/raster/index.rst
@@ -74,8 +74,6 @@ Raster drivers
    grassasciigrid
    grib
    gs7bg
-   gsag
-   gsbg
    gsc
    gta
    gti

diff --git a/frmts/drivers.ini b/frmts/drivers.ini
@@ -86,8 +86,6 @@ WMS
 MSGN
 MSG
 RST
-GSAG
-GSBG
 GS7BG
 COSAR
 TSX

diff --git a/frmts/gdalallregister.cpp b/frmts/gdalallregister.cpp
@@ -568,8 +568,6 @@ void CPL_STDCALL GDALAllRegister()
 #endif
 
 #ifdef FRMT_gsg
-    GDALRegister_GSAG();
-    GDALRegister_GSBG();
     GDALRegister_GS7BG();
 #endif
 

diff --git a/frmts/gsg/CMakeLists.txt b/frmts/gsg/CMakeLists.txt
@@ -1,7 +1,6 @@
-# Driver gdal_GSAG and gdal_GSBG are built in
 add_gdal_driver(
   TARGET gdal_GSG
-  SOURCES gs7bgdataset.cpp gsagdataset.cpp gsbgdataset.cpp
+  SOURCES gs7bgdataset.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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,8 +74,6 @@ Raster drivers @@
        grassasciigrid
        grib
        gs7bg
-       gsag
-       gsbg
        gsc
        gta
        gti
@@ Expand Down @@