Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@rouault
rouault committed Jan 30, 2025
2 parents b64e863 + 73eca73 commit b9505b2
Show file tree
Hide file tree
Showing 129 changed files with 936 additions and 425 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subdatasets)
VRT -raster,multidimensional raster- (rw+v): Virtual Raster (*.vrt)
Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update, v:virtual-I/O s:subdatasets)
VRT -raster,multidimensional raster- (rw+uv): Virtual Raster (*.vrt)
DERIVED -raster- (ro): Derived datasets using VRT pixel functions
GTI -raster- (rov): GDAL Raster Tile Index (*.gti.gpkg, *.gti.fgb, *.gti)
SNAP_TIFF -raster- (rov): Sentinel Application Processing GeoTIFF
GTiff -raster- (rw+vs): GeoTIFF (*.tif, *.tiff)
GTiff -raster- (rw+uvs): GeoTIFF (*.tif, *.tiff)
COG -raster- (wv): Cloud optimized GeoTIFF generator (*.tif, *.tiff)
LIBERTIFF -raster- (rov): GeoTIFF (using LIBERTIFF library) (*.tif, *.tiff)
NITF -raster- (rw+vs): National Imagery Transmission Format (*.ntf)
NITF -raster- (rw+uvs): National Imagery Transmission Format (*.ntf)
RPFTOC -raster- (rovs): Raster Product Format TOC format (*.toc)
ECRGTOC -raster- (rovs): ECRG TOC format (*.xml)
HFA -raster- (rw+v): Erdas Imagine Images (.img) (*.img)
HFA -raster- (rw+uv): Erdas Imagine Images (.img) (*.img)
SAR_CEOS -raster- (rov): CEOS SAR Image
CEOS -raster- (rov): CEOS Image
JAXAPALSAR -raster- (rov): JAXA PALSAR Product Reader (Level 1.1/1.5)
Expand All @@ -34,19 +34,19 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
AirSAR -raster- (rov): AirSAR Polarimetric Image
RS2 -raster- (rovs): RadarSat 2 XML Product
SAFE -raster- (rov): Sentinel-1 SAR SAFE Product
PCIDSK -raster,vector- (rw+v): PCIDSK Database File (*.pix)
PCIDSK -raster,vector- (rw+uv): PCIDSK Database File (*.pix)
PCRaster -raster- (rw+): PCRaster Raster File (*.map)
ILWIS -raster- (rw+v): ILWIS Raster Map (*.mpr, *.mpl)
SRTMHGT -raster- (rwv): SRTMHGT File Format (*.hgt)
Leveller -raster- (rw+v): Leveller heightfield (*.ter)
Terragen -raster- (rw+v): Terragen heightfield (*.ter)
netCDF -raster,multidimensional raster,vector- (rw+vs): Network Common Data Format (*.nc)
netCDF -raster,multidimensional raster,vector- (rw+uvs): Network Common Data Format (*.nc)
HDF4 -raster,multidimensional raster- (ros): Hierarchical Data Format Release 4 (*.hdf)
HDF4Image -raster- (rw+): HDF4 Dataset
ISIS3 -raster- (rw+v): USGS Astrogeology ISIS cube (Version 3) (*.lbl, *.cub)
ISIS2 -raster- (rov): USGS Astrogeology ISIS cube (Version 2)
PDS -raster- (rov): NASA Planetary Data System
PDS4 -raster,vector- (rw+vs): NASA Planetary Data System 4 (*.xml)
PDS4 -raster,vector- (rw+uvs): NASA Planetary Data System 4 (*.xml)
VICAR -raster,vector- (rw+v): MIPL VICAR file
TIL -raster- (rov): EarthWatch .TIL
ERS -raster- (rw+v): ERMapper .ers Labelled (*.ers)
Expand All @@ -65,7 +65,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
MAP -raster- (rov): OziExplorer .MAP
KMLSUPEROVERLAY -raster- (rwv): Kml Super Overlay (*.kml, *.kmz)
WEBP -raster- (rwv): WEBP (*.webp)
PDF -raster,vector- (rw+vs): Geospatial PDF (*.pdf)
PDF -raster,vector- (rw+uvs): Geospatial PDF (*.pdf)
MBTiles -raster,vector- (rw+v): MBTiles (*.mbtiles)
PLMOSAIC -raster- (ro): Planet Labs Mosaics API
CALS -raster- (rwv): CALS (Type 1) (*.cal, *.ct1)
Expand All @@ -92,7 +92,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
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)
RRASTER -raster- (rw+uv): R Raster (*.grd)
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)
Expand Down Expand Up @@ -130,16 +130,16 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
STACTA -raster- (rovs): Spatio-Temporal Asset Catalog Tiled Assets (*.json)
STACIT -raster- (rovs): Spatio-Temporal Asset Catalog Items
JPEGXL -raster- (rwv): JPEG-XL (*.jxl)
GPKG -raster,vector- (rw+vs): GeoPackage (*.gpkg, *.gpkg.zip)
SQLite -raster,vector- (rw+v): SQLite / Spatialite / RasterLite2 (*.sqlite, *.db)
OpenFileGDB -raster,vector- (rw+v): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
GPKG -raster,vector- (rw+uvs): GeoPackage (*.gpkg, *.gpkg.zip)
SQLite -raster,vector- (rw+uv): SQLite / Spatialite / RasterLite2 (*.sqlite, *.db)
OpenFileGDB -raster,vector- (rw+uv): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
PLSCENES -raster,vector- (ro): Planet Labs Scenes API
NGW -raster,vector- (rw+s): NextGIS Web
GenBin -raster- (rov): Generic Binary (.hdr Labelled)
ENVI -raster- (rw+v): ENVI .hdr Labelled
EHdr -raster- (rw+v): ESRI .hdr Labelled (*.bil)
ENVI -raster- (rw+uv): ENVI .hdr Labelled
EHdr -raster- (rw+uv): ESRI .hdr Labelled (*.bil)
ISCE -raster- (rw+v): ISCE raster
Zarr -raster,multidimensional raster- (rw+vs): Zarr
Zarr -raster,multidimensional raster- (rw+uvs): Zarr
RCM -raster- (rovs): Radarsat Constellation Mission XML Product
HTTP -raster,vector- (ro): HTTP Fetching Wrapper
40 changes: 20 additions & 20 deletions .github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subdatasets)
Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update, v:virtual-I/O s:subdatasets)
FITS -raster,vector- (rw+): Flexible Image Transport System (*.fits)
PCIDSK -raster,vector- (rw+v): PCIDSK Database File (*.pix)
netCDF -raster,multidimensional raster,vector- (rw+vs): Network Common Data Format (*.nc)
PDS4 -raster,vector- (rw+vs): NASA Planetary Data System 4 (*.xml)
PCIDSK -raster,vector- (rw+uv): PCIDSK Database File (*.pix)
netCDF -raster,multidimensional raster,vector- (rw+uvs): Network Common Data Format (*.nc)
PDS4 -raster,vector- (rw+uvs): NASA Planetary Data System 4 (*.xml)
VICAR -raster,vector- (rw+v): MIPL VICAR file
JP2OpenJPEG -raster,vector- (rwv): JPEG-2000 driver based on JP2OpenJPEG library (*.jp2, *.j2k)
PDF -raster,vector- (rw+vs): Geospatial PDF (*.pdf)
PDF -raster,vector- (rw+uvs): Geospatial PDF (*.pdf)
MBTiles -raster,vector- (rw+v): MBTiles (*.mbtiles)
BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
EEDA -vector- (ro): Earth Engine Data API
OGCAPI -raster,vector- (rov): OGCAPI
ESRI Shapefile -vector- (rw+v): ESRI Shapefile (*.shp, *.dbf, *.shz, *.shp.zip)
MapInfo File -vector- (rw+v): MapInfo File (*.tab, *.mif, *.mid)
ESRI Shapefile -vector- (rw+uv): ESRI Shapefile (*.shp, *.dbf, *.shz, *.shp.zip)
MapInfo File -vector- (rw+uv): MapInfo File (*.tab, *.mif, *.mid)
LVBAG -vector- (rov): Kadaster LV BAG Extract 2.0 (*.xml)
S57 -vector- (rw+v): IHO S-57 (ENC) (*.000)
DGN -vector- (rw+v): Microstation DGN (*.dgn)
OGR_VRT -vector- (rov): VRT - Virtual Datasource (*.vrt)
Memory -vector- (rw+): Memory
CSV -vector- (rw+v): Comma Separated Value (.csv) (*.csv, *.tsv, *.psv)
CSV -vector- (rw+uv): Comma Separated Value (.csv) (*.csv, *.tsv, *.psv)
NAS -vector- (rov): NAS - ALKIS (*.xml)
GML -vector- (rw+v): Geography Markup Language (GML) (*.gml, *.xml)
GPX -vector- (rw+v): GPX (*.gpx)
LIBKML -vector- (rw+v): Keyhole Markup Language (LIBKML) (*.kml, *.kmz)
LIBKML -vector- (rw+uv): Keyhole Markup Language (LIBKML) (*.kml, *.kmz)
KML -vector- (rw+v): Keyhole Markup Language (KML) (*.kml)
GeoJSON -vector- (rw+v): GeoJSON (*.json, *.geojson)
GeoJSON -vector- (rw+uv): GeoJSON (*.json, *.geojson)
GeoJSONSeq -vector- (rw+v): GeoJSON Sequence (*.geojsonl, *.geojsons)
ESRIJSON -vector- (rov): ESRIJSON (*.json)
TopoJSON -vector- (rov): TopoJSON (*.json, *.topojson)
Interlis 1 -vector- (rov): Interlis 1 (*.itf, *.ili)
Interlis 2 -vector- (rov): Interlis 2 (*.xtf, *.xml, *.ili)
OGR_GMT -vector- (rw+v): GMT ASCII Vectors (.gmt) (*.gmt)
GPKG -raster,vector- (rw+vs): GeoPackage (*.gpkg, *.gpkg.zip)
SQLite -raster,vector- (rw+v): SQLite / Spatialite / RasterLite2 (*.sqlite, *.db)
GPKG -raster,vector- (rw+uvs): GeoPackage (*.gpkg, *.gpkg.zip)
SQLite -raster,vector- (rw+uv): SQLite / Spatialite / RasterLite2 (*.sqlite, *.db)
ODBC -vector- (ro): Open Database Connectivity (ODBC) (*.mdb, *.accdb)
WAsP -vector- (rw+v): WAsP .map format (*.map)
PGeo -vector- (ro): ESRI Personal GeoDatabase (*.mdb)
MSSQLSpatial -vector- (rw+): Microsoft SQL Server Spatial Database (BCP)
PostgreSQL -vector- (rw+): PostgreSQL/PostGIS
MySQL -vector- (rw+): MySQL
OCI -vector- (rw+): Oracle Spatial
OpenFileGDB -raster,vector- (rw+v): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
MSSQLSpatial -vector- (rw+u): Microsoft SQL Server Spatial Database (BCP)
PostgreSQL -vector- (rw+u): PostgreSQL/PostGIS
MySQL -vector- (rw+u): MySQL
OCI -vector- (rw+u): Oracle Spatial
OpenFileGDB -raster,vector- (rw+uv): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
FileGDB -vector- (rw+): ESRI FileGDB (*.gdb)
DXF -vector- (rw+v): AutoCAD DXF (*.dxf)
CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
Expand All @@ -57,8 +57,8 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
SVG -vector- (rov): Scalable Vector Graphics (*.svg)
Idrisi -vector- (rov): Idrisi Vector (.vct) (*.vct)
XLS -vector- (ro): MS Excel format (*.xls)
ODS -vector- (rw+v): Open Document/ LibreOffice / OpenOffice Spreadsheet (*.ods)
XLSX -vector- (rw+v): MS Office Open XML spreadsheet (*.xlsx, *.xlsm)
ODS -vector- (rw+uv): Open Document/ LibreOffice / OpenOffice Spreadsheet (*.ods)
XLSX -vector- (rw+uv): MS Office Open XML spreadsheet (*.xlsx, *.xlsm)
Elasticsearch -vector- (rw+): Elastic Search
Carto -vector- (rw+): Carto
AmigoCloud -vector- (rw+): AmigoCloud
Expand All @@ -67,7 +67,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
JML -vector- (rw+v): OpenJUMP JML (*.jml)
PLSCENES -raster,vector- (ro): Planet Labs Scenes API
CSW -vector- (ro): OGC CSW (Catalog Service for the Web)
MongoDBv3 -vector- (ro): MongoDB (using libmongocxx v3 client)
MongoDBv3 -vector- (rou): MongoDB (using libmongocxx v3 client)
VDV -vector- (rw+v): VDV-451/VDV-452/INTREST Data Format (*.txt, *.x10)
GMLAS -vector- (rwv): Geography Markup Language (GML) driven by application schemas (*.gml, *.xml)
MVT -vector- (rw+v): Mapbox Vector Tiles (*.mvt, *.mvt.gz, *.pbf)
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/windows_conda_expected_gdalinfo_formats.txt
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subdatasets)
VRT -raster,multidimensional raster- (rw+v): Virtual Raster (*.vrt)
Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update, v:virtual-I/O s:subdatasets)
VRT -raster,multidimensional raster- (rw+uv): Virtual Raster (*.vrt)
DERIVED -raster- (ro): Derived datasets using VRT pixel functions
GTI -raster- (rov): GDAL Raster Tile Index (*.gti.gpkg, *.gti.fgb, *.gti)
SNAP_TIFF -raster- (rov): Sentinel Application Processing GeoTIFF
GTiff -raster- (rw+vs): GeoTIFF (*.tif, *.tiff)
GTiff -raster- (rw+uvs): GeoTIFF (*.tif, *.tiff)
COG -raster- (wv): Cloud optimized GeoTIFF generator (*.tif, *.tiff)
LIBERTIFF -raster- (rov): GeoTIFF (using LIBERTIFF library) (*.tif, *.tiff)
NITF -raster- (rw+vs): National Imagery Transmission Format (*.ntf)
NITF -raster- (rw+uvs): National Imagery Transmission Format (*.ntf)
RPFTOC -raster- (rovs): Raster Product Format TOC format (*.toc)
ECRGTOC -raster- (rovs): ECRG TOC format (*.xml)
HFA -raster- (rw+v): Erdas Imagine Images (.img) (*.img)
HFA -raster- (rw+uv): Erdas Imagine Images (.img) (*.img)
SAR_CEOS -raster- (rov): CEOS SAR Image
CEOS -raster- (rov): CEOS Image
JAXAPALSAR -raster- (rov): JAXA PALSAR Product Reader (Level 1.1/1.5)
Expand All @@ -34,19 +34,19 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
AirSAR -raster- (rov): AirSAR Polarimetric Image
RS2 -raster- (rovs): RadarSat 2 XML Product
SAFE -raster- (rov): Sentinel-1 SAR SAFE Product
PCIDSK -raster,vector- (rw+v): PCIDSK Database File (*.pix)
PCIDSK -raster,vector- (rw+uv): PCIDSK Database File (*.pix)
PCRaster -raster- (rw+): PCRaster Raster File (*.map)
ILWIS -raster- (rw+v): ILWIS Raster Map (*.mpr, *.mpl)
SRTMHGT -raster- (rwv): SRTMHGT File Format (*.hgt)
Leveller -raster- (rw+v): Leveller heightfield (*.ter)
Terragen -raster- (rw+v): Terragen heightfield (*.ter)
netCDF -raster,multidimensional raster,vector- (rw+s): Network Common Data Format (*.nc)
netCDF -raster,multidimensional raster,vector- (rw+us): Network Common Data Format (*.nc)
HDF4 -raster,multidimensional raster- (ros): Hierarchical Data Format Release 4 (*.hdf)
HDF4Image -raster- (rw+): HDF4 Dataset
ISIS3 -raster- (rw+v): USGS Astrogeology ISIS cube (Version 3) (*.lbl, *.cub)
ISIS2 -raster- (rov): USGS Astrogeology ISIS cube (Version 2)
PDS -raster- (rov): NASA Planetary Data System
PDS4 -raster,vector- (rw+vs): NASA Planetary Data System 4 (*.xml)
PDS4 -raster,vector- (rw+uvs): NASA Planetary Data System 4 (*.xml)
VICAR -raster,vector- (rw+v): MIPL VICAR file
TIL -raster- (rov): EarthWatch .TIL
ERS -raster- (rw+v): ERMapper .ers Labelled (*.ers)
Expand All @@ -66,14 +66,14 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
MAP -raster- (rov): OziExplorer .MAP
KMLSUPEROVERLAY -raster- (rwv): Kml Super Overlay (*.kml, *.kmz)
WEBP -raster- (rwv): WEBP (*.webp)
PDF -raster,vector- (rw+vs): Geospatial PDF (*.pdf)
PDF -raster,vector- (rw+uvs): Geospatial PDF (*.pdf)
MBTiles -raster,vector- (rw+v): MBTiles (*.mbtiles)
PLMOSAIC -raster- (ro): Planet Labs Mosaics API
CALS -raster- (rwv): CALS (Type 1) (*.cal, *.ct1)
WMTS -raster- (rwv): OGC Web Map Tile Service
SENTINEL2 -raster- (rovs): Sentinel 2
MRF -raster- (rw+v): Meta Raster Format (*.mrf)
TileDB -raster,multidimensional raster,vector- (rw+vs): TileDB
TileDB -raster,multidimensional raster,vector- (rw+uvs): TileDB
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)
Expand All @@ -94,13 +94,13 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
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)
RRASTER -raster- (rw+uv): R Raster (*.grd)
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- (rov): USGS Optional ASCII DEM (and CDED) (*.dem)
GXF -raster- (rov): GeoSoft Grid Exchange Format (*.gxf)
KEA -raster- (rw+v): KEA Image Format (.kea) (*.kea)
KEA -raster- (rw+uv): KEA Image Format (.kea) (*.kea)
BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
S102 -raster,multidimensional raster- (rovs): S-102 Bathymetric Surface Product (*.h5)
S104 -raster,multidimensional raster- (rov): S-104 Water Level Information for Surface Navigation Product (*.h5)
Expand Down Expand Up @@ -130,15 +130,15 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
STACTA -raster- (rovs): Spatio-Temporal Asset Catalog Tiled Assets (*.json)
STACIT -raster- (rovs): Spatio-Temporal Asset Catalog Items
NSIDCbin -raster- (rov): NSIDC Sea Ice Concentrations binary (.bin) (*.bin)
GPKG -raster,vector- (rw+vs): GeoPackage (*.gpkg, *.gpkg.zip)
OpenFileGDB -raster,vector- (rw+v): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
GPKG -raster,vector- (rw+uvs): GeoPackage (*.gpkg, *.gpkg.zip)
OpenFileGDB -raster,vector- (rw+uv): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
PLSCENES -raster,vector- (ro): Planet Labs Scenes API
NGW -raster,vector- (rw+s): NextGIS Web
GenBin -raster- (rov): Generic Binary (.hdr Labelled)
ENVI -raster- (rw+v): ENVI .hdr Labelled
EHdr -raster- (rw+v): ESRI .hdr Labelled (*.bil)
ENVI -raster- (rw+uv): ENVI .hdr Labelled
EHdr -raster- (rw+uv): ESRI .hdr Labelled (*.bil)
ISCE -raster- (rw+v): ISCE raster
Zarr -raster,multidimensional raster- (rw+vs): Zarr
Zarr -raster,multidimensional raster- (rw+uvs): Zarr
RCM -raster- (rovs): Radarsat Constellation Mission XML Product
HTTP -raster,vector- (ro): HTTP Fetching Wrapper
Loading

0 comments on commit b9505b2

Please sign in to comment.