Skip to content

Commit 7f7618d

Browse files
committed
S104: add write (CreateCopy()) support for S104 v2.0
1 parent f77a7db commit 7f7618d

File tree

10 files changed

+3305
-64
lines changed

10 files changed

+3305
-64
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
@@ -103,7 +103,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
103103
GXF -raster- (rov): GeoSoft Grid Exchange Format (*.gxf)
104104
BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
105105
S102 -raster,multidimensional raster- (rwvs): S-102 Bathymetric Surface Product (*.h5)
106-
S104 -raster,multidimensional raster- (rovs): S-104 Water Level Information for Surface Navigation Product (*.h5)
106+
S104 -raster,multidimensional raster- (rwvs): S-104 Water Level Information for Surface Navigation Product (*.h5)
107107
S111 -raster,multidimensional raster- (rovs): 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

.github/workflows/windows_conda_expected_gdalinfo_formats.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
105105
KEA -raster- (rw+uv): KEA Image Format (.kea) (*.kea)
106106
BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
107107
S102 -raster,multidimensional raster- (rwvs): S-102 Bathymetric Surface Product (*.h5)
108-
S104 -raster,multidimensional raster- (rovs): S-104 Water Level Information for Surface Navigation Product (*.h5)
108+
S104 -raster,multidimensional raster- (rwvs): S-104 Water Level Information for Surface Navigation Product (*.h5)
109109
S111 -raster,multidimensional raster- (rovs): 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

apps/gdal_translate_bin.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,10 @@ MAIN_START(argc, argv)
167167
/* -------------------------------------------------------------------- */
168168
if (!sOptionsForBinary.bCopySubDatasets &&
169169
GDALGetRasterCount(hDataset) == 0 &&
170-
CSLCount(GDALGetMetadata(hDataset, "SUBDATASETS")) > 0)
170+
CSLCount(GDALGetMetadata(hDataset, "SUBDATASETS")) > 0 &&
171+
// S104 driver knows how to handle a source dataset with subdatasets
172+
// and no input bands.
173+
!EQUAL(sOptionsForBinary.osFormat.c_str(), "S104"))
171174
{
172175
fprintf(stderr, "Input file contains subdatasets. Please, select one "
173176
"of them for reading.\n");

0 commit comments

Comments
 (0)