Skip to content

Commit

Permalink
Merge pull request #11758 from rouault/remove_geoconcept
Browse files Browse the repository at this point in the history
Remove OGR Geoconcept export driver + mention in doc removed formats (cumulative with previous PRs)
  • Loading branch information
rouault authored Mar 2, 2025
2 parents 486aa52 + 8e7e9c7 commit a4de9c0
Show file tree
Hide file tree
Showing 363 changed files with 153 additions and 58,722 deletions.
1 change: 0 additions & 1 deletion .github/workflows/alpine/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ RUN apk add \
muparser-dev \
netcdf-dev \
odbc-cpp-wrapper-dev \
ogdi-dev \
openexr-dev \
openjpeg-dev \
openssl-dev \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/alpine_32bit/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ RUN apk add \
mariadb-connector-c-dev \
netcdf-dev \
odbc-cpp-wrapper-dev \
ogdi-dev \
openexr-dev \
openjpeg-dev \
openssl-dev \
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/alpine_32bit/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ make quicktest
PYTEST_SKIP=
PYTEST_XFAIL="gcore/tiff_ovr.py gdrivers/gribmultidim.py gdrivers/mbtiles.py gdrivers/vrtwarp.py gdrivers/wcs.py utilities/test_gdalwarp.py pyscripts/test_gdal_pansharpen.py"

# Fails with ERROR 1: OGDI DataSource Open Failed: Could not find the dynamic library "vrf"
PYTEST_SKIP="ogr/ogr_ogdi.py $PYTEST_SKIP"

# Stalls on it. Probably not enough memory
PYTEST_SKIP="gdrivers/jp2openjpeg.py $PYTEST_SKIP"

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/asan/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ find -L \
! -name netcdf_cfchecks.py \
! -name ogr_fgdb.py `# Don't run these` \
! -name ogr_pgeo.py `# Don't run these` \
! -name ogr_ogdi.py `# Error on ogdi_5 test` \
! -name ogr_gpsbabel.py `# new-delete-type-mismatch error in gpsbabel binary that we can't suppress` \
! -name "__init__.py" \
! -path 'ogr/data/*' \
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/cmake_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
libfreexl-dev unixodbc-dev libwebp-dev liblcms2-2 libcrypto++-dev libkml-dev \
libmysqlclient-dev libarmadillo-dev wget libfyba-dev libjsoncpp-dev libexpat1-dev \
libclc-dev ocl-icd-opencl-dev libsqlite3-dev sqlite3-pcre libpcre3-dev libspatialite-dev libsfcgal-dev fossil libcairo2-dev libjson-c-dev libdeflate-dev liblz4-dev libblosc-dev libarchive-dev \
libqhull-dev libcfitsio-dev libogdi-dev libopenjp2-7-dev libheif-dev \
libqhull-dev libcfitsio-dev libopenjp2-7-dev libheif-dev \
python3-dev libpython3-dev libpython3.10-dev python3.10-dev python3-numpy python3-lxml python3-pyflakes python3-setuptools python3-pip python3-venv \
python3-pytest swig doxygen texlive-latex-base make cppcheck ccache g++ \
libpq-dev libpqtypes-dev postgresql-14 postgresql-14-postgis-3 postgresql-client-14 postgresql-14-postgis-3-scripts
Expand Down Expand Up @@ -95,9 +95,6 @@ jobs:
sudo apt-get update
sudo apt-get install -y -V libarrow-dev libparquet-dev libarrow-dataset-dev
#
# Workaround bug in ogdi packaging
sudo ln -s /usr/lib/ogdi/libvrf.so /usr/lib
#
PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -r $GITHUB_WORKSPACE/autotest/requirements.txt
- name: Build libjxl
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ jobs:
liblzma-dev \
libmysqlclient-dev \
libnetcdf-dev \
libogdi-dev \
libopenexr-dev \
libopenjp2-7-dev \
libpcre3-dev \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/s390x/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ RUN apt-get update && \
liblzma-dev${APT_ARCH_SUFFIX} \
libmysqlclient-dev${APT_ARCH_SUFFIX} \
libnetcdf-dev${APT_ARCH_SUFFIX} \
libogdi-dev${APT_ARCH_SUFFIX} \
libopenexr-dev${APT_ARCH_SUFFIX} \
libopenjp2-7-dev${APT_ARCH_SUFFIX} \
libpcre3-dev${APT_ARCH_SUFFIX} \
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/ubuntu_20.04/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ RUN apt-get update -y \
libmuparser-dev \
libmysqlclient-dev \
libnetcdf-dev \
libogdi-dev \
libopenexr-dev \
libopenjp2-7-dev \
libpcre2-dev \
Expand Down Expand Up @@ -124,9 +123,6 @@ RUN mkdir tiledb \
&& cd ../.. \
&& rm -rf tiledeb

# Workaround bug in ogdi packaging
RUN ln -s /usr/lib/ogdi/libvrf.so /usr/lib

# Build libjxl
# libjxl being still unstable, if the main branch fails to compile/test
# you can replace JXL_TREEISH=main by JXL_TREEISH=sha1_of_known_working_commit
Expand Down Expand Up @@ -276,7 +272,7 @@ RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \
); fi

# Install exprtk
RUN wget -q -P /usr/local/include https://raw.githubusercontent.com/ArashPartow/exprtk/refs/heads/master/exprtk.hpp
RUN wget -q -P /usr/local/include https://raw.githubusercontent.com/ArashPartow/exprtk/refs/heads/master/exprtk.hpp

RUN ldconfig

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ubuntu_22.04/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ RUN apt-get update && \
liblzma-dev \
libmysqlclient-dev \
libnetcdf-dev \
libogdi-dev \
libopenexr-dev \
libopenjp2-7-dev \
libpcre3-dev \
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/ubuntu_24.04/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ RUN apt-get update && \
libmuparser-dev \
libmysqlclient-dev \
libnetcdf-dev \
libogdi-dev \
libopenexr-dev \
libopenjp2-7-dev \
libpcre3-dev \
Expand Down Expand Up @@ -158,10 +157,6 @@ RUN curl -L -O https://download.oracle.com/otn_software/linux/instantclient/1990
&& apt-get install -y libaio1t64 \
&& ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1

# Workaround libogdi packaging issue
# Cf https://lists.debian.org/debian-gis/2024/04/msg00006.html
RUN ln -s /usr/lib/x86_64-linux-gnu/ogdi/4.1/libvrf.so /usr/lib/x86_64-linux-gnu

COPY requirements.txt /tmp/
RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -U --break-system-packages -r /tmp/requirements.txt

Expand Down
31 changes: 9 additions & 22 deletions .github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
CEOS -raster- (rov): CEOS Image
JAXAPALSAR -raster- (rov): JAXA PALSAR Product Reader (Level 1.1/1.5)
GFF -raster- (rov): Ground-based SAR Applications Testbed File Format (.gff) (*.gff)
ELAS -raster- (rw+v): ELAS
ESRIC -raster- (rov): Esri Compact Cache (*.json, *.tpkx)
AIG -raster- (rov): Arc/Info Binary Grid
AAIGrid -raster- (rwv): Arc/Info ASCII Grid (*.asc)
GRASSASCIIGrid -raster- (rov): GRASS ASCII Grid
ISG -raster- (rov): International Service for the Geoid (*.isg)
SDTS -raster- (rov): SDTS Raster (*.ddf)
DTED -raster- (rwv): DTED Elevation Raster (*.dt0, *.dt1, *.dt2)
PNG -raster- (rwv): Portable Network Graphics (*.png)
JPEG -raster- (rwv): JPEG JFIF (*.jpg, *.jpeg)
Expand All @@ -31,7 +29,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
ESAT -raster- (rov): Envisat Image Format (*.n1)
FITS -raster,vector- (rw+): Flexible Image Transport System (*.fits)
BSB -raster- (rov): Maptech BSB Nautical Charts (*.kap)
XPM -raster- (rwv): X11 PixMap Format (*.xpm)
BMP -raster- (rw+v): MS Windows Device Independent Bitmap (*.bmp)
DIMAP -raster- (rovs): SPOT DIMAP
AirSAR -raster- (rov): AirSAR Polarimetric Image
Expand All @@ -40,41 +37,35 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
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)
SGI -raster- (rw+v): SGI Image File Format 1.0 (*.rgb)
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+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- (rw+v): USGS Astrogeology ISIS cube (Version 2)
ISIS2 -raster- (rov): USGS Astrogeology ISIS cube (Version 2)
PDS -raster- (rov): NASA Planetary Data System
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)
JP2OpenJPEG -raster,vector- (rwv): JPEG-2000 driver based on JP2OpenJPEG library (*.jp2, *.j2k)
L1B -raster- (rovs): NOAA Polar Orbiter Level 1b Data Set
FIT -raster- (rwv): FIT Image
GRIB -raster,multidimensional raster- (rwv): GRIdded Binary (.grb, .grb2) (*.grb, *.grb2, *.grib2)
RMF -raster- (rw+v): Raster Matrix Format (*.rsw)
WCS -raster- (rovs): OGC Web Coverage Service
WMS -raster- (rwvs): OGC Web Map Service
MSGN -raster- (rov): EUMETSAT Archive native (.nat) (*.nat)
RST -raster- (rw+v): Idrisi Raster A.1 (*.rst)
GSAG -raster- (rwv): Golden Software ASCII Grid (.grd) (*.grd)
GSBG -raster- (rw+v): Golden Software Binary Grid (.grd) (*.grd)
GS7BG -raster- (rw+v): Golden Software 7 Binary Grid (.grd) (*.grd)
COSAR -raster- (rov): COSAR Annotated Binary Matrix (TerraSAR-X)
TSX -raster- (rov): TerraSAR-X Product
COASP -raster- (ro): DRDC COASP SAR Processor Raster (*.hdr)
R -raster- (rwv): R Object Data Store (*.rda)
MAP -raster- (rov): OziExplorer .MAP
KMLSUPEROVERLAY -raster- (rwv): Kml Super Overlay (*.kml, *.kmz)
WEBP -raster- (rwv): WEBP (*.webp)
PDF -raster,vector- (rw+uvs): Geospatial PDF (*.pdf)
Rasterlite -raster- (rwvs): Rasterlite (*.sqlite)
MBTiles -raster,vector- (rw+v): MBTiles (*.mbtiles)
PLMOSAIC -raster- (ro): Planet Labs Mosaics API
CALS -raster- (rwv): CALS (Type 1) (*.cal, *.ct1)
Expand All @@ -84,32 +75,29 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
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)
PAux -raster- (rw+v): PCI .aux Labelled
MFF -raster- (rw+v): Vexcel MFF Raster (*.hdr)
MFF2 -raster- (rw+): Vexcel MFF2 (HKV) Raster
PAux -raster- (rov): PCI .aux Labelled
MFF -raster- (rov): Vexcel MFF Raster (*.hdr)
MFF2 -raster- (ro): Vexcel MFF2 (HKV) Raster
GSC -raster- (rov): GSC Geogrid
FAST -raster- (rov): EOSAT FAST Format
BT -raster- (rw+v): VTP .bt (Binary Terrain) 1.3 Format (*.bt)
LAN -raster- (rw+v): Erdas .LAN/.GIS
LAN -raster- (rov): Erdas .LAN/.GIS
CPG -raster- (rov): Convair PolGASP
NDF -raster- (rov): NLAPS Data Format
EIR -raster- (rov): Erdas Imagine Raw
DIPEx -raster- (rov): DIPEx
LCP -raster- (rwv): FARSITE v.4 Landscape File (.lcp) (*.lcp)
GTX -raster- (rw+v): NOAA Vertical Datum .GTX (*.gtx)
LOSLAS -raster- (rov): NADCON .los/.las Datum Grid Shift
NTv2 -raster- (rw+vs): NTv2 Datum Grid Shift (*.gsb, *.gvb)
CTable2 -raster- (rw+v): CTable2 Datum Grid Shift
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)
ROI_PAC -raster- (rw+v): ROI_PAC raster
RRASTER -raster- (rw+uv): R Raster (*.grd)
BYN -raster- (rw+v): Natural Resources Canada's Geoid (*.byn, *.err)
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)
RIK -raster- (rov): Swedish Grid RIK (.rik) (*.rik)
USGSDEM -raster- (rwv): USGS Optional ASCII DEM (and CDED) (*.dem)
USGSDEM -raster- (rov): USGS Optional ASCII DEM (and CDED) (*.dem)
GXF -raster- (rov): GeoSoft Grid Exchange Format (*.gxf)
BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
S102 -raster,multidimensional raster- (rovs): S-102 Bathymetric Surface Product (*.h5)
Expand All @@ -119,9 +107,8 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
HDF5Image -raster- (rov): HDF5 Dataset
NWT_GRD -raster- (rw+v): Northwood Numeric Grid Format .grd/.tab (*.grd)
NWT_GRC -raster- (rov): Northwood Classified Grid Format .grc/.tab (*.grc)
ADRG -raster- (rw+vs): ARC Digitized Raster Graphics (*.gen)
ADRG -raster- (rovs): ARC Digitized Raster Graphics (*.gen)
SRP -raster- (rovs): Standard Raster Product (ASRP/USRP) (*.img)
BLX -raster- (rwv): Magellan topo (.blx) (*.blx)
GeoRaster -raster- (rw+s): Oracle Spatial GeoRaster
PostGISRaster -raster- (rws): PostGIS Raster driver
SAGA -raster- (rw+v): SAGA GIS Binary Grid (.sdat, .sg-grd-z) (*.sdat, *.sg-grd-z)
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
OGCAPI -raster,vector- (rov): OGCAPI
ESRI Shapefile -vector- (rw+uv): ESRI Shapefile (*.shp, *.dbf, *.shz, *.shp.zip)
MapInfo File -vector- (rw+uv): MapInfo File (*.tab, *.mif, *.mid)
UK .NTF -vector- (rov): UK .NTF
LVBAG -vector- (rov): Kadaster LV BAG Extract 2.0 (*.xml)
OGR_SDTS -vector- (rov): SDTS
S57 -vector- (rw+v): IHO S-57 (ENC) (*.000)
DGN -vector- (rw+v): Microstation DGN (*.dgn)
OGR_VRT -vector- (rov): VRT - Virtual Datasource (*.vrt)
Expand All @@ -38,7 +36,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
WAsP -vector- (rw+v): WAsP .map format (*.map)
PGeo -vector- (ro): ESRI Personal GeoDatabase (*.mdb)
MSSQLSpatial -vector- (rw+u): Microsoft SQL Server Spatial Database (BCP)
OGR_OGDI -vector- (ro): OGDI Vectors (VPF, VMAP, DCW)
PostgreSQL -vector- (rw+u): PostgreSQL/PostGIS
MySQL -vector- (rw+u): MySQL
OCI -vector- (rw+u): Oracle Spatial
Expand All @@ -47,7 +44,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
DXF -vector- (rw+v): AutoCAD DXF (*.dxf)
CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
FlatGeobuf -vector- (rw+v): FlatGeobuf (*.fgb)
Geoconcept -vector- (rw+v): Geoconcept (*.gxt, *.txt)
GeoRSS -vector- (rw+v): GeoRSS
VFK -vector- (ro): Czech Cadastral Exchange Data Format (*.vfk)
PGDUMP -vector- (w+v): PostgreSQL SQL dump (*.sql)
Expand All @@ -58,7 +54,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
OAPIF -vector- (ro): OGC API - Features
SOSI -vector- (ro): Norwegian SOSI Standard
EDIGEO -vector- (rov): French EDIGEO exchange format (*.thf)
SVG -vector- (rov): Scalable Vector Graphics (*.svg)
Idrisi -vector- (rov): Idrisi Vector (.vct) (*.vct)
XLS -vector- (ro): MS Excel format (*.xls)
ODS -vector- (rw+uv): Open Document/ LibreOffice / OpenOffice Spreadsheet (*.ods)
Expand All @@ -83,7 +78,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
MiraMonVector -vector- (rw+v): MiraMon Vectors (.pol, .arc, .pnt) (*.pol, *.arc, *.pnt)
XODR -vector- (ro): OpenDRIVE - Open Dynamic Road Information for Vehicle Environment (*.xodr)
ADBC -vector- (ro): Arrow Database Connectivity
TIGER -vector- (rov): U.S. Census TIGER/Line
AVCBin -vector- (rov): Arc/Info Binary Coverage
AVCE00 -vector- (rov): Arc/Info E00 (ASCII) Coverage (*.e00)
AIVector -vector- (ro): Artificial Intelligence powered vector driver
Expand Down
Loading

0 comments on commit a4de9c0

Please sign in to comment.