Skip to content

Commit a4de9c0

Browse files
authored
Merge pull request OSGeo#11758 from rouault/remove_geoconcept
Remove OGR Geoconcept export driver + mention in doc removed formats (cumulative with previous PRs)
2 parents 486aa52 + 8e7e9c7 commit a4de9c0

File tree

363 files changed

+153
-58722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

363 files changed

+153
-58722
lines changed

.github/workflows/alpine/Dockerfile.ci

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ RUN apk add \
4444
muparser-dev \
4545
netcdf-dev \
4646
odbc-cpp-wrapper-dev \
47-
ogdi-dev \
4847
openexr-dev \
4948
openjpeg-dev \
5049
openssl-dev \

.github/workflows/alpine_32bit/Dockerfile.ci

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ RUN apk add \
4545
mariadb-connector-c-dev \
4646
netcdf-dev \
4747
odbc-cpp-wrapper-dev \
48-
ogdi-dev \
4948
openexr-dev \
5049
openjpeg-dev \
5150
openssl-dev \

.github/workflows/alpine_32bit/test.sh

-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ make quicktest
1111
PYTEST_SKIP=
1212
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"
1313

14-
# Fails with ERROR 1: OGDI DataSource Open Failed: Could not find the dynamic library "vrf"
15-
PYTEST_SKIP="ogr/ogr_ogdi.py $PYTEST_SKIP"
16-
1714
# Stalls on it. Probably not enough memory
1815
PYTEST_SKIP="gdrivers/jp2openjpeg.py $PYTEST_SKIP"
1916

.github/workflows/asan/test.sh

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ find -L \
4949
! -name netcdf_cfchecks.py \
5050
! -name ogr_fgdb.py `# Don't run these` \
5151
! -name ogr_pgeo.py `# Don't run these` \
52-
! -name ogr_ogdi.py `# Error on ogdi_5 test` \
5352
! -name ogr_gpsbabel.py `# new-delete-type-mismatch error in gpsbabel binary that we can't suppress` \
5453
! -name "__init__.py" \
5554
! -path 'ogr/data/*' \

.github/workflows/cmake_builds.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
libfreexl-dev unixodbc-dev libwebp-dev liblcms2-2 libcrypto++-dev libkml-dev \
5757
libmysqlclient-dev libarmadillo-dev wget libfyba-dev libjsoncpp-dev libexpat1-dev \
5858
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 \
59-
libqhull-dev libcfitsio-dev libogdi-dev libopenjp2-7-dev libheif-dev \
59+
libqhull-dev libcfitsio-dev libopenjp2-7-dev libheif-dev \
6060
python3-dev libpython3-dev libpython3.10-dev python3.10-dev python3-numpy python3-lxml python3-pyflakes python3-setuptools python3-pip python3-venv \
6161
python3-pytest swig doxygen texlive-latex-base make cppcheck ccache g++ \
6262
libpq-dev libpqtypes-dev postgresql-14 postgresql-14-postgis-3 postgresql-client-14 postgresql-14-postgis-3-scripts
@@ -95,9 +95,6 @@ jobs:
9595
sudo apt-get update
9696
sudo apt-get install -y -V libarrow-dev libparquet-dev libarrow-dataset-dev
9797
#
98-
# Workaround bug in ogdi packaging
99-
sudo ln -s /usr/lib/ogdi/libvrf.so /usr/lib
100-
#
10198
PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -r $GITHUB_WORKSPACE/autotest/requirements.txt
10299
103100
- name: Build libjxl

.github/workflows/codeql.yml

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ jobs:
7474
liblzma-dev \
7575
libmysqlclient-dev \
7676
libnetcdf-dev \
77-
libogdi-dev \
7877
libopenexr-dev \
7978
libopenjp2-7-dev \
8079
libpcre3-dev \

.github/workflows/s390x/Dockerfile.ci

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ RUN apt-get update && \
5353
liblzma-dev${APT_ARCH_SUFFIX} \
5454
libmysqlclient-dev${APT_ARCH_SUFFIX} \
5555
libnetcdf-dev${APT_ARCH_SUFFIX} \
56-
libogdi-dev${APT_ARCH_SUFFIX} \
5756
libopenexr-dev${APT_ARCH_SUFFIX} \
5857
libopenjp2-7-dev${APT_ARCH_SUFFIX} \
5958
libpcre3-dev${APT_ARCH_SUFFIX} \

.github/workflows/ubuntu_20.04/Dockerfile.ci

+1-5
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ RUN apt-get update -y \
5252
libmuparser-dev \
5353
libmysqlclient-dev \
5454
libnetcdf-dev \
55-
libogdi-dev \
5655
libopenexr-dev \
5756
libopenjp2-7-dev \
5857
libpcre2-dev \
@@ -124,9 +123,6 @@ RUN mkdir tiledb \
124123
&& cd ../.. \
125124
&& rm -rf tiledeb
126125

127-
# Workaround bug in ogdi packaging
128-
RUN ln -s /usr/lib/ogdi/libvrf.so /usr/lib
129-
130126
# Build libjxl
131127
# libjxl being still unstable, if the main branch fails to compile/test
132128
# you can replace JXL_TREEISH=main by JXL_TREEISH=sha1_of_known_working_commit
@@ -276,7 +272,7 @@ RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \
276272
); fi
277273

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

281277
RUN ldconfig
282278

.github/workflows/ubuntu_22.04/Dockerfile.ci

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ RUN apt-get update && \
3939
liblzma-dev \
4040
libmysqlclient-dev \
4141
libnetcdf-dev \
42-
libogdi-dev \
4342
libopenexr-dev \
4443
libopenjp2-7-dev \
4544
libpcre3-dev \

.github/workflows/ubuntu_24.04/Dockerfile.ci

-5
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ RUN apt-get update && \
4040
libmuparser-dev \
4141
libmysqlclient-dev \
4242
libnetcdf-dev \
43-
libogdi-dev \
4443
libopenexr-dev \
4544
libopenjp2-7-dev \
4645
libpcre3-dev \
@@ -158,10 +157,6 @@ RUN curl -L -O https://download.oracle.com/otn_software/linux/instantclient/1990
158157
&& apt-get install -y libaio1t64 \
159158
&& ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1
160159

161-
# Workaround libogdi packaging issue
162-
# Cf https://lists.debian.org/debian-gis/2024/04/msg00006.html
163-
RUN ln -s /usr/lib/x86_64-linux-gnu/ogdi/4.1/libvrf.so /usr/lib/x86_64-linux-gnu
164-
165160
COPY requirements.txt /tmp/
166161
RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -U --break-system-packages -r /tmp/requirements.txt
167162

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

+9-22
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
1414
CEOS -raster- (rov): CEOS Image
1515
JAXAPALSAR -raster- (rov): JAXA PALSAR Product Reader (Level 1.1/1.5)
1616
GFF -raster- (rov): Ground-based SAR Applications Testbed File Format (.gff) (*.gff)
17-
ELAS -raster- (rw+v): ELAS
1817
ESRIC -raster- (rov): Esri Compact Cache (*.json, *.tpkx)
1918
AIG -raster- (rov): Arc/Info Binary Grid
2019
AAIGrid -raster- (rwv): Arc/Info ASCII Grid (*.asc)
2120
GRASSASCIIGrid -raster- (rov): GRASS ASCII Grid
2221
ISG -raster- (rov): International Service for the Geoid (*.isg)
23-
SDTS -raster- (rov): SDTS Raster (*.ddf)
2422
DTED -raster- (rwv): DTED Elevation Raster (*.dt0, *.dt1, *.dt2)
2523
PNG -raster- (rwv): Portable Network Graphics (*.png)
2624
JPEG -raster- (rwv): JPEG JFIF (*.jpg, *.jpeg)
@@ -31,7 +29,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
3129
ESAT -raster- (rov): Envisat Image Format (*.n1)
3230
FITS -raster,vector- (rw+): Flexible Image Transport System (*.fits)
3331
BSB -raster- (rov): Maptech BSB Nautical Charts (*.kap)
34-
XPM -raster- (rwv): X11 PixMap Format (*.xpm)
3532
BMP -raster- (rw+v): MS Windows Device Independent Bitmap (*.bmp)
3633
DIMAP -raster- (rovs): SPOT DIMAP
3734
AirSAR -raster- (rov): AirSAR Polarimetric Image
@@ -40,41 +37,35 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
4037
PCIDSK -raster,vector- (rw+uv): PCIDSK Database File (*.pix)
4138
PCRaster -raster- (rw+): PCRaster Raster File (*.map)
4239
ILWIS -raster- (rw+v): ILWIS Raster Map (*.mpr, *.mpl)
43-
SGI -raster- (rw+v): SGI Image File Format 1.0 (*.rgb)
4440
SRTMHGT -raster- (rwv): SRTMHGT File Format (*.hgt)
4541
Leveller -raster- (rw+v): Leveller heightfield (*.ter)
4642
Terragen -raster- (rw+v): Terragen heightfield (*.ter)
4743
netCDF -raster,multidimensional raster,vector- (rw+uvs): Network Common Data Format (*.nc)
4844
HDF4 -raster,multidimensional raster- (ros): Hierarchical Data Format Release 4 (*.hdf)
4945
HDF4Image -raster- (rw+): HDF4 Dataset
5046
ISIS3 -raster- (rw+v): USGS Astrogeology ISIS cube (Version 3) (*.lbl, *.cub)
51-
ISIS2 -raster- (rw+v): USGS Astrogeology ISIS cube (Version 2)
47+
ISIS2 -raster- (rov): USGS Astrogeology ISIS cube (Version 2)
5248
PDS -raster- (rov): NASA Planetary Data System
5349
PDS4 -raster,vector- (rw+uvs): NASA Planetary Data System 4 (*.xml)
5450
VICAR -raster,vector- (rw+v): MIPL VICAR file
5551
TIL -raster- (rov): EarthWatch .TIL
5652
ERS -raster- (rw+v): ERMapper .ers Labelled (*.ers)
5753
JP2OpenJPEG -raster,vector- (rwv): JPEG-2000 driver based on JP2OpenJPEG library (*.jp2, *.j2k)
5854
L1B -raster- (rovs): NOAA Polar Orbiter Level 1b Data Set
59-
FIT -raster- (rwv): FIT Image
6055
GRIB -raster,multidimensional raster- (rwv): GRIdded Binary (.grb, .grb2) (*.grb, *.grb2, *.grib2)
6156
RMF -raster- (rw+v): Raster Matrix Format (*.rsw)
6257
WCS -raster- (rovs): OGC Web Coverage Service
6358
WMS -raster- (rwvs): OGC Web Map Service
6459
MSGN -raster- (rov): EUMETSAT Archive native (.nat) (*.nat)
6560
RST -raster- (rw+v): Idrisi Raster A.1 (*.rst)
66-
GSAG -raster- (rwv): Golden Software ASCII Grid (.grd) (*.grd)
67-
GSBG -raster- (rw+v): Golden Software Binary Grid (.grd) (*.grd)
6861
GS7BG -raster- (rw+v): Golden Software 7 Binary Grid (.grd) (*.grd)
6962
COSAR -raster- (rov): COSAR Annotated Binary Matrix (TerraSAR-X)
7063
TSX -raster- (rov): TerraSAR-X Product
7164
COASP -raster- (ro): DRDC COASP SAR Processor Raster (*.hdr)
72-
R -raster- (rwv): R Object Data Store (*.rda)
7365
MAP -raster- (rov): OziExplorer .MAP
7466
KMLSUPEROVERLAY -raster- (rwv): Kml Super Overlay (*.kml, *.kmz)
7567
WEBP -raster- (rwv): WEBP (*.webp)
7668
PDF -raster,vector- (rw+uvs): Geospatial PDF (*.pdf)
77-
Rasterlite -raster- (rwvs): Rasterlite (*.sqlite)
7869
MBTiles -raster,vector- (rw+v): MBTiles (*.mbtiles)
7970
PLMOSAIC -raster- (ro): Planet Labs Mosaics API
8071
CALS -raster- (rwv): CALS (Type 1) (*.cal, *.ct1)
@@ -84,32 +75,29 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
8475
PNM -raster- (rw+v): Portable Pixmap Format (netpbm) (*.pgm, *.ppm, *.pnm)
8576
DOQ1 -raster- (rov): USGS DOQ (Old Style)
8677
DOQ2 -raster- (rov): USGS DOQ (New Style)
87-
PAux -raster- (rw+v): PCI .aux Labelled
88-
MFF -raster- (rw+v): Vexcel MFF Raster (*.hdr)
89-
MFF2 -raster- (rw+): Vexcel MFF2 (HKV) Raster
78+
PAux -raster- (rov): PCI .aux Labelled
79+
MFF -raster- (rov): Vexcel MFF Raster (*.hdr)
80+
MFF2 -raster- (ro): Vexcel MFF2 (HKV) Raster
9081
GSC -raster- (rov): GSC Geogrid
9182
FAST -raster- (rov): EOSAT FAST Format
92-
BT -raster- (rw+v): VTP .bt (Binary Terrain) 1.3 Format (*.bt)
93-
LAN -raster- (rw+v): Erdas .LAN/.GIS
83+
LAN -raster- (rov): Erdas .LAN/.GIS
9484
CPG -raster- (rov): Convair PolGASP
9585
NDF -raster- (rov): NLAPS Data Format
9686
EIR -raster- (rov): Erdas Imagine Raw
97-
DIPEx -raster- (rov): DIPEx
9887
LCP -raster- (rwv): FARSITE v.4 Landscape File (.lcp) (*.lcp)
9988
GTX -raster- (rw+v): NOAA Vertical Datum .GTX (*.gtx)
10089
LOSLAS -raster- (rov): NADCON .los/.las Datum Grid Shift
101-
NTv2 -raster- (rw+vs): NTv2 Datum Grid Shift (*.gsb, *.gvb)
102-
CTable2 -raster- (rw+v): CTable2 Datum Grid Shift
90+
NTv2 -raster- (rovs): NTv2 Datum Grid Shift (*.gsb, *.gvb)
10391
ACE2 -raster- (rov): ACE2 (*.ACE2)
10492
SNODAS -raster- (rov): Snow Data Assimilation System (*.hdr)
10593
KRO -raster- (rw+v): KOLOR Raw (*.kro)
10694
ROI_PAC -raster- (rw+v): ROI_PAC raster
10795
RRASTER -raster- (rw+uv): R Raster (*.grd)
108-
BYN -raster- (rw+v): Natural Resources Canada's Geoid (*.byn, *.err)
96+
BYN -raster- (rov): Natural Resources Canada's Geoid (*.byn, *.err)
10997
NOAA_B -raster- (rov): NOAA GEOCON/NADCON5 .b format (*.b)
11098
NSIDCbin -raster- (rov): NSIDC Sea Ice Concentrations binary (.bin) (*.bin)
11199
RIK -raster- (rov): Swedish Grid RIK (.rik) (*.rik)
112-
USGSDEM -raster- (rwv): USGS Optional ASCII DEM (and CDED) (*.dem)
100+
USGSDEM -raster- (rov): USGS Optional ASCII DEM (and CDED) (*.dem)
113101
GXF -raster- (rov): GeoSoft Grid Exchange Format (*.gxf)
114102
BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
115103
S102 -raster,multidimensional raster- (rovs): S-102 Bathymetric Surface Product (*.h5)
@@ -119,9 +107,8 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
119107
HDF5Image -raster- (rov): HDF5 Dataset
120108
NWT_GRD -raster- (rw+v): Northwood Numeric Grid Format .grd/.tab (*.grd)
121109
NWT_GRC -raster- (rov): Northwood Classified Grid Format .grc/.tab (*.grc)
122-
ADRG -raster- (rw+vs): ARC Digitized Raster Graphics (*.gen)
110+
ADRG -raster- (rovs): ARC Digitized Raster Graphics (*.gen)
123111
SRP -raster- (rovs): Standard Raster Product (ASRP/USRP) (*.img)
124-
BLX -raster- (rwv): Magellan topo (.blx) (*.blx)
125112
GeoRaster -raster- (rw+s): Oracle Spatial GeoRaster
126113
PostGISRaster -raster- (rws): PostGIS Raster driver
127114
SAGA -raster- (rw+v): SAGA GIS Binary Grid (.sdat, .sg-grd-z) (*.sdat, *.sg-grd-z)

.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt

-6
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
1212
OGCAPI -raster,vector- (rov): OGCAPI
1313
ESRI Shapefile -vector- (rw+uv): ESRI Shapefile (*.shp, *.dbf, *.shz, *.shp.zip)
1414
MapInfo File -vector- (rw+uv): MapInfo File (*.tab, *.mif, *.mid)
15-
UK .NTF -vector- (rov): UK .NTF
1615
LVBAG -vector- (rov): Kadaster LV BAG Extract 2.0 (*.xml)
17-
OGR_SDTS -vector- (rov): SDTS
1816
S57 -vector- (rw+v): IHO S-57 (ENC) (*.000)
1917
DGN -vector- (rw+v): Microstation DGN (*.dgn)
2018
OGR_VRT -vector- (rov): VRT - Virtual Datasource (*.vrt)
@@ -38,7 +36,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
3836
WAsP -vector- (rw+v): WAsP .map format (*.map)
3937
PGeo -vector- (ro): ESRI Personal GeoDatabase (*.mdb)
4038
MSSQLSpatial -vector- (rw+u): Microsoft SQL Server Spatial Database (BCP)
41-
OGR_OGDI -vector- (ro): OGDI Vectors (VPF, VMAP, DCW)
4239
PostgreSQL -vector- (rw+u): PostgreSQL/PostGIS
4340
MySQL -vector- (rw+u): MySQL
4441
OCI -vector- (rw+u): Oracle Spatial
@@ -47,7 +44,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
4744
DXF -vector- (rw+v): AutoCAD DXF (*.dxf)
4845
CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
4946
FlatGeobuf -vector- (rw+v): FlatGeobuf (*.fgb)
50-
Geoconcept -vector- (rw+v): Geoconcept (*.gxt, *.txt)
5147
GeoRSS -vector- (rw+v): GeoRSS
5248
VFK -vector- (ro): Czech Cadastral Exchange Data Format (*.vfk)
5349
PGDUMP -vector- (w+v): PostgreSQL SQL dump (*.sql)
@@ -58,7 +54,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
5854
OAPIF -vector- (ro): OGC API - Features
5955
SOSI -vector- (ro): Norwegian SOSI Standard
6056
EDIGEO -vector- (rov): French EDIGEO exchange format (*.thf)
61-
SVG -vector- (rov): Scalable Vector Graphics (*.svg)
6257
Idrisi -vector- (rov): Idrisi Vector (.vct) (*.vct)
6358
XLS -vector- (ro): MS Excel format (*.xls)
6459
ODS -vector- (rw+uv): Open Document/ LibreOffice / OpenOffice Spreadsheet (*.ods)
@@ -83,7 +78,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
8378
MiraMonVector -vector- (rw+v): MiraMon Vectors (.pol, .arc, .pnt) (*.pol, *.arc, *.pnt)
8479
XODR -vector- (ro): OpenDRIVE - Open Dynamic Road Information for Vehicle Environment (*.xodr)
8580
ADBC -vector- (ro): Arrow Database Connectivity
86-
TIGER -vector- (rov): U.S. Census TIGER/Line
8781
AVCBin -vector- (rov): Arc/Info Binary Coverage
8882
AVCE00 -vector- (rov): Arc/Info E00 (ASCII) Coverage (*.e00)
8983
AIVector -vector- (ro): Artificial Intelligence powered vector driver

0 commit comments

Comments
 (0)