Fix conflict

rouault · Jan 28, 2025 · 5f99ee1 · 5f99ee1
1 parent 9d2acc2
commit 5f99ee1
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 606 deletions.
diff --git a/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt b/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
@@ -88,7 +88,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   LCP -raster- (rwv): FARSITE v.4 Landscape File (.lcp) (*.lcp)
   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)

diff --git a/.github/workflows/windows_conda_expected_gdalinfo_formats.txt b/.github/workflows/windows_conda_expected_gdalinfo_formats.txt
@@ -90,7 +90,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   LCP -raster- (rwv): FARSITE v.4 Landscape File (.lcp) (*.lcp)
   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)

diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
@@ -16,8 +16,6 @@
 import gdaltest
 import pytest
 
-from osgeo import gdal
-
 pytestmark = pytest.mark.require_driver("NTV2")
 
 ###############################################################################
@@ -42,95 +40,6 @@ def test_ntv2_2():
     tst.testOpen(check_gt=gt, check_prj="WGS84")
 
 
-###############################################################################
-# Test creating a little-endian NTv2 grid
-
-
-def test_ntv2_3():
-
-    tst = gdaltest.GDALTest(
-        "NTV2", "ntv2/test_ntv2_le.gsb", 2, 10, options=["ENDIANNESS=LE"]
-    )
-    tst.testCreateCopy(vsimem=1)
-
-
-###############################################################################
-# Test creating a big-endian NTv2 grid
-
-
-def test_ntv2_4():
-
-    tst = gdaltest.GDALTest(
-        "NTV2", "ntv2/test_ntv2_le.gsb", 2, 10, options=["ENDIANNESS=BE"]
-    )
-    tst.testCreateCopy(vsimem=1)
-
-
-###############################################################################
-# Test appending to a little-endian NTv2 grid
-
-
-def test_ntv2_5():
-
-    src_ds = gdal.Open("data/ntv2/test_ntv2_le.gsb")
-    gdal.GetDriverByName("NTv2").Create(
-        "/vsimem/ntv2_5.gsb", 1, 1, 4, gdal.GDT_Float32, options=["ENDIANNESS=LE"]
-    )
-    ds = gdal.GetDriverByName("NTv2").CreateCopy(
-        "/vsimem/ntv2_5.gsb", src_ds, options=["APPEND_SUBDATASET=YES"]
-    )
-    assert ds.FlushCache() == gdal.CE_None
-    assert ds.GetRasterBand(2).Checksum() == 10
-    ds = None
-    ds = gdal.Open("NTv2:1:/vsimem/ntv2_5.gsb")
-    assert ds.GetRasterBand(2).Checksum() == 10
-    ds = None
-    gdal.GetDriverByName("NTv2").Delete("/vsimem/ntv2_5.gsb")
-
-
-###############################################################################
-# Test appending to a big-endian NTv2 grid
-
-
-def test_ntv2_6():
-
-    src_ds = gdal.Open("data/ntv2/test_ntv2_le.gsb")
-    gdal.GetDriverByName("NTv2").Create(
-        "/vsimem/ntv2_6.gsb", 1, 1, 4, gdal.GDT_Float32, options=["ENDIANNESS=BE"]
-    )
-    ds = gdal.GetDriverByName("NTv2").CreateCopy(
-        "/vsimem/ntv2_6.gsb", src_ds, options=["APPEND_SUBDATASET=YES"]
-    )
-    assert ds.GetRasterBand(2).Checksum() == 10
-    ds = None
-    ds = gdal.Open("NTv2:1:/vsimem/ntv2_6.gsb")
-    assert ds.GetRasterBand(2).Checksum() == 10
-    ds = None
-    gdal.GetDriverByName("NTv2").Delete("/vsimem/ntv2_6.gsb")
-
-
-###############################################################################
-# Test creating a file with invalid filename
-
-
-def test_ntv2_7():
-
-    with pytest.raises(Exception):
-        gdal.GetDriverByName("NTv2").Create(
-            "/does/not/exist.gsb", 1, 1, 4, gdal.GDT_Float32
-        )
-
-    with pytest.raises(Exception):
-        gdal.GetDriverByName("NTv2").Create(
-            "/does/not/exist.gsb",
-            1,
-            1,
-            4,
-            gdal.GDT_Float32,
-            options=["APPEND_SUBDATASET=YES"],
-        )
-
-
 ###############################################################################
 
 
@@ -150,35 +59,3 @@ def test_ntv2_online_1():
     )
     gt = (165.95, 0.1, 0.0, -33.95, 0.0, -0.1)
     tst.testOpen(check_gt=gt, check_prj="WGS84")
-
-
-###############################################################################
-
-
-def test_ntv2_online_2():
-
-    try:
-        os.stat("tmp/cache/nzgd2kgrid0005.gsb")
-    except OSError:
-        pytest.skip()
-
-    tst = gdaltest.GDALTest(
-        "NTV2", "tmp/cache/nzgd2kgrid0005.gsb", 1, 54971, filename_absolute=1
-    )
-    tst.testCreateCopy(vsimem=1)
-
-
-###############################################################################
-
-
-def test_ntv2_online_3():
-
-    try:
-        os.stat("tmp/cache/nzgd2kgrid0005.gsb")
-    except OSError:
-        pytest.skip()
-
-    tst = gdaltest.GDALTest(
-        "NTV2", "tmp/cache/nzgd2kgrid0005.gsb", 1, 54971, filename_absolute=1
-    )
-    tst.testCreate(vsimem=1, out_bands=4)
diff --git a/doc/source/drivers/raster/ntv2.rst b/doc/source/drivers/raster/ntv2.rst
@@ -13,10 +13,6 @@ NOTE: Implemented as :source_file:`frmts/raw/ntv2dataset.cpp`.
 Driver capabilities
 -------------------
 
-.. supports_createcopy::
-
-.. supports_create::
-
 .. supports_georeferencing::
 
 .. supports_virtualio::