Skip to content

Commit 5abe238

Browse files
committed
S111: add write (CreateCopy()) support for S111 v2.0
1 parent dc6a9f5 commit 5abe238

File tree

11 files changed

+2995
-35
lines changed

11 files changed

+2995
-35
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
104104
BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
105105
S102 -raster,multidimensional raster- (rwvs): S-102 Bathymetric Surface Product (*.h5)
106106
S104 -raster,multidimensional raster- (rwvs): S-104 Water Level Information for Surface Navigation Product (*.h5)
107-
S111 -raster,multidimensional raster- (rovs): S-111 Surface Currents Product (*.h5)
107+
S111 -raster,multidimensional raster- (rwvs): S-111 Surface Currents Product (*.h5)
108108
HDF5 -raster,multidimensional raster- (rovs): Hierarchical Data Format Release 5 (*.h5, *.hdf5)
109109
HDF5Image -raster- (rov): HDF5 Dataset
110110
NWT_GRD -raster- (rw+v): Northwood Numeric Grid Format .grd/.tab (*.grd)

.github/workflows/windows_conda_expected_gdalinfo_formats.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
106106
BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
107107
S102 -raster,multidimensional raster- (rwvs): S-102 Bathymetric Surface Product (*.h5)
108108
S104 -raster,multidimensional raster- (rwvs): S-104 Water Level Information for Surface Navigation Product (*.h5)
109-
S111 -raster,multidimensional raster- (rovs): S-111 Surface Currents Product (*.h5)
109+
S111 -raster,multidimensional raster- (rwvs): S-111 Surface Currents Product (*.h5)
110110
HDF5 -raster,multidimensional raster- (rovs): Hierarchical Data Format Release 5 (*.h5, *.hdf5)
111111
HDF5Image -raster- (rov): HDF5 Dataset
112112
NWT_GRD -raster- (rw+v): Northwood Numeric Grid Format .grd/.tab (*.grd)

apps/gdal_translate_bin.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,10 @@ MAIN_START(argc, argv)
168168
if (!sOptionsForBinary.bCopySubDatasets &&
169169
GDALGetRasterCount(hDataset) == 0 &&
170170
CSLCount(GDALGetMetadata(hDataset, "SUBDATASETS")) > 0 &&
171-
// S104 driver knows how to handle a source dataset with subdatasets
171+
// S104 and S111 drivers know how to handle a source dataset with subdatasets
172172
// and no input bands.
173-
!EQUAL(sOptionsForBinary.osFormat.c_str(), "S104"))
173+
!EQUAL(sOptionsForBinary.osFormat.c_str(), "S104") &&
174+
!EQUAL(sOptionsForBinary.osFormat.c_str(), "S111"))
174175
{
175176
fprintf(stderr, "Input file contains subdatasets. Please, select one "
176177
"of them for reading.\n");

0 commit comments

Comments
 (0)