Fix conflict

.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt

@@ -14,7 +14,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   CEOS -raster- (rov): CEOS Image
   JAXAPALSAR -raster- (rov): JAXA PALSAR Product Reader (Level 1.1/1.5)
   GFF -raster- (rov): Ground-based SAR Applications Testbed File Format (.gff) (*.gff)
-  ELAS -raster- (rw+v): ELAS
   ESRIC -raster- (rov): Esri Compact Cache (*.json, *.tpkx)
   AIG -raster- (rov): Arc/Info Binary Grid
   AAIGrid -raster- (rwv): Arc/Info ASCII Grid (*.asc)
@@ -77,27 +76,25 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   PNM -raster- (rw+v): Portable Pixmap Format (netpbm) (*.pgm, *.ppm, *.pnm)
   DOQ1 -raster- (rov): USGS DOQ (Old Style)
   DOQ2 -raster- (rov): USGS DOQ (New Style)
-  PAux -raster- (rw+v): PCI .aux Labelled
-  MFF -raster- (rw+v): Vexcel MFF Raster (*.hdr)
-  MFF2 -raster- (rw+): Vexcel MFF2 (HKV) Raster
+  PAux -raster- (rov): PCI .aux Labelled
+  MFF -raster- (rov): Vexcel MFF Raster (*.hdr)
+  MFF2 -raster- (ro): Vexcel MFF2 (HKV) Raster
   GSC -raster- (rov): GSC Geogrid
   FAST -raster- (rov): EOSAT FAST Format
-  BT -raster- (rw+v): VTP .bt (Binary Terrain) 1.3 Format (*.bt)
-  LAN -raster- (rw+v): Erdas .LAN/.GIS
+  LAN -raster- (rov): Erdas .LAN/.GIS
   CPG -raster- (rov): Convair PolGASP
   NDF -raster- (rov): NLAPS Data Format
   EIR -raster- (rov): Erdas Imagine Raw
-  DIPEx -raster- (rov): DIPEx
   LCP -raster- (rwv): FARSITE v.4 Landscape File (.lcp) (*.lcp)
-  GTX -raster- (rw+v): NOAA Vertical Datum .GTX (*.gtx)
+  GTX -raster- (rov): NOAA Vertical Datum .GTX (*.gtx)
   LOSLAS -raster- (rov): NADCON .los/.las Datum Grid Shift
-  NTv2 -raster- (rw+vs): NTv2 Datum Grid Shift (*.gsb, *.gvb)
+  NTv2 -raster- (rovs): NTv2 Datum Grid Shift (*.gsb, *.gvb)
   ACE2 -raster- (rov): ACE2 (*.ACE2)
   SNODAS -raster- (rov): Snow Data Assimilation System (*.hdr)
   KRO -raster- (rw+v): KOLOR Raw (*.kro)
   ROI_PAC -raster- (rw+v): ROI_PAC raster
   RRASTER -raster- (rw+v): R Raster (*.grd)
-  BYN -raster- (rw+v): Natural Resources Canada's Geoid (*.byn, *.err)
+  BYN -raster- (rov): Natural Resources Canada's Geoid (*.byn, *.err)
   NOAA_B -raster- (rov): NOAA GEOCON/NADCON5 .b format (*.b)
   NSIDCbin -raster- (rov): NSIDC Sea Ice Concentrations binary (.bin) (*.bin)
   RIK -raster- (rov): Swedish Grid RIK (.rik) (*.rik)

.github/workflows/windows_conda_expected_gdalinfo_formats.txt

@@ -14,7 +14,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   CEOS -raster- (rov): CEOS Image
   JAXAPALSAR -raster- (rov): JAXA PALSAR Product Reader (Level 1.1/1.5)
   GFF -raster- (rov): Ground-based SAR Applications Testbed File Format (.gff) (*.gff)
-  ELAS -raster- (rw+v): ELAS
   ESRIC -raster- (rov): Esri Compact Cache (*.json, *.tpkx)
   AIG -raster- (rov): Arc/Info Binary Grid
   AAIGrid -raster- (rwv): Arc/Info ASCII Grid (*.asc)
@@ -79,27 +78,25 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   PNM -raster- (rw+v): Portable Pixmap Format (netpbm) (*.pgm, *.ppm, *.pnm)
   DOQ1 -raster- (rov): USGS DOQ (Old Style)
   DOQ2 -raster- (rov): USGS DOQ (New Style)
-  PAux -raster- (rw+v): PCI .aux Labelled
-  MFF -raster- (rw+v): Vexcel MFF Raster (*.hdr)
-  MFF2 -raster- (rw+): Vexcel MFF2 (HKV) Raster
+  PAux -raster- (rov): PCI .aux Labelled
+  MFF -raster- (rov): Vexcel MFF Raster (*.hdr)
+  MFF2 -raster- (ro): Vexcel MFF2 (HKV) Raster
   GSC -raster- (rov): GSC Geogrid
   FAST -raster- (rov): EOSAT FAST Format
-  BT -raster- (rw+v): VTP .bt (Binary Terrain) 1.3 Format (*.bt)
-  LAN -raster- (rw+v): Erdas .LAN/.GIS
+  LAN -raster- (rov): Erdas .LAN/.GIS
   CPG -raster- (rov): Convair PolGASP
   NDF -raster- (rov): NLAPS Data Format
   EIR -raster- (rov): Erdas Imagine Raw
-  DIPEx -raster- (rov): DIPEx
   LCP -raster- (rwv): FARSITE v.4 Landscape File (.lcp) (*.lcp)
-  GTX -raster- (rw+v): NOAA Vertical Datum .GTX (*.gtx)
+  GTX -raster- (rov): NOAA Vertical Datum .GTX (*.gtx)
   LOSLAS -raster- (rov): NADCON .los/.las Datum Grid Shift
-  NTv2 -raster- (rw+vs): NTv2 Datum Grid Shift (*.gsb, *.gvb)
+  NTv2 -raster- (rovs): NTv2 Datum Grid Shift (*.gsb, *.gvb)
   ACE2 -raster- (rov): ACE2 (*.ACE2)
   SNODAS -raster- (rov): Snow Data Assimilation System (*.hdr)
   KRO -raster- (rw+v): KOLOR Raw (*.kro)
   ROI_PAC -raster- (rw+v): ROI_PAC raster
   RRASTER -raster- (rw+v): R Raster (*.grd)
-  BYN -raster- (rw+v): Natural Resources Canada's Geoid (*.byn, *.err)
+  BYN -raster- (rov): Natural Resources Canada's Geoid (*.byn, *.err)
   NOAA_B -raster- (rov): NOAA GEOCON/NADCON5 .b format (*.b)
   RIK -raster- (rov): Swedish Grid RIK (.rik) (*.rik)
   USGSDEM -raster- (rwv): USGS Optional ASCII DEM (and CDED) (*.dem)

autotest/gdrivers/byn.py

@@ -34,16 +34,6 @@ def test_byn_1():
 #
 
 
-def test_byn_2():
-
-    tst = gdaltest.GDALTest("BYN", "byn/cgg2013ai08_reduced.byn", 1, 64764)
-    tst.testCreateCopy(new_filename="tmp/byn_test_2.byn")
-
-
-###############################################################################
-#
-
-
 def test_byn_invalid_header_bytes():
 
     tst = gdaltest.GDALTest("BYN", "byn/test_invalid_header_bytes.byn", 1, 64764)

autotest/gdrivers/mff2.py

@@ -24,14 +24,3 @@ def test_mff2_1():
 
     tst = gdaltest.GDALTest("MFF2", "mff2/bytemff2", 1, 4672)
     tst.testOpen()
-
-
-###############################################################################
-# Test writing a MFF2 file
-
-
-def test_mff2_write():
-
-    with gdaltest.config_option("GDAL_PAM_ENABLED", "NO"):
-        tst = gdaltest.GDALTest("MFF2", "mff2/bytemff2", 1, 4672)
-        tst.testCreateCopy(check_srs=True)