Skip to content

Commit 131e630

Browse files
committed
S111: update driver long name, and CI: update expected_gdalinfo_formats.txt
1 parent afff4b9 commit 131e630

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ 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- (rovs): S-102 Bathymetric Surface Product (*.h5)
106-
S104 -raster,multidimensional raster- (rov): S-104 Water Level Information for Surface Navigation Product (*.h5)
107-
S111 -raster,multidimensional raster- (rov): Surface Currents Product (*.h5)
106+
S104 -raster,multidimensional raster- (rovs): S-104 Water Level Information for Surface Navigation Product (*.h5)
107+
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
110110
NWT_GRD -raster- (rw+v): Northwood Numeric Grid Format .grd/.tab (*.grd)

.github/workflows/windows_conda_expected_gdalinfo_formats.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ 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- (rovs): S-102 Bathymetric Surface Product (*.h5)
108-
S104 -raster,multidimensional raster- (rov): S-104 Water Level Information for Surface Navigation Product (*.h5)
109-
S111 -raster,multidimensional raster- (rov): Surface Currents Product (*.h5)
108+
S104 -raster,multidimensional raster- (rovs): S-104 Water Level Information for Surface Navigation Product (*.h5)
109+
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
112112
NWT_GRD -raster- (rw+v): Northwood Numeric Grid Format .grd/.tab (*.grd)

frmts/hdf5/hdf5drivercore.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,8 @@ void S111DriverSetCommonMetadata(GDALDriver *poDriver)
592592
poDriver->SetDescription(S111_DRIVER_NAME);
593593
poDriver->SetMetadataItem(GDAL_DCAP_RASTER, "YES");
594594
poDriver->SetMetadataItem(GDAL_DCAP_MULTIDIM_RASTER, "YES");
595-
poDriver->SetMetadataItem(GDAL_DMD_LONGNAME, "Surface Currents Product");
595+
poDriver->SetMetadataItem(GDAL_DMD_LONGNAME,
596+
"S-111 Surface Currents Product");
596597
poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC, "drivers/raster/s111.html");
597598
poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
598599
poDriver->SetMetadataItem(GDAL_DMD_EXTENSION, "h5");

0 commit comments

Comments
 (0)