diff --git a/.github/workflows/alpine/Dockerfile.ci b/.github/workflows/alpine/Dockerfile.ci index 7adca61bd2fc..2506ff2739da 100644 --- a/.github/workflows/alpine/Dockerfile.ci +++ b/.github/workflows/alpine/Dockerfile.ci @@ -62,7 +62,6 @@ RUN apk add \ sfcgal-dev \ snappy-dev \ sqlite-dev \ - swig \ tiledb-dev \ tiff-dev \ unixodbc-dev \ @@ -73,3 +72,11 @@ RUN apk add \ COPY requirements.txt /tmp/ RUN python3 -m pip install --break-system-packages -U -r /tmp/requirements.txt + +RUN apk add git autoconf automake libtool bison && \ + git clone --branch "${SWIG_GIT_TAG:-master}" --depth 1 https://github.com/swig/swig.git swig-git && \ + cd swig-git && \ + ./autogen.sh && \ + ./configure --prefix=/usr && \ + make -j$(nproc) && \ + make install diff --git a/.github/workflows/alpine_32bit/Dockerfile.ci b/.github/workflows/alpine_32bit/Dockerfile.ci index 4dee3a335fc0..bd85ef1320cb 100644 --- a/.github/workflows/alpine_32bit/Dockerfile.ci +++ b/.github/workflows/alpine_32bit/Dockerfile.ci @@ -9,6 +9,7 @@ RUN apk add \ brunsli-dev \ ccache \ cfitsio-dev \ + clang \ cmake \ curl-dev \ expat-dev \ diff --git a/.github/workflows/alpine_32bit/build.sh b/.github/workflows/alpine_32bit/build.sh index 77b1d9e93614..5424077ccf3e 100755 --- a/.github/workflows/alpine_32bit/build.sh +++ b/.github/workflows/alpine_32bit/build.sh @@ -4,6 +4,9 @@ set -e cmake ${GDAL_SOURCE_DIR:=..} \ -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_C_COMPILER=clang \ + -DCMAKE_CXX_COMPILER=clang++ \ + -DCMAKE_SHARED_LINKER_FLAGS="-lstdc++" \ -DUSE_CCACHE=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DIconv_INCLUDE_DIR=/usr/include/gnu-libiconv \ diff --git a/.github/workflows/android_cmake.yml b/.github/workflows/android_cmake.yml index eaccf59776d0..0200112eeaf1 100644 --- a/.github/workflows/android_cmake.yml +++ b/.github/workflows/android_cmake.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Cache uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/clang_static_analyzer.yml b/.github/workflows/clang_static_analyzer.yml index 7a18e1912dbe..452a8cd3c392 100644 --- a/.github/workflows/clang_static_analyzer.yml +++ b/.github/workflows/clang_static_analyzer.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Run run: docker run --rm -v $PWD:$PWD ubuntu:22.04 sh -c "cd $PWD && apt update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo software-properties-common && DEBIAN_FRONTEND=noninteractive sh ./ci/travis/csa_common/before_install.sh && sh ./ci/travis/csa_common/install.sh && sh ./ci/travis/csa_common/script.sh" diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml index fab7efb174dd..252c88862ba6 100644 --- a/.github/workflows/cmake_builds.yml +++ b/.github/workflows/cmake_builds.yml @@ -32,7 +32,7 @@ jobs: cache-name: cmake-ubuntu-focal steps: - name: Checkout GDAL - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup cache uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 id: cache @@ -94,7 +94,7 @@ jobs: # Workaround bug in ogdi packaging sudo ln -s /usr/lib/ogdi/libvrf.so /usr/lib # - python3 -m pip install -U pip wheel setuptools numpy + python3 -m pip install -U pip wheel setuptools numpy importlib_metadata python3 -m pip install -r $GITHUB_WORKSPACE/autotest/requirements.txt - name: Build libjxl @@ -214,15 +214,15 @@ jobs: test -f $GITHUB_WORKSPACE/install-gdal/share/man/man1/gdaladdo.1 export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/install-gdal/lib $GITHUB_WORKSPACE/install-gdal/bin/gdalinfo --version - PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3/dist-packages python3 -c "from osgeo import gdal;print(gdal.VersionInfo(None))" - PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3/dist-packages python3 $GITHUB_WORKSPACE/scripts/check_doc.py + PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3.8/site-packages python3 -c "from osgeo import gdal;print(gdal.VersionInfo(None))" + PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3.8/site-packages python3 $GITHUB_WORKSPACE/scripts/check_doc.py - name: CMake with rpath run: | export PATH=$CMAKE_DIR:/usr/local/bin:/usr/bin:/bin # Avoid CMake config from brew etc. (cd $GITHUB_WORKSPACE/superbuild/build; cmake .. "-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install-gdal-with-rpath" "-DCMAKE_INSTALL_RPATH=$GITHUB_WORKSPACE/install-gdal-with-rpath/lib") cmake --build $GITHUB_WORKSPACE/superbuild/build --target install -- -j$(nproc) # For some reason, during the install phase of above invocation, the Python bindings are rebuilt after the build phase, and without the rpath... Can't reproduce that locally - # PYTHONPATH=$GITHUB_WORKSPACE/install-gdal-with-rpath/lib/python3/dist-packages python -c "from osgeo import gdal;print(gdal.VersionInfo(None))" + # PYTHONPATH=$GITHUB_WORKSPACE/install-gdal-with-rpath/lib/python3.8/site-packages python -c "from osgeo import gdal;print(gdal.VersionInfo(None))" - name: Rerun using Mono run: | export PATH=$CMAKE_DIR:/usr/local/bin:/usr/bin:/bin # Avoid CMake config from brew etc. @@ -312,9 +312,9 @@ jobs: run: | git config --global core.autocrlf false - name: Checkout GDAL - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Install development packages - uses: msys2/setup-msys2@cc11e9188b693c2b100158c3322424c4cc1dadea # v2.22.0 + uses: msys2/setup-msys2@5df0ca6cbf14efcd08f8d5bd5e049a3cc8e07fd2 # v2.24.0 with: msystem: MINGW64 update: true @@ -323,7 +323,7 @@ jobs: base-devel git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-pcre mingw-w64-x86_64-xerces-c mingw-w64-x86_64-zstd mingw-w64-x86_64-libarchive mingw-w64-x86_64-geos mingw-w64-x86_64-libspatialite mingw-w64-x86_64-proj - mingw-w64-x86_64-cgal mingw-w64-x86_64-libfreexl mingw-w64-x86_64-hdf5 mingw-w64-x86_64-netcdf mingw-w64-x86_64-poppler mingw-w64-x86_64-postgresql + mingw-w64-x86_64-cgal mingw-w64-x86_64-libfreexl mingw-w64-x86_64-hdf5 mingw-w64-x86_64-netcdf mingw-w64-x86_64-poppler mingw-w64-x86_64-podofo mingw-w64-x86_64-postgresql mingw-w64-x86_64-libgeotiff mingw-w64-x86_64-libpng mingw-w64-x86_64-libtiff mingw-w64-x86_64-openjpeg2 mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-numpy mingw-w64-x86_64-python-pytest mingw-w64-x86_64-python-setuptools mingw-w64-x86_64-python-lxml mingw-w64-x86_64-swig mingw-w64-x86_64-python-psutil mingw-w64-x86_64-blosc - name: Setup cache @@ -405,7 +405,7 @@ jobs: run: | git config --global core.autocrlf false - name: Checkout GDAL - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 - name: populate JAVA_HOME shell: pwsh @@ -422,7 +422,7 @@ jobs: - name: Install dependency shell: bash -l {0} run: | - conda install --yes --quiet curl libiconv icu python=3.10 swig numpy pytest pytest-env pytest-benchmark filelock zlib lxml jsonschema + conda install --yes --quiet curl libiconv icu python=3.10 swig numpy pytest pytest-env pytest-benchmark filelock zlib lxml jsonschema setuptools # FIXME: remove libnetcdf=4.9.2=nompi_h5902ca5_107 pinning as soon as https://github.com/conda-forge/libnetcdf-feedstock/issues/182 is resolved conda install --yes --quiet proj geos hdf4 hdf5 kealib \ libnetcdf=4.9.2=nompi_h5902ca5_107 openjpeg poppler libtiff libpng xerces-c expat libxml2 kealib json-c \ @@ -507,7 +507,7 @@ jobs: run: | git config --global core.autocrlf false - name: Checkout GDAL - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 with: activate-environment: gdalenv @@ -519,7 +519,7 @@ jobs: - name: Install dependency shell: bash -l {0} run: | - conda install --yes --quiet proj pytest pytest-env pytest-benchmark filelock lxml cmake + conda install --yes --quiet proj pytest pytest-env pytest-benchmark filelock lxml cmake setuptools - name: Check CMake version shell: bash -l {0} run: | @@ -545,9 +545,19 @@ jobs: - name: Build shell: bash -l {0} run: cmake --build $GITHUB_WORKSPACE/build --config RelWithDebInfo -j 2 + + # Works around https://github.com/actions/runner-images/issues/10055 + - name: Remove conflicting libraries + shell: bash -l {0} + run: | + find "C:/hostedtoolcache/windows/Java_Temurin-Hotspot_jdk" -name "msvcp140.dll" -exec rm {} \; + - name: test (with ctest) shell: bash -l {0} run: | + # gnm_test has suddenly started failing around June 16th 2024 + # Related to image windows-latest 20240603.1.0 / actions/runner-images#10004 + echo "def test_dummy(): pass" > $GITHUB_WORKSPACE/autotest/gnm/gnm_test.py ctest --test-dir $GITHUB_WORKSPACE/build -C RelWithDebInfo -V -j 3 env: SKIP_GDAL_HTTP_SSL_VERIFYSTATUS: YES @@ -574,7 +584,7 @@ jobs: with: xcode-version: 14.3 - name: Checkout GDAL - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup cache uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 id: cache @@ -654,7 +664,7 @@ jobs: run: | git config --global core.autocrlf false - name: Checkout GDAL - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 with: activate-environment: gdalenv diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml index 674bae403803..44d8e1e841d9 100644 --- a/.github/workflows/code_checks.yml +++ b/.github/workflows/code_checks.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Install Requirements run: | @@ -47,7 +47,7 @@ jobs: container: ubuntu:24.04 steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Install Requirements run: | @@ -69,7 +69,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Detect tabulations run: ./scripts/detect_tabulations.sh @@ -104,8 +104,8 @@ jobs: linting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1 - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1 doxygen: @@ -113,7 +113,7 @@ jobs: container: ghcr.io/osgeo/proj-docs steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Run doxygen run: | @@ -124,7 +124,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Install Requirements run: | @@ -143,9 +143,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Set up Python - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 + uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1 with: python-version: 3.8 - name: Install lint tool @@ -159,7 +159,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Install requirements run: | diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f40914536e7b..c7cec407a7e6 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Install dependencies run: | @@ -107,7 +107,7 @@ jobs: # We do that after running CMake to avoid CodeQL to trigger during CMake time, # in particular during HDF5 detection which is terribly slow (https://github.com/OSGeo/gdal/issues/9549) - name: Initialize CodeQL - uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 + uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -127,6 +127,6 @@ jobs: cmake --build build -j$(nproc) - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 + uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index aa2dd18bcc31..fdb2624f3949 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -37,7 +37,7 @@ jobs: CACHE_NUMBER: 0 steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Support longpaths run: git config --system core.longpaths true diff --git a/.github/workflows/coverity_scan.yml b/.github/workflows/coverity_scan.yml index b1980c77bcfa..746b7864a198 100644 --- a/.github/workflows/coverity_scan.yml +++ b/.github/workflows/coverity_scan.yml @@ -43,7 +43,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Login to GHCR if: env.CONTAINER_REGISTRY == 'ghcr.io' diff --git a/.github/workflows/doc_build.yml b/.github/workflows/doc_build.yml index 0d7259f45767..91f6db8b444b 100644 --- a/.github/workflows/doc_build.yml +++ b/.github/workflows/doc_build.yml @@ -24,7 +24,7 @@ jobs: container: ghcr.io/osgeo/proj-docs steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup environment shell: bash -l {0} run: | diff --git a/.github/workflows/fedora_rawhide/Dockerfile.ci b/.github/workflows/fedora_rawhide/Dockerfile.ci index 584c58369f73..cb764b75ae00 100644 --- a/.github/workflows/fedora_rawhide/Dockerfile.ci +++ b/.github/workflows/fedora_rawhide/Dockerfile.ci @@ -1,6 +1,9 @@ FROM fedora:rawhide -RUN dnf upgrade -y +# FIXME: Exclude update of dnf&rpm themselves as this results in a no longer working dnf +# cf https://github.com/OSGeo/gdal/actions/runs/9448190401/job/26021669415?pr=10173 +# Likely a transient issue with Fedora 41 dev cycle +RUN dnf upgrade -y -x dnf -x rpm RUN dnf install -y --setopt=install_weak_deps=False proj-devel RUN dnf install -y clang make diffutils ccache cmake \ libxml2-devel libxslt-devel expat-devel xerces-c-devel \ diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index aec6b05ff504..61018055f11d 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -71,7 +71,7 @@ jobs: build_script: build.sh os: ubuntu-22.04 - - name: Alpine, gcc 32-bit + - name: Alpine, clang 32-bit id: alpine_32bit container: alpine_32bit build_script: build.sh @@ -81,7 +81,7 @@ jobs: - name: Fedora Rawhide, clang++ id: fedora_rawhide - travis_branch: sanitize + travis_branch: fedora_rawhide container: fedora_rawhide build_script: build.sh os: ubuntu-22.04 @@ -174,11 +174,11 @@ jobs: sudo sysctl vm.mmap_rnd_bits=28 - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Login to Docker Hub if: env.CONTAINER_REGISTRY == 'docker.io' - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -304,6 +304,7 @@ jobs: env: TRAVIS: yes TRAVIS_BRANCH: ${{ matrix.travis_branch }} + BUILD_NAME: ${{ matrix.travis_branch }} run: | if test -f ".github/workflows/${{ matrix.id }}/${{ matrix.test_script }}"; then TEST_CMD="$(pwd)/.github/workflows/${{ matrix.id }}/${{ matrix.test_script }}" @@ -326,6 +327,7 @@ jobs: -e GITHUB_WORKFLOW \ -e TRAVIS \ -e TRAVIS_BRANCH \ + -e BUILD_NAME \ -e "GDAL_SOURCE_DIR=$(pwd)" \ -u $(id -u ${USER}):$(id -g ${USER}) \ --security-opt seccomp=unconfined \ diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index dc446c51ce00..2221d7e29664 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -25,7 +25,7 @@ jobs: runs-on: macos-14 steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 with: diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 53caa8f567a3..6500911756b0 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -36,12 +36,12 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1 + uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0 with: results_file: results.sarif results_format: sarif @@ -71,6 +71,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 + uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 with: sarif_file: results.sarif diff --git a/.github/workflows/slow_tests.yml b/.github/workflows/slow_tests.yml index 40713a1f0bd0..f7cec9357de0 100644 --- a/.github/workflows/slow_tests.yml +++ b/.github/workflows/slow_tests.yml @@ -47,7 +47,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Login to GHCR if: env.CONTAINER_REGISTRY == 'ghcr.io' diff --git a/.github/workflows/ubuntu_20.04/Dockerfile.ci b/.github/workflows/ubuntu_20.04/Dockerfile.ci index 571bdd4495db..5501ea83dcb8 100644 --- a/.github/workflows/ubuntu_20.04/Dockerfile.ci +++ b/.github/workflows/ubuntu_20.04/Dockerfile.ci @@ -37,6 +37,7 @@ RUN apt-get update -y \ libfreexl-dev \ libfyba-dev \ libgeos-dev \ + libgeotiff-dev \ libgif-dev \ libhdf4-alt-dev \ libhdf5-serial-dev \ @@ -75,7 +76,7 @@ RUN apt-get update -y \ numactl \ ocl-icd-opencl-dev \ opencl-c-headers \ - openjdk-8-jdk \ + openjdk-8-jdk-headless \ pkg-config \ python3-dev \ python3-numpy \ @@ -258,8 +259,22 @@ RUN mkdir sqlite \ && cd .. \ && rm -rf sqlite +# Build libOpenDRIVE +ARG OPENDRIVE_VERSION=0.6.0-gdal +RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \ + wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \ + && tar xzf ${OPENDRIVE_VERSION}.tar.gz \ + && rm -f ${OPENDRIVE_VERSION}.tar.gz \ + && cd libOpenDRIVE-${OPENDRIVE_VERSION} \ + && cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/ \ + && make -j$(nproc) \ + && make install \ + && cd .. \ + && rm -rf libOpenDRIVE-${OPENDRIVE_VERSION} \ + ); fi + RUN ldconfig COPY requirements.txt /tmp/ RUN python3 -m pip install -U -r /tmp/requirements.txt -RUN python3 -m pip install cfchecker diff --git a/.github/workflows/ubuntu_20.04/build.sh b/.github/workflows/ubuntu_20.04/build.sh index 510a463b79cf..54fe24572fba 100755 --- a/.github/workflows/ubuntu_20.04/build.sh +++ b/.github/workflows/ubuntu_20.04/build.sh @@ -5,12 +5,12 @@ set -eu export CXXFLAGS="-march=native -O2 -Wodr -flto-odr-type-merging -Werror" export CFLAGS="-O2 -march=native -Werror" -cmake ${GDAL_SOURCE_DIR:=..} \ +cmake "${GDAL_SOURCE_DIR:=..}" \ -DUSE_CCACHE=ON \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DGDAL_USE_TIFF_INTERNAL=ON \ - -DGDAL_USE_GEOTIFF_INTERNAL=ON \ + -DCMAKE_INSTALL_PREFIX=/tmp/install-gdal \ + -DGDAL_USE_TIFF_INTERNAL=OFF \ + -DGDAL_USE_GEOTIFF_INTERNAL=OFF \ -DECW_ROOT=/opt/libecwj2-3.3 \ -DMRSID_ROOT=/usr/local \ -DFileGDB_ROOT=/usr/local/FileGDB_API \ @@ -20,5 +20,75 @@ cmake ${GDAL_SOURCE_DIR:=..} \ unset CXXFLAGS unset CFLAGS -make -j$(nproc) -make -j$(nproc) install DESTDIR=/tmp/install-gdal +make "-j$(nproc)" +make "-j$(nproc)" install + +# Download Oracle SDK +wget https://download.oracle.com/otn_software/linux/instantclient/1923000/instantclient-basic-linux.x64-19.23.0.0.0dbru.zip +wget https://download.oracle.com/otn_software/linux/instantclient/1923000/instantclient-sdk-linux.x64-19.23.0.0.0dbru.zip +unzip -o instantclient-basic-linux.x64-19.23.0.0.0dbru.zip +unzip -o instantclient-sdk-linux.x64-19.23.0.0.0dbru.zip + +# Test building MrSID driver in standalone mode +mkdir build_mrsid +cd build_mrsid +cmake -S ${GDAL_SOURCE_DIR:=..}/frmts/mrsid -DMRSID_ROOT=/usr/local -DCMAKE_PREFIX_PATH=/tmp/install-gdal +cmake --build . "-j$(nproc)" +test -f gdal_MrSID.so +cd .. + +# Test building OCI driver in standalone mode +mkdir build_oci +cd build_oci +cmake -S "${GDAL_SOURCE_DIR:=..}/ogr/ogrsf_frmts/oci" "-DOracle_ROOT=$PWD/../instantclient_19_23" -DCMAKE_PREFIX_PATH=/tmp/install-gdal +cmake --build . "-j$(nproc)" +test -f ogr_OCI.so +cd .. + +# Test building GeoRaster driver in standalone mode +mkdir build_georaster +cd build_georaster +cmake -S "${GDAL_SOURCE_DIR:=..}/frmts/georaster" -DCMAKE_PREFIX_PATH=/tmp/install-gdal "-DOracle_ROOT=$PWD/../instantclient_19_23" +cmake --build . "-j$(nproc)" +test -f gdal_GEOR.so +cd .. + +# Test building Parquet driver in standalone mode +mkdir build_parquet +cd build_parquet +cmake -S "${GDAL_SOURCE_DIR:=..}/ogr/ogrsf_frmts/parquet" -DCMAKE_PREFIX_PATH=/tmp/install-gdal +cmake --build . "-j$(nproc)" +test -f ogr_Parquet.so +cd .. + +# Test building Arrow driver in standalone mode +mkdir build_arrow +cd build_arrow +cmake -S "${GDAL_SOURCE_DIR:=..}/ogr/ogrsf_frmts/arrow" -DCMAKE_PREFIX_PATH=/tmp/install-gdal +cmake --build . "-j$(nproc)" +test -f ogr_Arrow.so +cd .. + +# Test building OpenJPEG driver in standalone mode +mkdir build_openjpeg +cd build_openjpeg +cmake -S "${GDAL_SOURCE_DIR:=..}/frmts/openjpeg" -DCMAKE_PREFIX_PATH=/tmp/install-gdal +cmake --build . "-j$(nproc)" +test -f gdal_JP2OpenJPEG.so +cd .. + +# Test building TileDB driver in standalone mode +mkdir build_tiledb +cd build_tiledb +cmake -S "${GDAL_SOURCE_DIR:=..}/frmts/tiledb" -DCMAKE_PREFIX_PATH=/tmp/install-gdal +cmake --build . "-j$(nproc)" +test -f gdal_TileDB.so +cd .. + +# Test building ECW driver in standalone mode +mkdir build_ecw +cd build_ecw +cmake -S "${GDAL_SOURCE_DIR:=..}/frmts/ecw" -DCMAKE_PREFIX_PATH=/tmp/install-gdal -DECW_ROOT=/opt/libecwj2-3.3 +cmake --build . "-j$(nproc)" +test -f gdal_ECW_JP2ECW.so +cd .. diff --git a/.github/workflows/ubuntu_22.04/Dockerfile.ci b/.github/workflows/ubuntu_22.04/Dockerfile.ci index 394f7448c20c..d6db8850de46 100644 --- a/.github/workflows/ubuntu_22.04/Dockerfile.ci +++ b/.github/workflows/ubuntu_22.04/Dockerfile.ci @@ -58,7 +58,7 @@ RUN apt-get update && \ locales \ mysql-client-core-8.0 \ netcdf-bin \ - openjdk-8-jdk \ + openjdk-8-jdk-headless \ poppler-utils \ postgis \ postgresql-client \ @@ -105,6 +105,21 @@ RUN mkdir mongocxx \ && cd ../.. \ && rm -rf mongocxx +# Build libOpenDRIVE +ARG OPENDRIVE_VERSION=0.6.0-gdal +RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \ + wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \ + && tar xzf ${OPENDRIVE_VERSION}.tar.gz \ + && rm -f ${OPENDRIVE_VERSION}.tar.gz \ + && cd libOpenDRIVE-${OPENDRIVE_VERSION} \ + && cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/ \ + && make -j$(nproc) \ + && make install \ + && cd .. \ + && rm -rf libOpenDRIVE-${OPENDRIVE_VERSION} \ + ); fi + # ESRI File Geodatabase API RUN curl -L -O https://github.com/Esri/file-geodatabase-api/raw/master/FileGDB_API_1.5/FileGDB_API_1_5_64gcc51.tar.gz \ && tar xzf FileGDB_API_1_5_64gcc51.tar.gz \ diff --git a/.github/workflows/ubuntu_24.04/Dockerfile.ci b/.github/workflows/ubuntu_24.04/Dockerfile.ci index ca7d79c92bb1..6839a077a1b1 100644 --- a/.github/workflows/ubuntu_24.04/Dockerfile.ci +++ b/.github/workflows/ubuntu_24.04/Dockerfile.ci @@ -59,7 +59,7 @@ RUN apt-get update && \ locales \ mysql-client-core-8.0 \ netcdf-bin \ - openjdk-8-jdk \ + openjdk-8-jdk-headless \ poppler-utils \ postgis \ postgresql-client \ @@ -106,6 +106,21 @@ RUN mkdir mongocxx \ && cd ../.. \ && rm -rf mongocxx +# Build libOpenDRIVE +ARG OPENDRIVE_VERSION=0.6.0-gdal +RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \ + wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \ + && tar xzf ${OPENDRIVE_VERSION}.tar.gz \ + && rm -f ${OPENDRIVE_VERSION}.tar.gz \ + && cd libOpenDRIVE-${OPENDRIVE_VERSION} \ + && cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/ \ + && make -j$(nproc) \ + && make install \ + && cd .. \ + && rm -rf libOpenDRIVE-${OPENDRIVE_VERSION} \ + ); fi + # ESRI File Geodatabase API RUN curl -L -O https://github.com/Esri/file-geodatabase-api/raw/master/FileGDB_API_1.5/FileGDB_API_1_5_64gcc51.tar.gz \ && tar xzf FileGDB_API_1_5_64gcc51.tar.gz \ @@ -129,3 +144,6 @@ 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 python3 -m pip install -U --break-system-packages -r /tmp/requirements.txt +# cfchecker requires udunits2 +RUN apt-get install -y --allow-unauthenticated libudunits2-0 libudunits2-data +RUN python3 -m pip install --break-system-packages cfchecker diff --git a/.github/workflows/ubuntu_24.04/test.sh b/.github/workflows/ubuntu_24.04/test.sh index 9af1dd53f7b7..5ce09486593d 100755 --- a/.github/workflows/ubuntu_24.04/test.sh +++ b/.github/workflows/ubuntu_24.04/test.sh @@ -7,6 +7,9 @@ set -e LD_LIBRARY_PATH="/opt/instantclient_19_9:/opt/instantclient_19_9/lib:${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH +# Test development launcher script +gdal_edit --version + export PYTEST="python3 -m pytest -vv -p no:sugar --color=no" # Run C++ tests diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index b80dd1cdad58..475510c9fedf 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -56,7 +56,7 @@ jobs: git config --global core.autocrlf false - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Set environment shell: pwsh diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index df38d94bc0bd..7ea6c49bfc82 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: autotest/ogr/data/ ) - repo: https://github.com/pycqa/flake8 - rev: 3.9.2 + rev: 7.0.0 hooks: - id: flake8 exclude: > @@ -57,5 +57,7 @@ repos: ogr/ogrsf_frmts/geojson/libjson/| ogr/ogrsf_frmts/flatgeobuf/flatbuffers/| ogr/ogrsf_frmts/pmtiles/pmtiles/| - ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load + ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load| + ogr/swq_parser.cpp| + ogr/swq_parser.hpp ) diff --git a/.travis.yml b/.travis.yml index 546aaf9e8546..930210c396ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,24 +26,24 @@ matrix: - BUILD_NAME=s390x - DETAILS="" - - os: linux - arch: arm64-graviton2 - virt: lxd - group: edge - compiler: gcc - language: cpp - sudo: false - dist: jammy - cache: - apt: true - directories: - - $HOME/.ccache - apt: - packages: - - ccache - env: - - BUILD_NAME=graviton2 - - DETAILS= + #- os: linux + # arch: arm64-graviton2 + # virt: lxd + # group: edge + # compiler: gcc + # language: cpp + # sudo: false + # dist: jammy + # cache: + # apt: true + # directories: + # - $HOME/.ccache + # apt: + # packages: + # - ccache + # env: + # - BUILD_NAME=graviton2 + # - DETAILS= before_install: - if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(.rst)$'; then travis_terminate 0; fi diff --git a/CMakeLists.txt b/CMakeLists.txt index f6f81c1c929d..367cda089dca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ # CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. -cmake_minimum_required(VERSION 3.16...3.28) +include(cmake/helpers/GdalCMakeMinimumRequired.cmake) +cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX}) project(gdal LANGUAGES C CXX) include(CTest) @@ -35,24 +36,8 @@ define_property( PROPERTY PLUGIN_OUTPUT_DIR BRIEF_DOCS "Plugin modules build directories" FULL_DOCS "Plugin modules build directories") -# -# check compiler and set preferences. -if (NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) -endif() - -if (NOT CMAKE_C_STANDARD) - set(CMAKE_C_STANDARD 99) - set(CMAKE_C_STANDARD_REQUIRED ON) -endif() -# -if (MSVC) - add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) - add_definitions(-DNOMINMAX) -endif () -# +include(GdalCAndCXXStandards) include(CheckCompilerMachineOption) include(CheckCompilerSIMDFeature) include(Ccache) diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE index 9a743f4402f0..afb1e184452f 100644 --- a/HOWTO-RELEASE +++ b/HOWTO-RELEASE @@ -60,6 +60,8 @@ Process : - commit new version to NEWS.md file. + - for bugfixes releases, forward port additions of NEWS.md to master + 6) If this is a feature release (e.g 3.1), prepare a branch. git checkout master diff --git a/MIGRATION_GUIDE.TXT b/MIGRATION_GUIDE.TXT index 0031236db8b6..f1155642d493 100644 --- a/MIGRATION_GUIDE.TXT +++ b/MIGRATION_GUIDE.TXT @@ -1,3 +1,23 @@ +MIGRATION GUIDE FROM GDAL 3.9 to GDAL 3.10 +------------------------------------------ + +- User code using VSIFEofL() to potentially to end read loops should also test + the return code of the new VSIFError() function. Some virtual file systems + that used to report errors through VSIFEofL() now do through VSIFError(). + +- Out-of-tree implementations of VSIVirtualHandle(): + 2 new required virtual methods must be implemented: int Error(), and + void ClearErr() following POSIX semantics of ferror() and clearerr(). + This is to distinguish Read() that returns less bytes than requested because + of an error (Error() != 0) or because of end-of-file (Eof() != 0) + + The VSIFilesystemPluginCallbacksStruct structure is extended with 2 + corresponding optional (but recommended to be implemented to reliably detect + reading errors) callbacks "error" and "clear_err". + +- Python bindings: Band.GetStatistics() and Band.ComputeStatistics() now + return a None value in case of error (when exceptions are not enabled) + MIGRATION GUIDE FROM GDAL 3.8 to GDAL 3.9 ----------------------------------------- diff --git a/NEWS-1.x.md b/NEWS-1.x.md new file mode 100644 index 000000000000..f551f6b1fc81 --- /dev/null +++ b/NEWS-1.x.md @@ -0,0 +1,6564 @@ +## GDAL/OGR 1.11.0 - General Changes + +Build(Unix): + * add Unix configure support for SOSI + * remove pointers to old ver of ingres library files + * add --with-libjson-c configure option to build against external libjson-c (>= 0.11) (#4676) + * compilation fixes for iOS (#5197, #5198) + * update to autoconf 2.69 + * add pkg-config gdal.pc (#3470) + * configure for FileGDB: add explicit linking to libfgdbunixrtl (requires FileGDB SDK >= 1.2) (#5215); also try .dylib extension (#5221) + * fix so that Java installs are found on the MAC to enable the MDB driver (#5267) + * fix compilation with recent MySQL versions (5.6 for example) (#5284) + * support --with-jp2mrsid with standalone Kakadu with MRSID v8 or later + * Fix parallel build in Python bindings (#5346) + * PCIDSK: don't link against libjpeg if configured --without-jpeg + * Update configure script to pick up ECW JP2 SDK 5.1 (#5390) + * add a 'make install' target for the Java bindings (#5424) + * add Vagrant configuration + +Build(Windows): + * add option to generate VC project for x64 on makegdal_gen.bat + * nmake.opt: add WITH_PDB=1 option to optionally generate .pdb file on Release builds (#5420) + * add support for building the OGR SOSI driver as a plugin (#3638) + * add support for building the HDF4 driver as plugin (#5294) + * add support for MrSID v9 + * Remove makegdalXX.bat generated files + +## GDAL 1.11.0 - Overview of Changes + +Port: + * vsisubfile: fix Eof() behavior to be POSIX compliant, so that the shapefile reader can read the last feature when using /vsitar (#5093) + * vsicache: fix for 32bit binaries when file size is over 2GB (#5170) + * vsicache: add optional nChunkSize and nCacheSize parameters to VSICreateCachedFile() + * vsicurl: add CPL_VSIL_CURL_USE_HEAD config option to disable use of CURL HEAD for other services like mapbox (likely lame python http implementations) + * vsitar: avoid infinite loop in case of invalid .tar structure + * vsizip: fix path separator in CPLFormFilename + * vsizip: allow additional extensions listed in CPL_VSIL_ZIP_ALLOWED_EXTENSIONS config option. + * vsizip: improve UTF-8 support of filenames inside ZIP file (#5361) + * vsizip: fix ZIP64 support + * vsigzip: reset EOF flag when doing a Seek() to be POSIX compliant + * curl: add .netrc support + * Windows CPLGetSymbol(): avoid dialog boxes to pop up when a DLL or one of its dependencies does not exist (#5211) + * Add CPLOPrintf() and CPLOvPrintf() functions for easy CPLString formatting + * CPLBase64DecodeInPlace() : fix to be robust to malformed base64 strings + * CPLQuadTree: add CPLQuadTreeInsertWithBounds() where the pfnGetBounds is not needed. + * CPLQuadTree: fix potential infinite recursion when inserting several points with identical coordinates in the mode with limited bucket size + * Protect concurrent calls to setlocale() by a mutex (#5366) + +Core: + * RFC 45: GDAL datasets and raster bands as virtual memory mapping + * GDALRasterBand::GetHistogram(): ignore nodata values (#4750, #5289) + * allow auto loading of drivers to be disabled via config option + * PAM .aux.xml and VRT: serialize Z component of a GCP as 'Z' attribute, + for consistency, instead of GCPZ that could not be read back previously. + In reading code, try reading 'Z' and if not found try 'GCPZ' (#5326) + * JPEG2000: Add GDALGeorefPamDataset and GDALJP2AbstractDataset classes and use + them in JP2KAK, JP2ECW, JP2OpenJPEG, JPEG2000 and MrSID drivers so that PAM + georeferencing consistently overrides internal georeferencing + * GDALDataset::IRasterIO(): don't use BlockBasedRasterIO() when INTERLEAVE=PIXEL if the request band count is just 1 + * CopyWholeRaster(): make default GDAL_SWATH_SIZE to 1/4 of GDAL_CACHEMAX instead of hard-coded value of 10 MB + * don't report empty RAT on GDALGetDefaultRAT() (#5232) + * modify GDALGCPsToGeotransform() to do the regression in normalized coordinates to make the math more stable. + * expose new GDALComposeGeoTransforms() function. + * GDALDefaultOverviews::HaveMaskFile(): avoid fetching .ovr file + * JPEG2000: Fix reading georeferencing from some JPEG2000 files with duplicated GeoTIFF JP2Box (#5249) + * Cleanup raster block mutex (#5296) + * Driver registration: move JPEG2000 (Jasper based) after MrSID JPEG2000 support + +Algorithms: + * warper: fix regression with lanczos resampling when yradius > xradius (#5058) + * warper: Make GDALCreateGenImgProjTransformer2() and GDALCreateGenImgProjTransformer3() fail when the creation of the reprojection transformer fails + * warper: Fix warping when input pixel size is too close to 0 (#5190) + * warper: revise formula of cubic resampling kernel, and a few optimizations (#5209) + * warper: added DST_METHOD and support for GCP and TPS dest + * warper: add support for DST_METHOD=RPC + * warper: fix mode and near resampling corner computation (#5311) + * warper: GDALGenImgProjTransform(): don't set panSuccess[i] to 1 in the middle of the function, if an intermediate transform before has set the flag to 0 + * warper: fix cutline blending (#5343) + * warper: Average/mode kernels: make them less sensitive to numerical precision issues (#5350) + * warper: Average/mode kernels: avoid 'holes' when the source coordinates are in a reversed order from the target coordinates (#5433) + * warper: provide prototypes and work around strict compiler requirements on some opencl platforms (#5400) + * RPC: fix for computation of adfGTFromLL (#5395) + * TPS: optimization for GCC x86_64 that make computation about twice faster with huge number of GCPs + * TPS: when using Armadillo to solve the coefficients, use solve(A,B) instead of inv(A)xB to faster resolution + * TPS: compute direct and inverse transformations in parallel when warping option NUM_THREADS or GDAL_NUM_THREADS config. options are set to > 1 + * Geoloc: fix wrong bilinear interpolation in GDALGeoLocTransform() (#5305) + * Geoloc: fail transformation of coordinates that is located on a nodata place of the geoloc array + * rasterize: preliminary support for MERGE_ALG=ADD for heatmaps + * gdal_grid: Add AVX optimized version of GDALGridInverseDistanceToAPower2NoSmoothingNoSearch + * fill_nodata: GDALFillNodata(): Fix use of uninitialized memory and integer overflows (#4010, #5203) + * rpc: Fix out-of-bounds read in RPC dem cubic interpolation + +Utilities: + * gdalinfo: add -listmdd and -mdd all options (#5275) + * gdal_translate: add a -exponent option to be used with -scale + * gdal_translate: fix output file naming scheme in gdal_translate -sds (#5119) + * gdal_translate: fix logic in detection non-gray color table level (#5245) + * gdal_translate: add a -norat option + * gdal_translate: don't add 0.1 when -scale is used with a dstmin equal to dstmax (useful to generate a raster with uniform color, i.e. scaleRatio = 0) + * gdal_translate: use floor() to compute image coordinates from world coordinates when specifying -projwin (useful when extracting from left or top of upper-left corner, which generate negative image coordinates) (#5367) + * gdaltindex: remove annoying warning 'Warning 1: Field location of width 255 truncated to 254' (#5121) + * gdaltindex: add -src_srs_name and -src_srs_format to go with MapServer RFC100; add also a -f and -lyr_name options to be able to create a non-shapefile tileindex + * gdalwarp: Fix segfault where metadata values were not being nullchecked properly during conflict resolution (#5069) + * gdalwarp: honor -s_srs when using cutline (#5081) + * gdalwarp: copy nodata values from source to dest if -dstnodata is not given ; add option to not set dest nodata with -dstnodata None (#5087) + * gdalwarp: do not return a non-zero exit status for warnings + * gdalwarp: prevent from copying statistics metadata (#5319) + * gdal_rasterize: set the progress bar to 100% even when there's nothing to do + * gdal_grid: add support for different types of geometries (#5341) + * gdal_grid: add -z_increase and -z_multiply options + * gdaldem: check that value of -z, -s, -az and -alt is numeric + * gdalbuildvrt: validate values of -srcnodata and -vrtnodata arguments + * gdal2tiles.py: Corrected OpenLayers code to reflect fix to geodetic resolution factor + * gdal2tiles.py: add --tmscompatible flag so as to produce 2 tiles at zoom level 0 in geodetic profile + * rgb2pct.py: Use python tempfile logic to avoid permissions issues with cwd (#5079) + * gdal_edit.py: add a -ro option for drivers refusing to use the dataset in update-mode. + * gdal_calc.py: add --allBands options (#5388) + * Add vsipreload.cpp that can be compiled as a shared library that can be LD_PRELOAD'ed as an overload of libc to enable VSI Virtual FILE API to be used with binaries using regular libc for I/O + * Add the wcs_virtds_params.py sample utility to be able to set the MapServer WCS virtual dataset parameters from a tileindex with rasters of mixed SRS (linked to MapServer RFC100) + * gdalcompare.py: move to scripts + * gdalcompare.py: ensure image dimensions match + * gdal_ls.py: Fix issue with UTF-8 characters + +Multi driver changes: + * JPEG2000 drivers: take into account PixelIsPoint in GeoJP2 boxes, and expose AREA_OR_POINT=Point (#5437) + * JP2KAK, JP2ECW, JP2OpenJPEG, JPEG2000 CreateCopy(): take into account AREA_OR_POINT=Point if present to write GeoJP2 box (#5437) + +AAIGRID: + * revert DECIMAL_PRECISION and add SIGNIFICANT_DIGITS to CreateCopy() (#3732) + +AIGRID: + * Turn off errors that can be triggered if the info has no VAT table related with this coverage (#3031) + +BAG driver: + * Recognise falseNorthing=10000000 as UTM South (#5152) + +DIMAP driver: + * fix memleak in error-code path + +DTED driver: + * Speed optimization to be more friendly with CPU cache in GDAL_DTED_SINGLE_BLOCK=YES mode + +ECW driver: + * fix crash in GDALDeregister_ECW() with ECW SDK 5 called from GDALDestroy() (#5214) + * fix issue with ECW_CLEVER optimization when nPixelSpace != sizeof eBufDataType (#5262) + +Envisat driver: + * implement more reliable way of extracting GCPs from Meris tie-points (#5423) + * add DEM corrections of TP-ADS products when present (#5423) + * workaround dateline discontinuity in GCPs so they can be used with GDAL warping transformers (#5423) + +ERS driver: + * fix wrong interpretation of RegistrationCellX/RegistrationCellY (#2612, #3056, #5075) + +GeoRaster driver: + * fix RPC support (#4038) + * fix read error when reading from pyramids (#5076) + * make regular table and secure file a default for RDT (#5127) + * fix error when reading NBIT pyramid levels (#5199) + * show the VAT as RAT (#5200) + * fix reading and writing of statistics metadata (#5237) + * add generate pyramid create options (#5288) + * fix incorrect geotransform interpretation when there is no SRS (#5323) + +GRASS driver: + * fix compilation issues for GRASS 7 + +GRIB driver: + * display temperature unit as deg Celsius in metadata (#3606) + +GTiff driver: + * when compiling against internal libtiff, in read-only mode, optimization to + avoid fetching the whole Strip/TileCounts and Strip/TileOffsets arrays + * add validation of source overview characteristics with COPY_SRC_OVERVIEWS (#5059) + * convert invalid TIFFTAG_RESOLUTIONUNIT=0 to 1(Unknown) (#5069) + * fix potential issues in gt_citation.cpp / CheckUTM() + * upgrade internal libtiff to latest CVS + * implement reading and writing of ICC profiles (#5246) + * make SetColorInterpretation() round-trip with GetColorInterpretation(); + read color interpretation from PAM if it exists (overrides internal tiff color interpretation); + set TIFFTAG_PHOTOMETRIC=PHOTOMETRIC_RGB if calling SetColorInterpretation() with R,G,B and no explicit PHOTOMETRIC creation option defined + * gt_wkt_srs.cpp: fix compilation with external libgeotiff. The file is dependent of quite a few CPL stuff, don't try to pretend otherwise + * implement GetVirtualMemAuto() for some formulations of TIFF files (RFC 45) + * fix reading a single-strip TIFF file where the single strip is bigger than 2GB (32bit builds only) (#5403) + * look for .tab file before .wld/.tfw + +GTX driver: + * Add nodata support (#4660) + +HDF4 driver: + * Skip "SceneLineNumber" table if present in the list of geolocation fields of + ASTER L1A dataset. + +HDF5 driver: + * add support for ODIM H5 georeferencing method (#5032) + * set SRS GEOGCS in all cases (reverts r25801 and closes #4160) + * support HDF5 NATIVE_SCHAR type, subdatsets without PAM (#5088) + * release all opened handles so the file is closed at dataset closing (#5103) + * better deal with dimensions of CSK-L1A HDF5 subdatasets (#4227) + * avoid segmentation fault when H5Sget_simple_extent_ndims() returns negative value (#5291) + +HFA driver: + * add minimally tested support for u2 and u4 data in basedata + * use direct binning for thematic layers and real instead of integer for values (#5066) + * add a HFA_COMPRESS_OVR config option to select whether to create compressed overviews (#4866) + * fix rewriting of statistics in existing HFA file where base data value is 8-bit (#5175) + * implement re-writing existing histogram in HFA file, after raster editing (#5176) + * avoid segfaults when creating a Imagine dataset with an invalid WKT (#5258) + * expose color columns in RAT as Integer with values in range [0-255] instead of Real with values [0-1] (#5362) + * report histogram column as GFU_PixelCount instead of GFU_Generic (#5359) + * ensure histogram column written as float for HFA when using RAT API (#5382) + +Idrisi driver: + * Improve coordinate system handling and min/max statistics (#4980) + +IRIS driver: + * add height information on bands; rename dataset metadata item CAPPI_HEIGHT --> CAPPI_BOTTOM_HEIGHT (#5104) + * IRIS: add support for two bytes data (#5431) + +JP2ECW driver: + * fix problem with JP2 write with SDK v5 + * fix issue with ECW_CLEVER optimization when nPixelSpace != sizeof eBufDataType (#5262) + * avoid writing dummy GeoJP2 box when source dataset has no georeferencing (#5306) + +JP2KAK driver: + * preliminary support for Kakadu V7.x + * fix creation of unsigned int16 with reversible compression (#4050) + * on Windows, use VSI cache for I/O by default, instead Kakadu own I/O layer + * remove extension from 12bit to 16bit (#5328) + +JP2OpenJPEG driver: + * avoid 'Empty SOT marker detected: Psot=12.' warning to be repeated several times + * add support for encoding GCPs in a GeoJP2 box (#5279) + * avoid writing dummy GeoJP2 box when source dataset has no georeferencing (#5306) + +JPEG driver: + * add autodetection of bitmasks that are msb ordered (#5102) + * avoid memory leak when GDALOpen'ing() a JPEG through a http:// URL, and make it possible to access its overviews + * return YCbCrK raw data for YCbCrK JPEG in GDAL_JPEG_TO_RGB = NO mode (instead of CMYK as before) (#5097) + * implement reading and writing of ICC profiles (#5246) + * internal libjpeg: apply patch for CVE-2013-6629 + * allow fallback to PAM to read GCPs + * give priority to PAM GeoTransform if it exists and other source of geotransform (.wld, .tab) also exists (#5352) + +KMLSuperOverlay driver: + * recognize an alternate structure for raster KMZ file made of a single doc.kml + and tiles whose name pattern is kml_image_L{level}_{j}_{i}.{png|jpg} + * fix horrible speed performance in Open() (#5094) + * fix crash at dataset closing and inability to read some big PNG tiles (#5154) + * fix to generate files validating against OGC KML 2.2 schema + * put Style into conformity with ATC 7 + * remove Region in root KML (ATC 41) + * add NAME and DESCRIPTION creation options; read them back as metadata + * add ALTITUDE and ALTITUDEMODE creation options + * directly write into .kmz file (instead of in temporary location) + * correctly write directories entry in .kmz file + * add progress callback + +L1B driver: + * report correct values for GCP (#2403) + * report more GCPS than before + * implement geolocation array + * add fetching of record metadata in .csv file + * add subdatasets with solar zenith angles, cloud coverage + * recognize NOAA-9/14 datasets whose dataset name in TBM header is encoded in EBCDIC and not in ASCII (#2848) + * support opening a few NOAA <= 9 datasets that have no dataset name in the TBM header + +LCP driver: + * better handling of projections (#3255) + * add CreateCopy() (#5172) + +MBTiles driver: + * add write support + * avoid failure when there's no tile at the center of the maximum zoom level (#5278) + * add capability to open /vsicurl/https:// signed AWS S3 URLs + +MEM driver: + * Create(): use calloc() instead of malloc()+memset() for faster creation of huge in-memory datasets + +NetCDF driver: + * fix to read netcdf-4 files with UBYTE data (#5053) + * fix reading large netcdf-4 files with chunking and DEFLATE compression + * fix netcdf chunking when creating file with > 2 dims ; add CHUNKING creation option (#5082 ) + * fix duplicate nodata metadata when using CreateCopy() (#5084) + * fix copying large metadata in netcdf driver (#5113) + * fix netcdf geotransform detection (#5114) + * fix netcdf driver irregular grids management (#5118 and #4513) + * only call nc_close on a valid netcdf id when closing dataset + * try and identify .grd (and .nc3) files in netcdf-4 format (#5291), so they are identified before the hdf5 driver + +NITF driver: + * fix to support reading horizontal and/or vertical mono-block uncompressed images, even when the number of columns is <= 8192 (#3263) + * update NITF Series list with new entries from MIL-STD-2411_1_CHG-3.pdf (#5353) + * allow JP2KAK to be used as the JPEG2000 compression engine in the CreateCopy() case (#5386) + +PDF driver: + * Avoid reporting a Poppler error as a GDAL error on some newer USGS GeoPDF files (#5201) + * PDF writing: automatically adjust DPI in case the page dimension exceeds the 14400 maximum value (in user units) allowed by Acrobat (#5412) + +PDS driver: + * Parse correctly MISSING_CONSTANT = 16#FF7FFFFB# as a IEEE754 single precision float expressed in hexadecimal; add support for ENCODING_TYPE = ZIP (data file compressed in a ZIP); recognize IMAGE_MAP_PROJECTION as an object included in UNCOMPRESSED_FILE object (#3939) + +PNG driver: + * Implement reading and writing of ICC profiles (#5246) + +PostgisRaster driver: + * Speed-up dataset opening (#5046). + * Multi-tile multi-band caching added. + * Smarter use of the information advertized in raster_columns view. + * Avoid full table scan in situations without PKID/GIST indices. + * Use of quadtree. + +Rasdaman driver: + * caching of tiles for datasets with more than one band (#5298) + * connections are now kept for a whole session (#5298) + * fixing connection-string regex (#5298) + * fixing possible memory leaks (#5298) + +Rasterlite driver: + * fix resolution check typo in rasterlite driver + +Raw drivers: + * implement GetVirtualMemAuto() (RFC 45) + * IRasterIO(): add special behavior to avoid going to block based IO when the dataset has INTERLEAVE=PIXEL and is eligible to direct I/O access pattern + * allow direct I/O access even if a small proportion of scanlines are loaded (improve QGIS use case where the overview display will load sparse scanlines, which would prevent direct I/O at full resolution afterwards) + * fix optimized RasterIO() when doing sub-sampling with non standard buffer pixel offset (#5438) + +RMF driver: + * fix decompression of 24-bit RMF DEM (#5268) + +RPFTOC driver: + * fix potential crash on some datasets when selecting the color palette (#5345) + +SAGA driver: + * add read/write support for .prj files (#5316) + +SRP driver: + * read TRANSH01.THF file to establish subdatasets (#5297) + +VRT driver: + * Implement non-linear scaling with a power function (addition of Exponent, SrcMin, SrcMax, DstMin, DstMax sub-elements in ) + * Preserve 64bit integer image offsets (#5086) + * Make sure that VRTSourcedRasterBand::AddMaskBandSource() takes into account specified window (#5120) + * Make GDALAutoCreateWarpedVRT() return NULL when GDALSuggestedWarpOutput() fails + * VRTDataset::IRasterIO(): use source DatasetRasterIO even if band count is 1 + * VRTWarped: avoid setting up relative paths for things that aren't file-like + * make relativeToVRT=1 work with NITF_IM:, NETCDF:, HDF5:, RASTERLITE: + +WCS driver: + * ensure C locale is enforced before parsing floating point values + +WMS driver: + * accept 'WMS:http://server/?SRS=EPSG:XXXX' syntax to select the preferred SRS in which to fetch layers + * CPLHTTPFetchMulti(): avoid doing a timeout-only select when there are no file descriptor to wait on (can happen when doing a file:// URL) + * allow cache location to be specified with GDAL_DEFAULT_WMS_CACHE_PATH configuration option if not provided in the XML (#4540) + * Update to be able to understand slight changes in formatting of JSon output of ArcGIS mapserver protocol + +XYZ driver: + * accept datasets that have missing values at beginning and/or end of lines, such as MNT250_L93_FRANCE.XYZ + * fix detection when there are only integral values with comma field separator + * reopen with 'rb' flags for Windows happyness + +## OGR 1.11.0 - Overview of Changes + +Core: + * GEOS support: require GEOS >= 3.1.0 and use the _r API of GEOS to avoid issues with the global GEOS error handlers + * exportToWkb(): ISO WKB generation with wkbVariant option (#5330) + * geocoding: when getting several answers from server for a query, report geometries on second, third, etc.. feature, and not only first one (#5057) + * allow auto loading of drivers to be disabled via config option + * remove obsolete OGRGeometryFactory::getGEOSGeometryFactory() + * OGRGeometryFactory::organizePolygons() in DEFAULT method: fix a case with 2 outer rings that are touching by the first point of the smallest one + * OGRGeometryFactory::organizePolygons(): optimization in ONLY_CCW case + * OGRGeometryFactory::organizePolygons(): Add an experimental mode : CCW_INNER_JUST_AFTER_CW_OUTER + * OGRLineString::segmentize() : do not set 0 as z for interpolated points, but the z from the previous point + * OGRLineString::setNumPoints(): add an optional argument to avoid zeroing the arrays + * Add OGRLineString::setZ() + * Add OGRLineString::Project() and OGRLineString::getSubline() + * OGRPolygon: add stealExteriorRing() and stealInteriorRing(int iRing) + * OGRLinearRing::isClockwise(): optimizations and make it work in a degenerated case when a vertex is used several times in the vertex list (#5342) + * OGRLinearRing::isPointOnRingBoundary() : optimizations and take into account bTestEnvelope + * Add OGR_G_SetPointCount and OGR_G_SetPoints functions to API C (#5357) + * OGREnvelope3D::Contains(): fix incorrect test + * Layer algebra: fix handling of method field mapping to output fields when output fields are precreated (#5089) + * Layer algebra: when an error condition is skipped, call CPLErrorReset() (#5269) + * OGRLayer::GetFeature(): make sure that the behavior is not influenced by + attribute or spatial filters in the generic implementation; + upgrade OGDI, PG, MySQL, MSSQLSpatial, OCI, SDE, PGeo, ODBC, WALK, IDB, SQLite and Ingres driver (#5309) + * introduce OGRLayer::FindFieldIndex() / OGR_L_FindFieldIndex() to lookup potentially laundered field names (RFC 42) + * OGR SQL: upgrade to support RFC 41 (multiple geometry fields) + * OGR SQL: more stricter checks + * OGR SQL: make parsing error report a useful hint where the syntax error occurred + * OGR SQL: fix thread-safety of swq_op_registrar::GetOperator() (#5196) + * OGR SQL: support not explicitly specifying AS keyword for aliasing a column spec + * OGR SQL: don't call CONCAT(a_column ...) or SUBSTR(a_column ...) as a_column + * OGR SQL: validate that arguments of MAX, MIN, AVG, SUM, COUNT are columns and not any expression since this is not supported + * OGR SQL: make AVG field definition a OFTReal + * OGR SQL: implement MIN(), MAX() and AVG() on a date (#5333) + * OGR SQL: fix SELECT * on a layer with a field that has a dot character (#5379) + * SQL SQLITE dialect: Make it available to all OGR drivers that have a specialized ExecuteSQL() implementation + +OGRSpatialReference: + * Upgrade to EPSG 8.2 database + * identify LCC_2SP instead of LCC_1SP if lat_0==lat_1 and lat_2 is present (#5191) + * add a variety of linear units to proj4 parsing (#5370) + * Fix crash in CleanupESRIDatumMappingTable() if it is called twice (#5090) + * fix order of AXIS and UNIT nodes in a VERT_CS node (#5105) + * ecw_cs.wkt: add missing TOWGS84[-168,-60,320,0,0,0,0] to NTF datum (#5145) + * fix OGRSpatialReference::importFromProj4() to work with non-C locale (#5147) + * morph central_latitude to latitude_of_origin in morphFromESRI() (#3191) + * OGRProj4CT: avoid using proj when the 2 projections are actually identical (#5188) + * add sanity checks in OGR_SRSNode::importFromWkt() (#5193) + * VERT_CS: when importing from proj.4 put AXIS node after UNIT; COMPD_CS: when importing from EPSG:x+y, set a more meaningful name for the COMPD_CS node + * OGRSpatialReference::Validate() : in addition to hand-validation, use WKT grammar from OGC 01-009 CT + * preserve authority when importing +init=auth_name:auth_code (e.g. +init=IGNF:LAMB93) + +Utilities: + * ogrlineref: new utility to deal with linear geometries. + * ogrinfo: upgrade to support RFC 41 (multiple geometry fields) + * ogr2ogr: upgrade to support RFC 41 (multiple geometry fields) + * ogr2ogr: bump default value for -gt from 200 to 20000 (#5391) + * ogr2ogr: add -addfields option to add new fields found in a source layer into an existing layer ; add -unsetFieldWidth option to unset field with and precision; add -dim layer_dim option to force the coordinate dimension of geometries to match the one of the layer geometry type + * ogr2ogr: Check that -t_srs is also specified when -s_srs is specified + * ogr2ogr: add an explicit error message to report FID of feature that couldn't be inserted when CreateFeature() fails + * ogr2ogr: make relaxed lookup optional and add a switch -relaxedFieldNameMatch to allow it (RFC 42) + * ogr2ogr: make sure that the progress bar reaches 100% when converting OSM + * ogr2ogr: make sure that target dataset is properly closed when a CreateFeature() fails (so that truncated shapefiles have their header file properly updated) + * ogr_dispatch.py: Sample Python script to dispatch features into layers according to the value of some fields or the geometry type + * ogrinfo.py: sync with ogrinfo (RFC 41) + * ogr2ogr.py: port -nlt PROMOTE_TO_MULTI option from ogr2ogr.cpp (#5139) + +CSV driver: + * avoid erroneously reset of file content when opening in update mode a file without header (#5161) + * upgrade to support RFC 41 in read/write (multiple geometry fields) + * allow backslash doublequote to load (#5318) + +DGN driver: + * DGN writing: added polygon inner ring (holes) writing and MSLink writing (#5381) + +DXF driver: + * fix writing of 25D linestring where z is not constant (#5210) + * fix writing of POLYLINE objects (#5217, #5210) + * accept reading files starting with a TABLES section (#5307) + * support reading 3DFACE and SOLID (#5380) entities + * fix an error when processing clockwise circle arc (#5182) + * avoid building an invalid polygon when edges cannot be reassembled: turn it into a multilinestring + * use CPLAtof() instead of atof() to avoid issues with locales + * fix linear approximation of circular and elliptic arc in HATCH boundaries (#5182) + +DWG driver: + * add support for reading AcDb3dPolyline (#5260) + * fix linear approximation of circular and elliptic arc in HATCH boundaries (#5182) + +FileGDB driver: + * implement IgnoreFields API to speed-up a bit the conversion of a sub-set of fields when there's a huge amount of them (e.g. Tiger database). + * when writing of an attribute, use size in bytes (#5192) + * implement ref counting of the FileGDB SDK API' Geodatabase* object to avoid issues on Linux 64bit with interleaved opening and closing of databases (#4270) + * honour update flag to determine which operations are allowed or not + * add a driver global mutex to protect all calls as the FileGDB API SDK is not thread-safe at all + * add a COLUMN_TYPES layer creation option to override default column types; support reading/writing XML column types + * optimize GetFeatureCount() and GetExtent() when there are filters set + * set the default width for string fields to 65536. + The width can be configured with the FGDB_STRING_WIDTH configuration option + * fix creation and writing of Binary fields; enable reading + * add a CREATE_MULTIPATCH creation option + +FME driver: + * fix Linux compilation + +GeoJSON driver: + * recognize alternate formats such as the ones of https://code.google.com/p/election-maps/ + * add read support for TopoJSON + * upgrade internal libjson-c to json-c 0.11 (#4676) + * report integer values that are int64 as strings + * add 3d support to esri geojson reader (#5219) + * be less strict on looking for esri field type tag (#5219) + * fix sometimes incorrect result (significant digit lost...) when using -lco COORDINATE_PRECISION=0 + * fix handling of huge coordinates when writing (#5377) + +GeoRSS driver: + * advertise OLCCreateField capability + +GFT driver: + * switch http to https for the oauth2 link to improve security + +GML driver: + * add support for multiple geometry columns (RFC 41) + * add support for reading Finnish National Land Survey Topographic data (MTK GML) + * add support for support Finnish NLS cadastral data and Inspire cadastral data. + * add support for Czech RUIAN VFR format + * add data/gml_registry.xml file to associate feature types with schemas. + * extend .gfs syntax to be able to fetch OGR fields from XML attributes. + * extend .gfs syntax to support multiple geometry columns, and define a geometry property name + * autodiscover all XML attributes as OGR fields when creating .gfs file if GML_ATTRIBUTES_TO_OGR_FIELDS is set to YES (#5418) + * allow the in .gfs to have several components that give the full XML path + * fix writing of .xsd file to avoid fid/gml_id being written as regular fields (#5142) + * fix writing of global srsName attribute on the global boundedBy.Envelope when all layers have same SRS (#5143) + * support for writing .gml/.xsd with fields of type StringList, RealList, IntegerList and support for parsing such .xsd files + * when writing .xsd for a datasource that has fields of type StringList, RealList or IntegerList, advertise SF-1 profile in the .XSD schema + * recognize xsd:boolean in XSD parsing and map it to String (#5384) + * add STRIP_PREFIX and WRITE_FEATURE_BOUNDED_BY dataset creation option to help minimizing the size of GML files + * don't write top in GML files with multiple layers of different SRS + * fix segfault when reading a GML file with huge coordinates (#5148) + * avoid opening our own .xsd files as valid datasources (#5149) + * make driver thread-safe with Xerces + * open successfully GML datasources with 0 layers (#249, #5205) + * fix tweaking of DescribeFeatureType requests + * support reading WFS 2.0 GetFeature documents with wfs:FeatureCollection as a wfs:member of the top wfs:FeatureCollection + * fix for crash on certain xlink:href with GML_SKIP_RESOLVE_ELEMS=NONE (#5417) + * GML geometry: fix duplicated points in GML_FACE_HOLE_NEGATIVE=YES mode (TopoSurface) (#5230) + * GML geometry: accept CompositeSurface as a child of surfaceMembers (#5369) + * GML geometry: join multilinestrings to linestrings in rings + * GML geometry: correctly deal with MultiSurface of Surface of PolygonPatch where a PolygonPatch has only interior ring(s) and no exterior ring (#5421) + * GML geometry: accept formulations of 'MULTIPOINT EMPTY, MULTILINESTRING EMPTY, MULTIPOLYGON EMPTY and GEOMETRYCOLLECTION EMPTY that are valid GML 3 (and accepted by PostGIS) + * GML geometry: make use of cs, ts and decimal attributes of (deprecated) gml:coordinates element + * GML geometry: accept XML header and comments + +GPX driver: + * advertise OLCCreateField capability + +ILI driver: + * add support for multiple geometry columns (RFC 41) + * use IlisMeta model reader/writer instead of IOM + * add layers for surface and area geometries + +KML driver: + * output KML that validates the ogckml22.xsd schema by placing elements under the level (#5068) + * in writing mode, avoid defining an extending schema for the name and description fields (related to #5208) + +LIBKML driver: + * various checks, fixes and improvements related to OGC KML 2.2 Abstract Test Suite + * add support for reading as a LINESTRING (#5095) + * add support for writing and reading + * add support for writing atom:author, atom:link, phonenumber, Region, + ScreenOverlay, 3D model, StyleMap + * add support for reading and generating Camera object + * add layer creation options to generate a LookAt element at layer level + * if UPDATE_TARGETHREF dataset creation option is defined, a NetworkLinkControl/Update document will be created + * add dataset creation options to generate a NetworkLinkControl element + * add dataset and layer creation options LISTSTYLE_ICON_HREF and LISTSTYLE_TYPE + * add support for writing a NetworkLink + * add support for creating PhotoOverlay objects + * add support for creating BalloonStyle elements + * offer LIBKML_USE_SIMPLEFIELD configuration option can be set to NO to use Data element instead of SimpleField + * add layer creation option FOLDER to optionally write layers as Folder instead of Document + * add dataset and layer creation options NAME, VISIBILITY, OPEN, SNIPPET and DESCRIPTION + * workaround bugs in pretty serializers + * when writing a .kmz file, put layers .kml docs into a layers/ subdirectory + * fix mem leaks, and use after free in kml2FeatureDef() (#5240) + * create document with default namespace set to http://www.opengis.net/kml/2.2 + * when writing, consider empty strings as unset (useful when converting from CSV) + * don't write empty + + + country_bounds + World country boundaries + EPSG:4326 + + -180.000000 + 180.000000 + -90.000000 + 83.627419 + + + + text/xml + + + + + + cities + World cities + EPSG:4326 + + -178.166667 + 179.383333 + -54.800000 + 78.933333 + + + + text/xml + + + + + + + diff --git a/autotest/gdrivers/data/wmts/clip_WGS84BoundingBox_with_tilematrix.xml b/autotest/gdrivers/data/wmts/clip_WGS84BoundingBox_with_tilematrix.xml new file mode 100644 index 000000000000..bdf9dc4d910d --- /dev/null +++ b/autotest/gdrivers/data/wmts/clip_WGS84BoundingBox_with_tilematrix.xml @@ -0,0 +1,152 @@ + + + + + title + + 0.10594674240568917 45.2375427360256 + 20.448891294525627 56.84787345153812 + + de_basemapde_web_raster_grau + + image/png + + DE_EPSG_25832_ADV + + + + + DE_EPSG_25832_ADV + EPSG:25832 + + 00 + 17471320.750897426 + -46133.17 6301219.54 + 256 + 256 + 1 + 1 + + + 01 + 8735660.375448713 + -46133.17 6301219.54 + 256 + 256 + 2 + 2 + + + 02 + 4367830.187724357 + -46133.17 6301219.54 + 256 + 256 + 4 + 4 + + + 03 + 2183915.0938621783 + -46133.17 6301219.54 + 256 + 256 + 8 + 8 + + + 04 + 1091957.5469310891 + -46133.17 6301219.54 + 256 + 256 + 16 + 16 + + + 05 + 545978.7734655463 + -46133.17 6301219.54 + 256 + 256 + 32 + 32 + + + 06 + 272989.38673277246 + -46133.17 6301219.54 + 256 + 256 + 64 + 64 + + + 07 + 136494.69336638605 + -46133.17 6301219.54 + 256 + 256 + 128 + 128 + + + 08 + 68247.3466831932 + -46133.17 6301219.54 + 256 + 256 + 256 + 256 + + + 09 + 34123.673341596535 + -46133.17 6301219.54 + 256 + 256 + 512 + 512 + + + 10 + 17061.836670798286 + -46133.17 6301219.54 + 256 + 256 + 1024 + 1024 + + + 11 + 8530.918335399143 + -46133.17 6301219.54 + 256 + 256 + 2048 + 2048 + + + 12 + 4265.4591676995715 + -46133.17 6301219.54 + 256 + 256 + 4096 + 4096 + + + 13 + 2132.729583849782 + -46133.17 6301219.54 + 256 + 256 + 8192 + 8192 + + + + diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py index 008057c1c11e..d0407441e7fd 100755 --- a/autotest/gdrivers/ecw.py +++ b/autotest/gdrivers/ecw.py @@ -1479,7 +1479,7 @@ def test_ecw_41(tmp_path): # Check that no statistics is already included in the file assert ds.GetRasterBand(1).GetMinimum() is None assert ds.GetRasterBand(1).GetMaximum() is None - assert ds.GetRasterBand(1).GetStatistics(1, 0) == [0.0, 0.0, 0.0, -1.0] + assert ds.GetRasterBand(1).GetStatistics(1, 0) is None assert ds.GetRasterBand(1).GetDefaultHistogram(force=0) is None # Now compute the stats diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py index 8165192b8f55..6fb4b75b747f 100755 --- a/autotest/gdrivers/ehdr.py +++ b/autotest/gdrivers/ehdr.py @@ -379,20 +379,20 @@ def test_ehdr_approx_stats_flag(): approx_ok = 1 force = 1 stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force) - assert stats == [0.0, 0.0, 0.0, 0.0], "did not get expected stats" + assert stats == [0.0, 0.0, 0.0, 0.0] md = ds.GetRasterBand(1).GetMetadata() assert "STATISTICS_APPROXIMATE" in md, "did not get expected metadata" approx_ok = 0 force = 0 stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force) - assert stats == [0.0, 0.0, 0.0, -1.0], "did not get expected stats" + assert stats is None ds = gdal.Open(tmpfile, gdal.GA_Update) approx_ok = 0 force = 0 stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force) - assert stats == [0.0, 0.0, 0.0, -1.0], "did not get expected stats" + assert stats is None approx_ok = 0 force = 1 diff --git a/autotest/gdrivers/esric.py b/autotest/gdrivers/esric.py index b27f9186f407..e5c8ddf5066c 100755 --- a/autotest/gdrivers/esric.py +++ b/autotest/gdrivers/esric.py @@ -112,16 +112,18 @@ def test_esric_4(esric_ds): @pytest.fixture -def tpkx_ds(): - return gdal.Open("data/esric/Usa.tpkx") +def tpkx_ds_extent_source_tiling_scheme(): + return gdal.OpenEx( + "data/esric/Usa.tpkx", open_options=["EXTENT_SOURCE=TILING_SCHEME"] + ) ############################################################################### # Check that the configuration was read as expected -def test_tpkx_2(tpkx_ds): - ds = tpkx_ds +def test_tpkx_2(tpkx_ds_extent_source_tiling_scheme): + ds = tpkx_ds_extent_source_tiling_scheme b1 = ds.GetRasterBand(1) assert ( @@ -145,8 +147,8 @@ def test_tpkx_2(tpkx_ds): # Check that the raster returns right checksums -def test_tpkx_3(tpkx_ds): - ds = tpkx_ds +def test_tpkx_3(tpkx_ds_extent_source_tiling_scheme): + ds = tpkx_ds_extent_source_tiling_scheme # There are no tiles at this level, driver will return black b1 = ds.GetRasterBand(1) b2 = ds.GetRasterBand(2) @@ -167,8 +169,8 @@ def test_tpkx_3(tpkx_ds): @pytest.mark.require_driver("PNG") -def test_tpkx_4(tpkx_ds): - ds = tpkx_ds +def test_tpkx_4(tpkx_ds_extent_source_tiling_scheme): + ds = tpkx_ds_extent_source_tiling_scheme # Read from level 1, band 2, where we have data # Overviews are counted from zero, in reverse order from levels @@ -181,3 +183,67 @@ def test_tpkx_4(tpkx_ds): cs = l1b2.Checksum() expectedcs = 53503 assert cs == expectedcs, "wrong data checksum" + + +############################################################################### +# Open a tpkx dataset where we need to ingest more bytes + + +def test_tpkx_ingest_more_bytes(tmp_vsimem): + filename = str(tmp_vsimem / "root.json") + f = gdal.VSIFOpenL("/vsizip/{data/esric/Usa.tpkx}/root.json", "rb") + assert f + data = gdal.VSIFReadL(1, 10000, f) + gdal.VSIFCloseL(f) + # Append spaces at the beginning of the root.json file to test we try + # to ingest more bytes + data = b"{" + (b" " * 900) + data[1:] + gdal.FileFromMemBuffer(filename, data) + gdal.Open(filename) + + +############################################################################### +# Open a tpkx dataset where minLOD > 0 + + +def test_tpkx_minLOD_not_zero(): + ds = gdal.Open("data/esric/Usa_lod5.tpkx") + gt = ds.GetGeoTransform() + # Corresponds to lon=-100 lat=40 + X = -11131949 + Y = 4865942 + x = (X - gt[0]) / gt[1] + y = (Y - gt[3]) / gt[5] + assert ds.GetRasterBand(1).ReadRaster(x, y, 1, 1) != b"\0" + + +############################################################################### +# Test opening a tpkx file with fullExtent / initialExtent + + +@pytest.mark.parametrize("extent_source", [None, "INITIAL_EXTENT", "FULL_EXTENT"]) +def test_tpkx_default_full_extent(extent_source): + open_options = {} + if extent_source: + open_options["EXTENT_SOURCE"] = extent_source + ds = gdal.OpenEx("data/esric/Usa.tpkx", open_options=open_options) + assert ds.RasterXSize == 2532 + assert ds.RasterYSize == 1921 + assert ds.RasterCount == 4 + assert ds.GetSpatialRef().GetAuthorityCode(None) == "3857" + assert ds.GetGeoTransform() == pytest.approx( + ( + -19841829.550377003848553, + 4891.969810249979673, + 0, + 11545048.752193037420511, + 0, + -4891.969810249979673, + ) + ) + assert ds.GetDriver().GetDescription() == "ESRIC" + assert ds.GetFileList() == ["data/esric/Usa.tpkx"] + assert ds.GetRasterBand(1).DataType == gdal.GDT_Byte + assert ds.GetRasterBand(1).GetBlockSize() == [256, 256] + assert ds.GetRasterBand(1).Checksum() == 62015 + assert ds.GetRasterBand(1).GetOverviewCount() == 3 diff --git a/autotest/gdrivers/fast.py b/autotest/gdrivers/fast.py index 19b163946e77..7cc2dbe50969 100755 --- a/autotest/gdrivers/fast.py +++ b/autotest/gdrivers/fast.py @@ -32,7 +32,7 @@ import gdaltest import pytest -from osgeo import gdal +from osgeo import gdal, osr pytestmark = pytest.mark.require_driver("FAST") @@ -185,20 +185,9 @@ def test_fast_7(): gt = (676565.09, 5, 0, 5348341.5, 0, -5) # Expected definition of the projection - proj = """PROJCS["UTM Zone 32, Northern Hemisphere", - GEOGCS["Unknown datum based upon the WGS 84 ellipsoid", - DATUM["Not specified (based on WGS 84 spheroid)", - SPHEROID["WGS 84",6378137,298.257223563, - AUTHORITY["EPSG","7030"]]], - PRIMEM["Greenwich",0], - UNIT["degree",0.0174532925199433]], - PROJECTION["Transverse_Mercator"], - PARAMETER["latitude_of_origin",0], - PARAMETER["central_meridian",9], - PARAMETER["scale_factor",0.9996], - PARAMETER["false_easting",500000], - PARAMETER["false_northing",0], - UNIT["Meter",1]]""" + srs = osr.SpatialReference() + srs.ImportFromEPSG(32632) + proj = srs.ExportToWkt() tst.testOpen(check_gt=gt, check_prj=proj) diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py index 1a9bb542a4cf..304d0e0b9262 100755 --- a/autotest/gdrivers/gpkg.py +++ b/autotest/gdrivers/gpkg.py @@ -4206,6 +4206,18 @@ def test_gpkg_sql_gdal_get_layer_pixel_value(): ds.ReleaseResultSet(sql_lyr) assert f[0] == 156 + with ds.ExecuteSQL( + "select gdal_get_layer_pixel_value('byte', 1, 'georef', 440780 + 30, 3751080 - 30)" + ) as sql_lyr: + f = sql_lyr.GetNextFeature() + assert f[0] == 156 + + with ds.ExecuteSQL( + "select gdal_get_layer_pixel_value('byte', 1, 'georef', 440780 + 30, 3751080 - 30, 'cubicspline')" + ) as sql_lyr: + f = sql_lyr.GetNextFeature() + assert f[0] == pytest.approx(150.1388888888889) + sql_lyr = ds.ExecuteSQL( "select gdal_get_layer_pixel_value('float32', 1, 'pixel', 0, 1)" ) @@ -4298,3 +4310,112 @@ def test_gpkg_gti_gpkg_ext(tmp_vsimem): ds = gdal.Open(filename) assert ds.GetDriver().ShortName == "GPKG" assert ds.GetRasterBand(1).Checksum() == 4672 + + +############################################################################### +# Test rename a raster table with SQL + + +@pytest.mark.parametrize("data_type", [gdal.GDT_Byte, gdal.GDT_UInt16]) +def test_gpkg_rename_raster_table(data_type, tmp_vsimem): + + test_layer_path = str(tmp_vsimem / "test_gpkg_rename_raster_table.gpkg") + + if data_type == gdal.GDT_UInt16: + src_ds = gdal.Open("data/int16.tif") + else: + src_ds = gdal.Open("data/small_world.tif") + + ds = gdaltest.gpkg_dr.CreateCopy( + test_layer_path, + src_ds, + options=[ + "TILE_FORMAT=PNG", + "RASTER_TABLE=weird'layer\"name", + ], + ) + ds = None + src_ds = None + + ds = gdal.OpenEx(test_layer_path, gdal.OF_RASTER | gdal.OF_UPDATE) + # Get layer name + layer_name = ds.GetMetadataItem("IDENTIFIER") + assert layer_name == "weird'layer\"name" + + checksum = ds.GetRasterBand(1).Checksum() + + ds.ExecuteSQL('ALTER TABLE "weird\'layer""name" RENAME TO bar') + ds.ExecuteSQL("VACUUM") + ds = None + + ds = gdal.Open(test_layer_path) + layer_name = ds.GetMetadataItem("IDENTIFIER") + assert layer_name == "bar" + assert ds.GetRasterBand(1).Checksum() == checksum + ds = None + + # Check that there is no more any reference to the layer + f = gdal.VSIFOpenL(test_layer_path, "rb") + content = gdal.VSIFReadL(1, 1000000, f).decode("latin1") + gdal.VSIFCloseL(f) + + assert "weird" not in content + + +############################################################################### +# Test GetDataCoverageStatus() is used on the source dataset + + +def test_gpkg_copy_using_get_data_coverage_status(tmp_vsimem): + + tmp_gtiff = str(tmp_vsimem / "tmp.tif") + src_ds = gdal.GetDriverByName("GTiff").Create( + tmp_gtiff, + 1024, + 768, + 1, + options=["TILED=YES", "BLOCKXSIZE=256", "BLOCKYSIZE=256", "SPARSE_OK=YES"], + ) + src_ds.SetGeoTransform([2, 0.001, 0, 49, 0, -0.001]) + src_ds.WriteRaster(512, 256, 256, 256, b"\x01" * (256 * 256)) + + tmp_gpkg = str(tmp_vsimem / "tmp.gpkg") + gdaltest.gpkg_dr.CreateCopy(tmp_gpkg, src_ds) + + ds = gdal.Open(tmp_gpkg) + assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum() + + with ds.ExecuteSQL("SELECT COUNT(*) FROM tmp") as sql_lyr: + assert sql_lyr.GetFeatureCount() == 1 + + (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 1024, 768) + assert ( + flags + == (gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY) + and pct == 100.0 / 12 + ) + + (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 1024, 256) + assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0 + + (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 512, 1024, 256) + assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0 + + (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 512, 768) + assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0 + + (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(768, 0, 256, 768) + assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0 + + (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(512, 256, 256, 256) + assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0 + + (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(512 + 1, 256 + 2, 3, 4) + assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0 + + (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(512 - 1, 256 - 1, 2, 2) + assert ( + flags + == (gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY) + and pct == 25.0 + ) diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py index 3675b3205ecc..fc20331cad99 100755 --- a/autotest/gdrivers/grib.py +++ b/autotest/gdrivers/grib.py @@ -2252,6 +2252,48 @@ def test_grib_grib2_sidecar(): ) == ds_idx.GetRasterBand(i).GetMetadataItem(key) +def test_grib_grib2_sidecar_vsisubfile(): + + ds = gdal.Open("/vsisubfile/0_5359,data/grib/gfs.t06z.pgrb2.10p0.f010.grib2") + assert ds.RasterCount == 1 + assert ds.GetRasterBand(1).GetDescription() == "REFD:1 hybrid level:10 hour fcst" + + ds_ref = gdal.OpenEx( + "/vsisubfile/0_5359,data/grib/gfs.t06z.pgrb2.10p0.f010.grib2", + open_options=["USE_IDX=NO"], + ) + assert ds_ref.RasterCount == 1 + assert ds_ref.GetRasterBand(1).GetDescription() == '1[-] HYBL="Hybrid level"' + assert ds.GetRasterBand(1).Checksum() == ds_ref.GetRasterBand(1).Checksum() + + size = 16077 - 5359 + ds = gdal.Open(f"/vsisubfile/5359_{size},data/grib/gfs.t06z.pgrb2.10p0.f010.grib2") + assert ds.RasterCount == 2 + assert ds.GetRasterBand(1).GetDescription() == "REFD:2 hybrid level:10 hour fcst" + assert ds.GetRasterBand(2).GetDescription() == "REFC:entire atmosphere:10 hour fcst" + + ds_ref = gdal.OpenEx( + f"/vsisubfile/5359_{size},data/grib/gfs.t06z.pgrb2.10p0.f010.grib2", + open_options=["USE_IDX=NO"], + ) + assert ds_ref.RasterCount == 2 + assert ds_ref.GetRasterBand(1).GetDescription() == '2[-] HYBL="Hybrid level"' + assert ds.GetRasterBand(1).Checksum() == ds_ref.GetRasterBand(1).Checksum() + assert ds.GetRasterBand(2).Checksum() == ds_ref.GetRasterBand(2).Checksum() + + ds = gdal.Open("/vsisubfile/16077_-1,data/grib/gfs.t06z.pgrb2.10p0.f010.grib2") + assert ds.RasterCount == 3 + assert ds.GetRasterBand(1).GetDescription() == "VIS:surface:10 hour fcst" + assert ( + ds.GetRasterBand(2).GetDescription() + == "UGRD:planetary boundary layer:10 hour fcst" + ) + assert ( + ds.GetRasterBand(3).GetDescription() + == "VGRD:planetary boundary layer:10 hour fcst" + ) + + # Test reading a (broken) mix of GRIBv2/GRIBv1 bands diff --git a/autotest/gdrivers/gti.py b/autotest/gdrivers/gti.py index c8b674b65c83..75719ac07d26 100755 --- a/autotest/gdrivers/gti.py +++ b/autotest/gdrivers/gti.py @@ -34,6 +34,7 @@ import struct import gdaltest +import ogrtest import pytest from osgeo import gdal, ogr @@ -48,14 +49,19 @@ def create_basic_tileindex( sort_field_name=None, sort_field_type=None, sort_values=None, + lyr_name="index", + add_to_existing=False, ): if isinstance(src_ds, list): src_ds_list = src_ds else: src_ds_list = [src_ds] - index_ds = ogr.GetDriverByName("GPKG").CreateDataSource(index_filename) + if add_to_existing: + index_ds = ogr.Open(index_filename, update=1) + else: + index_ds = ogr.GetDriverByName("GPKG").CreateDataSource(index_filename) lyr = index_ds.CreateLayer( - "index", srs=(src_ds_list[0].GetSpatialRef() if src_ds_list else None) + lyr_name, srs=(src_ds_list[0].GetSpatialRef() if src_ds_list else None) ) lyr.CreateField(ogr.FieldDefn(location_field_name)) if sort_values: @@ -115,13 +121,17 @@ def check_basic( def test_gti_no_metadata(tmp_vsimem): - index_filename = str(tmp_vsimem / "index.gti.gpkg") + index_filename = str(tmp_vsimem / "index.gpkg") src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif")) index_ds, _ = create_basic_tileindex(index_filename, src_ds) del index_ds - vrt_ds = gdal.Open(index_filename) + with pytest.raises(Exception): + gdal.Open(index_filename) + + vrt_ds = gdal.OpenEx(index_filename, allowed_drivers=["GTI"]) + assert vrt_ds.GetDriver().GetDescription() == "GTI" check_basic(vrt_ds, src_ds) assert ( vrt_ds.GetMetadataItem("SCANNED_ONE_FEATURE_AT_OPENING", "__DEBUG__") == "YES" @@ -1053,6 +1063,20 @@ def test_gti_rgb_left_right(tmp_vsimem): == "/vsimem/test_gti_rgb_left_right/left.tif" ) + if ogrtest.have_geos(): + (flags, pct) = vrt_ds.GetRasterBand(1).GetDataCoverageStatus( + 0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize + ) + assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0 + + (flags, pct) = vrt_ds.GetRasterBand(1).GetDataCoverageStatus(1, 2, 3, 4) + assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0 + + (flags, pct) = vrt_ds.GetRasterBand(1).GetDataCoverageStatus( + vrt_ds.RasterXSize // 2 - 1, 2, 2, 4 + ) + assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0 + def test_gti_overlapping_sources(tmp_vsimem): @@ -1078,6 +1102,12 @@ def test_gti_overlapping_sources(tmp_vsimem): vrt_ds = gdal.Open(index_filename) assert vrt_ds.GetRasterBand(1).Checksum() == 2 + if ogrtest.have_geos(): + (flags, pct) = vrt_ds.GetRasterBand(1).GetDataCoverageStatus( + 0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize + ) + assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0 + # Test unsupported sort_field_type = OFTBinary index_filename = str(tmp_vsimem / "index.gti.gpkg") sort_values = [None, None] @@ -1315,6 +1345,41 @@ def test_gti_overlapping_sources(tmp_vsimem): assert vrt_ds.GetRasterBand(1).Checksum() == 2, sort_values +def test_gti_gap_between_sources(tmp_vsimem): + + filename1 = str(tmp_vsimem / "one.tif") + ds = gdal.GetDriverByName("GTiff").Create(filename1, 1, 1) + ds.SetGeoTransform([2, 1, 0, 49, 0, -1]) + ds.GetRasterBand(1).Fill(1) + del ds + + filename2 = str(tmp_vsimem / "two.tif") + ds = gdal.GetDriverByName("GTiff").Create(filename2, 1, 1) + ds.SetGeoTransform([4, 1, 0, 49, 0, -1]) + ds.GetRasterBand(1).Fill(2) + del ds + + index_filename = str(tmp_vsimem / "index.gti.gpkg") + index_ds, _ = create_basic_tileindex( + index_filename, [gdal.Open(filename1), gdal.Open(filename2)] + ) + del index_ds + + vrt_ds = gdal.Open(index_filename) + assert vrt_ds.GetRasterBand(1).Checksum() == 3 + + if ogrtest.have_geos(): + (flags, pct) = vrt_ds.GetRasterBand(1).GetDataCoverageStatus( + 0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize + ) + assert ( + flags + == gdal.GDAL_DATA_COVERAGE_STATUS_DATA + | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY + and pct == pytest.approx(100.0 * 2 / 3) + ) + + def test_gti_no_source(tmp_vsimem): index_filename = str(tmp_vsimem / "index.gti.gpkg") @@ -1355,6 +1420,12 @@ def test_gti_no_source(tmp_vsimem): is None ) + if ogrtest.have_geos(): + (flags, pct) = vrt_ds.GetRasterBand(1).GetDataCoverageStatus( + 0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize + ) + assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0 + def test_gti_invalid_source(tmp_vsimem): @@ -2009,6 +2080,47 @@ def test_gti_overlapping_sources_mask_band(tmp_vsimem): ) == (255, 254) +def test_gti_consistency_index_geometry_vs_source_extent(tmp_vsimem): + + filename1 = str(tmp_vsimem / "test.tif") + ds = gdal.GetDriverByName("GTiff").Create(filename1, 10, 10) + ds.SetGeoTransform([2, 1, 0, 49, 0, -1]) + ds.GetRasterBand(1).Fill(255) + expected_cs = ds.GetRasterBand(1).Checksum() + del ds + + index_filename = str(tmp_vsimem / "index.gti.gpkg") + index_ds, _ = create_basic_tileindex( + index_filename, + [gdal.Open(filename1)], + ) + del index_ds + + vrt_ds = gdal.Open(index_filename) + with gdal.quiet_errors(): + gdal.ErrorReset() + assert vrt_ds.GetRasterBand(1).Checksum() == expected_cs + assert gdal.GetLastErrorMsg() == "" + + # No intersection + with gdal.Open(filename1, gdal.GA_Update) as ds: + ds.SetGeoTransform([100, 1, 0, 49, 0, -1]) + + vrt_ds = gdal.Open(index_filename) + with gdal.quiet_errors(): + assert vrt_ds.GetRasterBand(1).Checksum() == 0 + assert "does not intersect at all" in gdal.GetLastErrorMsg() + + # Partial intersection + with gdal.Open(filename1, gdal.GA_Update) as ds: + ds.SetGeoTransform([4, 1, 0, 49, 0, -1]) + + vrt_ds = gdal.Open(index_filename) + with gdal.quiet_errors(): + assert vrt_ds.GetRasterBand(1).Checksum() == 958 + assert "does not fully contain" in gdal.GetLastErrorMsg() + + def test_gti_mask_band_explicit(tmp_vsimem): index_filename = str(tmp_vsimem / "index.gti.gpkg") @@ -2065,7 +2177,7 @@ def test_gti_ovr_factor(tmp_vsimem): src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif")) index_ds, lyr = create_basic_tileindex(index_filename, src_ds) lyr.SetMetadataItem("MASK_BAND", "YES") - lyr.SetMetadataItem("OVERVIEW_1_FACTOR", "2") + lyr.SetMetadataItem("OVERVIEW_0_FACTOR", "2") del index_ds vrt_ds = gdal.Open(index_filename) @@ -2102,6 +2214,7 @@ def test_gti_ovr_factor_invalid(tmp_vsimem): src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif")) index_ds, lyr = create_basic_tileindex(index_filename, src_ds) + # Also test GDAL 3.9.0 and 3.9.1 where the idx started at 1 lyr.SetMetadataItem("OVERVIEW_1_FACTOR", "0.5") del index_ds @@ -2116,7 +2229,7 @@ def test_gti_ovr_ds_name(tmp_vsimem): src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif")) index_ds, lyr = create_basic_tileindex(index_filename, src_ds) - lyr.SetMetadataItem("OVERVIEW_1_DATASET", "/i/do/not/exist") + lyr.SetMetadataItem("OVERVIEW_0_DATASET", "/i/do/not/exist") del index_ds vrt_ds = gdal.Open(index_filename) @@ -2130,7 +2243,7 @@ def test_gti_ovr_lyr_name(tmp_vsimem): src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif")) index_ds, lyr = create_basic_tileindex(index_filename, src_ds) - lyr.SetMetadataItem("OVERVIEW_1_LAYER", "non_existing") + lyr.SetMetadataItem("OVERVIEW_0_LAYER", "non_existing") del index_ds vrt_ds = gdal.Open(index_filename) @@ -2138,6 +2251,57 @@ def test_gti_ovr_lyr_name(tmp_vsimem): vrt_ds.GetRasterBand(1).GetOverviewCount() +def test_gti_ovr_of_ovr(tmp_vsimem): + + index_filename = str(tmp_vsimem / "index.gti.gpkg") + + ovr_filename = str(tmp_vsimem / "byte_ovr.tif") + ovr_ds = gdal.Translate(ovr_filename, "data/byte.tif", width=10) + ovr_ds.BuildOverviews("NEAR", [2]) + ovr_ds = None + + src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif")) + index_ds, lyr = create_basic_tileindex(index_filename, src_ds) + lyr.SetMetadataItem("OVERVIEW_0_DATASET", ovr_filename) + del index_ds + + vrt_ds = gdal.Open(index_filename) + ovr_ds = gdal.Open(ovr_filename) + assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 2 + assert ( + vrt_ds.GetRasterBand(1).GetOverview(0).ReadRaster() + == ovr_ds.GetRasterBand(1).ReadRaster() + ) + assert ( + vrt_ds.GetRasterBand(1).GetOverview(1).ReadRaster() + == ovr_ds.GetRasterBand(1).GetOverview(0).ReadRaster() + ) + + +def test_gti_ovr_of_ovr_OVERVIEW_LEVEL_NONE(tmp_vsimem): + + index_filename = str(tmp_vsimem / "index.gti.gpkg") + + ovr_filename = str(tmp_vsimem / "byte_ovr.tif") + ovr_ds = gdal.Translate(ovr_filename, "data/byte.tif", width=10) + ovr_ds.BuildOverviews("NEAR", [2]) + ovr_ds = None + + src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif")) + index_ds, lyr = create_basic_tileindex(index_filename, src_ds) + lyr.SetMetadataItem("OVERVIEW_0_DATASET", ovr_filename) + lyr.SetMetadataItem("OVERVIEW_0_OPEN_OPTIONS", "OVERVIEW_LEVEL=NONE") + del index_ds + + vrt_ds = gdal.Open(index_filename) + ovr_ds = gdal.Open(ovr_filename) + assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 1 + assert ( + vrt_ds.GetRasterBand(1).GetOverview(0).ReadRaster() + == ovr_ds.GetRasterBand(1).ReadRaster() + ) + + def test_gti_external_ovr(tmp_vsimem): index_filename = str(tmp_vsimem / "index.gti.gpkg") @@ -2307,7 +2471,10 @@ def test_gti_xml(tmp_vsimem): index_filename = str(tmp_vsimem / "index.gti.gpkg") - src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif")) + tile_filename = str(tmp_vsimem / "byte.tif") + gdal.Translate(tile_filename, "data/byte.tif") + + src_ds = gdal.Open(tile_filename) index_ds, _ = create_basic_tileindex(index_filename, src_ds) del index_ds @@ -2432,30 +2599,46 @@ def test_gti_xml(tmp_vsimem): assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 10 del vrt_ds + tile_ovr_filename = str(tmp_vsimem / "byte_ovr.tif") + gdal.Translate(tile_ovr_filename, "data/byte.tif", width=10) + + index2_filename = str(tmp_vsimem / "index2.gti.gpkg") + create_basic_tileindex(index2_filename, gdal.Open(tile_ovr_filename)) + xml_content = f""" {index_filename} + index - {index_filename} + {index2_filename} """ vrt_ds = gdal.Open(xml_content) assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 1 - assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 20 + assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 10 del vrt_ds + create_basic_tileindex( + index_filename, + gdal.Open(tile_ovr_filename), + add_to_existing=True, + lyr_name="index_ovr", + ) + xml_content = f""" {index_filename} + index - index + index_ovr """ vrt_ds = gdal.Open(xml_content) assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 1 - assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 20 + assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 10 del vrt_ds xml_content = f""" {index_filename} + index index @@ -2518,6 +2701,7 @@ def test_gti_xml(tmp_vsimem): xml_content = f""" {index_filename} + index """ @@ -2529,6 +2713,7 @@ def test_gti_xml(tmp_vsimem): xml_content = f""" {index_filename} + index i_do_not_exist @@ -2539,6 +2724,7 @@ def test_gti_xml(tmp_vsimem): xml_content = f""" {index_filename} + index i_do_not_exist @@ -2603,3 +2789,161 @@ def test_gti_xml_vrtti_embedded(tmp_vsimem): assert band.GetCategoryNames() == ["cat"] assert band.GetDefaultRAT() is not None del vrt_ds + + +############################################################################### +# Test multi-threaded reading + + +@pytest.mark.parametrize("use_threads", [True, False]) +@pytest.mark.parametrize("num_tiles", [2, 128]) +def test_gti_read_multi_threaded(tmp_vsimem, use_threads, num_tiles): + + width = 2048 + src_ds = gdal.Translate( + "", "../gdrivers/data/small_world.tif", width=width, format="MEM" + ) + assert width % num_tiles == 0 + tile_width = width // num_tiles + tiles_ds = [] + for i in range(num_tiles): + tile_filename = str(tmp_vsimem / ("%d.tif" % i)) + gdal.Translate( + tile_filename, src_ds, srcWin=[i * tile_width, 0, tile_width, 1024] + ) + tiles_ds.append(gdal.Open(tile_filename)) + + index_filename = str(tmp_vsimem / "index.gti.gpkg") + index_ds, _ = create_basic_tileindex(index_filename, tiles_ds) + del index_ds + + vrt_ds = gdal.Open(index_filename) + + pcts = [] + + def cbk(pct, msg, user_data): + if pcts: + assert pct >= pcts[-1] + pcts.append(pct) + return 1 + + with gdal.config_options({} if use_threads else {"GTI_NUM_THREADS": "0"}): + assert vrt_ds.ReadRaster(1, 2, 1030, 1020, callback=cbk) == src_ds.ReadRaster( + 1, 2, 1030, 1020 + ) + assert pcts[-1] == 1.0 + + assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == ( + "1" if gdal.GetNumCPUs() >= 2 and use_threads else "0" + ) + + # Again + pcts = [] + with gdal.config_options({} if use_threads else {"GTI_NUM_THREADS": "0"}): + assert vrt_ds.ReadRaster(1, 2, 1030, 1020, callback=cbk) == src_ds.ReadRaster( + 1, 2, 1030, 1020 + ) + assert pcts[-1] == 1.0 + + assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == ( + "1" if gdal.GetNumCPUs() >= 2 and use_threads else "0" + ) + + +############################################################################### +# Test multi-threaded reading + + +def test_gti_read_multi_threaded_disabled_since_overlapping_sources(tmp_vsimem): + + src_ds = gdal.Translate( + "", "../gdrivers/data/small_world.tif", width=2048, format="MEM" + ) + OVERLAP = 1 + left_filename = str(tmp_vsimem / "left.tif") + gdal.Translate(left_filename, src_ds, srcWin=[0, 0, 1024 + OVERLAP, 1024]) + right_filename = str(tmp_vsimem / "right.tif") + gdal.Translate(right_filename, src_ds, srcWin=[1024, 0, 1024, 1024]) + + index_filename = str(tmp_vsimem / "index.gti.gpkg") + index_ds, _ = create_basic_tileindex( + index_filename, [gdal.Open(left_filename), gdal.Open(right_filename)] + ) + del index_ds + + vrt_ds = gdal.Open(index_filename) + + assert vrt_ds.ReadRaster(1, 2, 1030, 1020) == src_ds.ReadRaster(1, 2, 1030, 1020) + + assert ( + vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == "0" + ) + + +############################################################################### +# Test multi-threaded reading + + +def test_gti_read_multi_threaded_disabled_because_invalid_filename(tmp_vsimem): + + src_ds = gdal.Translate( + "", "../gdrivers/data/small_world.tif", width=2048, format="MEM" + ) + left_filename = str(tmp_vsimem / "left.tif") + gdal.Translate(left_filename, src_ds, srcWin=[0, 0, 1024, 1024]) + right_filename = str(tmp_vsimem / "right.tif") + gdal.Translate(right_filename, src_ds, srcWin=[1024, 0, 1024, 1024]) + + index_filename = str(tmp_vsimem / "index.gti.gpkg") + index_ds, _ = create_basic_tileindex( + index_filename, [gdal.Open(left_filename), gdal.Open(right_filename)] + ) + lyr = index_ds.GetLayer(0) + f = lyr.GetFeature(2) + f["location"] = "/i/do/not/exist" + lyr.SetFeature(f) + del index_ds + + vrt_ds = gdal.Open(index_filename) + + with pytest.raises(Exception, match="/i/do/not/exist"): + vrt_ds.ReadRaster() + + assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == ( + "1" if gdal.GetNumCPUs() >= 2 else "0" + ) + + +############################################################################### +# Test multi-threaded reading + + +def test_gti_read_multi_threaded_disabled_because_truncated_source(tmp_vsimem): + + src_ds = gdal.Translate( + "", "../gdrivers/data/small_world.tif", width=2048, format="MEM" + ) + left_filename = str(tmp_vsimem / "left.tif") + gdal.Translate(left_filename, src_ds, srcWin=[0, 0, 1024, 1024]) + right_filename = str(tmp_vsimem / "right.tif") + gdal.Translate(right_filename, src_ds, srcWin=[1024, 0, 1024, 1024]) + + index_filename = str(tmp_vsimem / "index.gti.gpkg") + index_ds, _ = create_basic_tileindex( + index_filename, [gdal.Open(left_filename), gdal.Open(right_filename)] + ) + del index_ds + + f = gdal.VSIFOpenL(right_filename, "rb+") + assert f + gdal.VSIFTruncateL(f, gdal.VSIStatL(right_filename).size - 10) + gdal.VSIFCloseL(f) + + vrt_ds = gdal.Open(index_filename) + + with pytest.raises(Exception, match="right.tif"): + vrt_ds.ReadRaster() + + assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == ( + "1" if gdal.GetNumCPUs() >= 2 else "0" + ) diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py index 25fe8d22c970..eeb37a422247 100755 --- a/autotest/gdrivers/hdf5.py +++ b/autotest/gdrivers/hdf5.py @@ -1305,6 +1305,8 @@ def test_hdf5_band_specific_attribute(): ds.attrs["fwhm"] = [0.01, 0.02] ds.attrs["fwhm_units"] = "Micrometers" ds.attrs["bad_band_list"] = [0, 1] + ds.attrs["center_wavelengths"] = [300, 400] + ds.attrs["my_coefficients"] = [1, 2] f.close() ds = gdal.Open("data/hdf5/fwhm.h5") @@ -1315,11 +1317,15 @@ def test_hdf5_band_specific_attribute(): "fwhm": "0.01", "fwhm_units": "Micrometers", "bad_band": "0", + "center_wavelength": "300", + "my_coefficient": "1", } assert ds.GetRasterBand(2).GetMetadata_Dict() == { "fwhm": "0.02", "fwhm_units": "Micrometers", "bad_band": "1", + "center_wavelength": "400", + "my_coefficient": "2", } ds = None @@ -1602,3 +1608,28 @@ def test_hdf5_read_netcdf_nodata_scale_offset(): assert band.GetNoDataValue() == pytest.approx(9.96921e36, rel=1e-7) assert band.GetOffset() == 1.5 assert band.GetScale() == 0.01 + + +############################################################################### +# Test force opening a netCDF file with HDF5 driver + + +def test_hdf5_force_opening_netcdf_file(): + + ds = gdal.OpenEx("data/netcdf/trmm-nc4.nc", allowed_drivers=["HDF5"]) + assert ds.GetDriver().GetDescription() == "HDF5Image" + + ds = gdal.OpenEx( + "data/netcdf/byte_hdf5_starting_at_offset_1024.nc", allowed_drivers=["HDF5"] + ) + assert ds.GetDriver().GetDescription() == "HDF5Image" + + +############################################################################### +# Test force opening, but provided file is still not recognized (for good reasons) + + +def test_hdf5_force_opening_no_match(): + + drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["HDF5"]) + assert drv is None diff --git a/autotest/gdrivers/hdf5multidim.py b/autotest/gdrivers/hdf5multidim.py index 6f1f003c326f..31260e9ab766 100755 --- a/autotest/gdrivers/hdf5multidim.py +++ b/autotest/gdrivers/hdf5multidim.py @@ -840,3 +840,67 @@ def test_hdf5_multidim_block_size_structural_info(): var = rg.OpenMDArray("Band1") assert var.GetBlockSize() == [1, 2] assert var.GetStructuralInfo() == {"COMPRESSION": "DEFLATE", "FILTER": "SHUFFLE"} + + +############################################################################### +# Test reading a compound data type made of 2 Float16 values + + +def test_hdf5_multidim_read_cfloat16(): + + ds = gdal.OpenEx("data/hdf5/complex.h5", gdal.OF_MULTIDIM_RASTER) + rg = ds.GetRootGroup() + var = rg.OpenMDArray("f16") + assert var.GetDataType().GetNumericDataType() == gdal.GDT_CFloat32 + assert struct.unpack("f" * (5 * 5 * 2), var.Read()) == ( + 0.0, + 0.0, + 1.0, + 1.0, + 2.0, + 2.0, + 3.0, + 3.0, + 4.0, + 4.0, + 5.0, + 5.0, + 6.0, + 6.0, + 7.0, + 7.0, + 8.0, + 8.0, + 9.0, + 9.0, + 10.0, + 10.0, + 11.0, + 11.0, + 12.0, + 12.0, + 13.0, + 13.0, + 14.0, + 14.0, + 15.0, + 15.0, + 16.0, + 16.0, + 17.0, + 17.0, + 18.0, + 18.0, + 19.0, + 19.0, + 20.0, + 20.0, + 21.0, + 21.0, + 22.0, + 22.0, + 23.0, + 23.0, + 24.0, + 24.0, + ) diff --git a/autotest/gdrivers/isg.py b/autotest/gdrivers/isg.py index 4a22e6bba634..89aae7c3c305 100755 --- a/autotest/gdrivers/isg.py +++ b/autotest/gdrivers/isg.py @@ -123,3 +123,17 @@ def test_isg_header_larger_than_1024bytes(): ds = gdal.Open("data/isg/header_larger_than_1024bytes.isg") expected_gt = [12.99375, 0.0125, 0.0, 47.00416666666666, 0.0, -0.008333333333333333] assert ds.GetGeoTransform() == pytest.approx(expected_gt, rel=1e-8) + + +############################################################################### +# Test if we can read dms angles + + +def test_isg_dms(): + + gdal.ErrorReset() + # Header of https://www.gsi.go.jp/butsuri/data/GSIGEO2024beta.zip + ds = gdal.Open("data/isg/header_dms.isg") + assert gdal.GetLastErrorMsg() == "" + expected_gt = [119.9875, 0.025, 0.0, 50.0083333333, 0.0, -0.01666666666] + assert ds.GetGeoTransform() == pytest.approx(expected_gt, rel=1e-8) diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py index 28fa78db0806..7ec2b3b5736e 100755 --- a/autotest/gdrivers/jpeg.py +++ b/autotest/gdrivers/jpeg.py @@ -1105,7 +1105,7 @@ def test_jpeg_28(): "EXIF_XResolution": "(96)", "EXIF_TransferFunction": "0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0", "EXIF_ExifVersion": "0123", - "EXIF_DateTime": "dt ", + "EXIF_DateTime": "dt", "EXIF_FlashpixVersion": "ABCD", "EXIF_ComponentsConfiguration": "0x1f 0x00 0x00 0x00", "EXIF_Make": "make", @@ -1587,6 +1587,65 @@ def test_jpeg_copy_mdd(): gdal.Unlink(filename) +############################################################################### + + +def test_jpeg_read_DNG_tags(): + + # File generated with: + # gdal_translate autotest/gcore/data/byte.tif DNG_CameraSerialNumber_and_DNG_UniqueCameraModel.jpg + # exiftool "-CameraSerialNumber=SerialNumber" "-UniqueCameraModel=CameraModel" DNG_CameraSerialNumber_and_DNG_UniqueCameraModel.jpg + ds = gdal.Open("data/jpeg/DNG_CameraSerialNumber_and_DNG_UniqueCameraModel.jpg") + assert ds.GetMetadataItem("DNG_CameraSerialNumber") == "SerialNumber" + assert ds.GetMetadataItem("DNG_UniqueCameraModel") == "CameraModel" + + +############################################################################### + + +def test_jpeg_read_DNG_tags_same_value_ax_EXIF(): + """Check that DNG tags are not emitted when they have a corresponding EXIF + tag at the same value.""" + + # File generated with: + # gdal_translate autotest/gcore/data/byte.tif DNG_and_EXIF_same_values.jpg + # exiftool"-exif:SerialNumber=SerialNumber" "-CameraSerialNumber=SerialNumber" "-UniqueCameraModel=CameraModel" "-Model=CameraModel" DNG_and_EXIF_same_values.jpg + ds = gdal.Open("data/jpeg/DNG_and_EXIF_same_values.jpg") + assert ds.GetMetadataItem("DNG_CameraSerialNumber") is None + assert ds.GetMetadataItem("DNG_UniqueCameraModel") is None + assert ds.GetMetadataItem("EXIF_BodySerialNumber") == "SerialNumber" + assert ds.GetMetadataItem("EXIF_Model") == "CameraModel" + + +############################################################################### + + +def test_jpeg_read_pix4d_xmp_crs_vertcs_orthometric(): + + # File generated with: + # gdal_translate autotest/gcore/data/byte.tif pix4d_xmp_crs_vertcs_orthometric.jpg + # exiftool "-xmp<=pix4d_xmp_crs_vertcs_orthometric.xml" pix4d_xmp_crs_vertcs_orthometric.jpg + # where pix4d_xmp_crs_vertcs_orthometric.xml is the XMP content + ds = gdal.Open("data/jpeg/pix4d_xmp_crs_vertcs_orthometric.jpg") + srs = ds.GetSpatialRef() + assert srs.GetAuthorityCode("GEOGCS") == "6318" + assert srs.GetAuthorityCode("VERT_CS") == "6360" + + +############################################################################### + + +def test_jpeg_read_pix4d_xmp_crs_vertcs_ellipsoidal(): + + # File generated with: + # gdal_translate autotest/gcore/data/byte.tif pix4d_xmp_crs_vertcs_ellipsoidal.jpg + # exiftool "-xmp<=pix4d_xmp_crs_vertcs_ellipsoidal.xml" pix4d_xmp_crs_vertcs_ellipsoidal.jpg + # where pix4d_xmp_crs_vertcs_ellipsoidal.xml is the XMP content + ds = gdal.Open("data/jpeg/pix4d_xmp_crs_vertcs_ellipsoidal.jpg") + srs = ds.GetSpatialRef() + assert srs.GetAuthorityCode(None) == "6319" + + ############################################################################### # Cleanup diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py index 24bd8a6738fe..c46f39bff99f 100755 --- a/autotest/gdrivers/mrf.py +++ b/autotest/gdrivers/mrf.py @@ -77,6 +77,10 @@ def module_disable_exceptions(): ("../../gcore/data/uint32.tif", 4672, [4672], ["COMPRESS=LERC"]), ("../../gcore/data/uint32.tif", 4672, [4672], ["COMPRESS=QB3"]), ("../../gcore/data/uint32.tif", 4672, [4672], ["COMPRESS=LERC", "OPTIONS=V1:YES"]), + ("../../gcore/data/int64.tif", 4672, [4672], ["COMPRESS=DEFLATE"]), + ("../../gcore/data/int64.tif", 4672, [4672], ["COMPRESS=ZSTD"]), + ("../../gcore/data/int64.tif", 4672, [4672], ["COMPRESS=TIF"]), + ("../../gcore/data/int64.tif", 4672, [4672], ["COMPRESS=QB3"]), ("float32.tif", 4672, [4672], ["COMPRESS=DEFLATE"]), ("float32.tif", 4672, [4672], ["COMPRESS=ZSTD"]), ("float32.tif", 4672, [4672], ["COMPRESS=TIF"]), @@ -229,6 +233,30 @@ def test_mrf_zen_test(): gdal.Unlink(f) +def test_mrf_in_tar(tmp_path): + import tarfile + + files = tuple("plain." + ext for ext in ("mrf", "idx", "pzp", "mrf.aux.xml")) + gdal.Translate( + tmp_path / "plain.mrf", + "data/byte.tif", + format="MRF", + creationOptions=["COMPRESS=DEFLATE"], + ) + tarname = tmp_path / "plain.mrf.tar" + # the .mrf has to be the first file in the tar, with no path + with tarfile.TarFile(tarname, "w", format=tarfile.GNU_FORMAT) as tar: + for fn in files: + tar.add(tmp_path / fn, arcname=fn) + for fn in files: + gdal.Unlink(tmp_path / fn) + ds = gdal.Open(tarname) + cs = ds.GetRasterBand(1).Checksum() + ds = None + assert cs == 4672 + gdal.Unlink(tarname) + + def test_mrf_overview_nnb_fact_2(): expected_cs = 1087 diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py index 07e6ca616fb4..ac9dd2c9961b 100755 --- a/autotest/gdrivers/netcdf.py +++ b/autotest/gdrivers/netcdf.py @@ -1359,18 +1359,8 @@ def test_netcdf_36(): gt = ds.GetGeoTransform() assert gt is not None, "got no GeoTransform" - gt_expected = ( - -3.498749944898817, - 0.0025000042385525173, - 0.0, - 46.61749818589952, - 0.0, - -0.001666598849826389, - ) - assert gt == gt_expected, "got GeoTransform %s, expected %s" % ( - str(gt), - str(gt_expected), - ) + gt_expected = (-3.49875, 0.0025, 0.0, 46.61749818589952, 0.0, -0.001666598849826389) + assert gt == pytest.approx(gt_expected, rel=1e-8) ############################################################################### @@ -2189,10 +2179,12 @@ def test_netcdf_52(): f = None ds = None - import netcdf_cf - - if netcdf_cf.cfchecks_available(): - netcdf_cf.netcdf_cf_check_file("tmp/netcdf_52.nc", "auto") + # Latest release version of cfchecker (4.1.0) doesn't support variable-length + # strings as valid variable types, but next one will: + # https://github.com/cedadev/cf-checker/blob/c0486c606f7cf4d38d3b484b427726ce1bde73ee/src/cfchecker/cfchecks.py#L745 + # import netcdf_cf + # if netcdf_cf.cfchecks_available(): + # netcdf_cf.netcdf_cf_check_file("tmp/netcdf_52.nc", "auto") gdal.Unlink("tmp/netcdf_52.nc") gdal.Unlink("tmp/netcdf_52.csv") @@ -2660,10 +2652,13 @@ def test_netcdf_62(): assert "char station(profile" in hdr assert "char foo(record" in hdr - import netcdf_cf - - if netcdf_cf.cfchecks_available(): - netcdf_cf.netcdf_cf_check_file("tmp/netcdf_62.nc", "auto") + # Disable cfchecker validation as it fails with a '(5): co-ordinate variable not monotonic' + # error which I believe is incorrect given the particular nature of + # a https://cfconventions.org/Data/cf-conventions/cf-conventions-1.11/cf-conventions.html#_indexed_ragged_array_representation_of_profiles + # where coordinate variables can clearly not be sorted in any order. + # import netcdf_cf + # if netcdf_cf.cfchecks_available(): + # netcdf_cf.netcdf_cf_check_file("tmp/netcdf_62.nc", "auto") gdal.Unlink("tmp/netcdf_62.nc") @@ -6529,3 +6524,26 @@ def test_netcdf_create_metadata_with_equal_sign(tmp_path): ds = gdal.Open(fname) assert ds.GetRasterBand(1).GetMetadataItem("long_name") == value + + +############################################################################### +# Test force opening a HDF55 file with netCDF driver + + +def test_netcdf_force_opening_hdf5_file(tmp_vsimem): + + ds = gdal.OpenEx("data/hdf5/groups.h5", allowed_drivers=["netCDF"]) + assert ds.GetDriver().GetDescription() == "netCDF" + + ds = gdal.Open(ds.GetSubDatasets()[0][0]) + assert ds.GetDriver().GetDescription() == "netCDF" + + +############################################################################### +# Test force opening, but provided file is still not recognized (for good reasons) + + +def test_netcdf_force_opening_no_match(): + + drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["netCDF"]) + assert drv is None diff --git a/autotest/gdrivers/netcdf_multidim.py b/autotest/gdrivers/netcdf_multidim.py index 21d2df20d439..f8a993f1dfca 100755 --- a/autotest/gdrivers/netcdf_multidim.py +++ b/autotest/gdrivers/netcdf_multidim.py @@ -33,7 +33,6 @@ import shutil import stat import struct -import sys import time import gdaltest @@ -1115,23 +1114,20 @@ def dims_from_non_netcdf(rg): ) assert att.Read() == "bar" - # There is an issue on 32-bit platforms, likely in libnetcdf or libhdf5 itself, - # with writing more than one string - if sys.maxsize > 0x7FFFFFFF: - att = rg.CreateAttribute( - "att_two_strings", [2], gdal.ExtendedDataType.CreateString() - ) - assert att - with gdal.quiet_errors(): - assert att.Write(["not_enough_elements"]) != gdal.CE_None - assert att.Write([1, 2]) == gdal.CE_None - assert att.Read() == ["1", "2"] - assert att.Write(["foo", "barbaz"]) == gdal.CE_None - assert att.Read() == ["foo", "barbaz"] - att = next( - (x for x in rg.GetAttributes() if x.GetName() == att.GetName()), None - ) - assert att.Read() == ["foo", "barbaz"] + att = rg.CreateAttribute( + "att_two_strings", [2], gdal.ExtendedDataType.CreateString() + ) + assert att + with gdal.quiet_errors(): + assert att.Write(["not_enough_elements"]) != gdal.CE_None + assert att.Write([1, 2]) == gdal.CE_None + assert att.Read() == ["1", "2"] + assert att.Write(["foo", "barbaz"]) == gdal.CE_None + assert att.Read() == ["foo", "barbaz"] + att = next( + (x for x in rg.GetAttributes() if x.GetName() == att.GetName()), None + ) + assert att.Read() == ["foo", "barbaz"] att = rg.CreateAttribute( "att_double", [], gdal.ExtendedDataType.Create(gdal.GDT_Float64) @@ -1254,6 +1250,15 @@ def dims_from_non_netcdf(rg): assert var assert var.Read() == ["", "0123456789"] + var = rg.CreateMDArray( + "my_var_string_array_zero_dim", [], gdal.ExtendedDataType.CreateString() + ) + assert var + assert var.Write(["foo"]) == gdal.CE_None + var = rg.OpenMDArray("my_var_string_array_zero_dim") + assert var + assert var.Read() == ["foo"] + f() def f2(): @@ -3766,6 +3771,88 @@ def test_netcdf_multidim_getresampled_with_geoloc_EMIT_L2A(): ) +def test_netcdf_multidim_getresampled_with_geoloc_EMIT_L2A_with_good_wavelengths(): + + ds = gdal.OpenEx( + "data/netcdf/fake_EMIT_L2A_with_good_wavelengths.nc", gdal.OF_MULTIDIM_RASTER + ) + rg = ds.GetRootGroup() + + ar = rg.OpenMDArray("reflectance") + + # Use glt_x and glt_y arrays, and good_wavelengths variable + resampled_ar = ar.GetResampled( + [None, None, None], gdal.GRIORA_NearestNeighbour, None + ) + assert resampled_ar is not None + + # Read one band that is valid according to good_wavelengths variable + assert struct.unpack( + "f" * (3 * 3), resampled_ar.Read(array_start_idx=[0, 0, 1], count=[3, 3, 1]) + ) == ( + -9999.0, + -9999.0, + -9999.0, + -9999.0, + -9999.0, + -9999.0, + -9999.0, + -9999.0, + -9999.0, + ) + + # Read one band that is invalid according to good_wavelengths variable + assert struct.unpack( + "f" * (3 * 3), resampled_ar.Read(array_start_idx=[0, 0, 0], count=[3, 3, 1]) + ) == ( + -9999.0, + -9999.0, + -9999.0, + -9999.0, + 30.0, + 40.0, + -9999.0, + 10.0, + 20.0, + ) + + # Read all bands + assert struct.unpack("f" * (3 * 3 * 2), resampled_ar.Read()) == ( + -9999.0, + -9999.0, + -9999.0, + -9999.0, + -9999.0, + -9999.0, + -9999.0, + -9999.0, + 30.0, + -9999.0, + 40.0, + -9999.0, + -9999.0, + -9999.0, + 10.0, + -9999.0, + 20.0, + -9999.0, + ) + + # Test *not* using good_wavelengths variable + resampled_ar = ar.GetResampled( + [None, None, None], + gdal.GRIORA_NearestNeighbour, + None, + ["USE_GOOD_WAVELENGTHS=NO"], + ) + assert resampled_ar is not None + + # Read one band that is valid according to good_wavelengths variable + assert struct.unpack( + "f" * (3 * 3), resampled_ar.Read(array_start_idx=[0, 0, 1], count=[3, 3, 1]) + ) == (-9999.0, -9999.0, -9999.0, -9999.0, -30.0, -40.0, -9999.0, -10.0, -20.0) + + def test_netcdf_multidim_getresampled_with_geoloc_EMIT_L2B_MIN(): ds = gdal.OpenEx("data/netcdf/fake_EMIT_L2B_MIN.nc", gdal.OF_MULTIDIM_RASTER) @@ -3901,12 +3988,7 @@ def test(): view = ar.GetView("[0:10,...]") classic_ds = view.AsClassicDataset(1, 0) - assert classic_ds.GetRasterBand(1).GetStatistics(False, False) == [ - 0.0, - 0.0, - 0.0, - -1.0, - ] + assert classic_ds.GetRasterBand(1).GetStatistics(False, False) is None classic_ds.GetRasterBand(1).ComputeStatistics(False) view = ar.GetView("[10:20,...]") @@ -3957,12 +4039,7 @@ def reopen(): ) classic_ds = ar.AsClassicDataset(1, 0) - assert classic_ds.GetRasterBand(1).GetStatistics(False, False) == [ - 0.0, - 0.0, - 0.0, - -1.0, - ] + assert classic_ds.GetRasterBand(1).GetStatistics(False, False) is None rg_subset = rg.SubsetDimensionFromSelection("/x=440750") @@ -4006,3 +4083,27 @@ def test2(): test() test2() + + +############################################################################### + + +def test_netcdf_multidim_chunk_cache_options(): + + ds = gdal.OpenEx("data/netcdf/nc4_vars.nc", gdal.OF_MULTIDIM_RASTER) + rg = ds.GetRootGroup() + + var = rg.OpenMDArray( + "Band1", + [ + "RAW_DATA_CHUNK_CACHE_SIZE=2000000", + "CHUNK_SLOTS=1000", + "PREEMPTION=0.9", + "INCLUDE_CHUNK_CACHE_PARAMETERS_IN_STRUCTURAL_INFO=YES", + ], + ) + assert var.GetStructuralInfo() == { + "RAW_DATA_CHUNK_CACHE_SIZE": "2000000", + "CHUNK_SLOTS": "1000", + "PREEMPTION": "0.900000", + } diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py index a24070cbdc97..e211cd829025 100755 --- a/autotest/gdrivers/nitf.py +++ b/autotest/gdrivers/nitf.py @@ -966,16 +966,17 @@ def test_nitf_28_jp2openjpeg_bis(): # Test CreateCopy() with IC=C8 compression and NPJE profiles with the JP2OpenJPEG driver -def test_nitf_jp2openjpeg_npje_numerically_lossless(): +def test_nitf_jp2openjpeg_npje_numerically_lossless(tmp_vsimem): jp2openjpeg_drv = gdal.GetDriverByName("JP2OpenJPEG") if jp2openjpeg_drv is None: pytest.skip() src_ds = gdal.Open("../gcore/data/uint16.tif") # May throw a warning with openjpeg < 2.5 + out1_filename = str(tmp_vsimem / "tmp.ntf") with gdal.quiet_errors(): gdal.GetDriverByName("NITF").CreateCopy( - "/vsimem/tmp.ntf", + out1_filename, src_ds, strict=False, options=[ @@ -986,19 +987,17 @@ def test_nitf_jp2openjpeg_npje_numerically_lossless(): ], ) - ds = gdal.Open("/vsimem/tmp.ntf") + ds = gdal.Open(out1_filename) + assert ds.GetMetadataItem("NITF_ABPP") == "12" + assert ds.GetRasterBand(1).GetMetadataItem("NBITS", "IMAGE_STRUCTURE") == "12" assert ds.GetRasterBand(1).Checksum() == 4672 assert ( ds.GetMetadataItem("J2KLRA", "TRE") == "0050000102000000.03125000100.06250000200.12500000300.25000000400.50000000500.60000000600.70000000700.80000000800.90000000901.00000001001.10000001101.20000001201.30000001301.50000001401.70000001502.00000001602.30000001703.50000001803.90000001912.000000" ) assert ds.GetMetadataItem("COMRAT", "DEBUG") in ( - "N141", - "N142", - "N143", - "N147", - "N169", - "N174", + "N145", # OpenJPEG 2.3.1 and 2.4 + "N172", # OpenJPEG 2.5 ) assert ( ds.GetMetadataItem("COMPRESSION_REVERSIBILITY", "IMAGE_STRUCTURE") == "LOSSLESS" @@ -1018,7 +1017,7 @@ def test_nitf_jp2openjpeg_npje_numerically_lossless(): in structure ) assert ( - '15' + '11' in structure ) assert '1024' in structure @@ -1051,7 +1050,24 @@ def test_nitf_jp2openjpeg_npje_numerically_lossless(): assert 'Gray data/byte.tif @@ -166,4 +171,193 @@ def test_stacit_overlapping_sources(): """ # print(vrt) - assert placement_vrt in vrt + assert only_one_simple_source in vrt + + ds = gdal.OpenEx( + "data/stacit/overlapping_sources.json", + open_options=["OVERLAP_STRATEGY=REMOVE_IF_NO_NODATA"], + ) + assert ds is not None + vrt = ds.GetMetadata("xml:VRT")[0] + assert only_one_simple_source in vrt + + ds = gdal.OpenEx( + "data/stacit/overlapping_sources.json", + open_options=["OVERLAP_STRATEGY=USE_MOST_RECENT"], + ) + assert ds is not None + vrt = ds.GetMetadata("xml:VRT")[0] + assert only_one_simple_source in vrt + + ds = gdal.OpenEx( + "data/stacit/overlapping_sources.json", + open_options=["OVERLAP_STRATEGY=USE_ALL"], + ) + assert ds is not None + assert len(ds.GetFileList()) == 4 + vrt = ds.GetMetadata("xml:VRT")[0] + + +@pytest.mark.require_geos +def test_stacit_overlapping_sources_with_nodata(): + + ds = gdal.Open("data/stacit/overlapping_sources_with_nodata.json") + assert ds is not None + assert len(ds.GetFileList()) == 3 + vrt = ds.GetMetadata("xml:VRT")[0] + # print(vrt) + two_sources = """ + data/byte.tif + 1 + + + 0 + + + data/byte_nodata_0.tif + 1 + + + 0 + """ + assert two_sources in vrt + + ds = gdal.OpenEx( + "data/stacit/overlapping_sources_with_nodata.json", + open_options=["OVERLAP_STRATEGY=REMOVE_IF_NO_NODATA"], + ) + assert ds is not None + vrt = ds.GetMetadata("xml:VRT")[0] + assert len(ds.GetFileList()) == 3 + assert two_sources in vrt + + ds = gdal.OpenEx( + "data/stacit/overlapping_sources_with_nodata.json", + open_options=["OVERLAP_STRATEGY=USE_MOST_RECENT"], + ) + assert ds is not None + assert len(ds.GetFileList()) == 2 + + ds = gdal.OpenEx( + "data/stacit/overlapping_sources_with_nodata.json", + open_options=["OVERLAP_STRATEGY=USE_ALL"], + ) + assert ds is not None + vrt = ds.GetMetadata("xml:VRT")[0] + assert len(ds.GetFileList()) == 3 + assert two_sources in vrt + + +# Launch a single webserver in a module-scoped fixture. +@pytest.fixture(scope="module") +def webserver_launch(): + + process, port = webserver.launch(handler=webserver.DispatcherHttpHandler) + + yield process, port + + webserver.server_stop(process, port) + + +@pytest.fixture(scope="function") +def webserver_port(webserver_launch): + + webserver_process, webserver_port = webserver_launch + + if webserver_port == 0: + pytest.skip() + yield webserver_port + + +@pytest.mark.require_curl +def test_stacit_post_paging(tmp_vsimem, webserver_port): + + initial_doc = { + "type": "FeatureCollection", + "stac_version": "1.0.0-beta.2", + "stac_extensions": [], + "features": json.loads(open("data/stacit/test.json", "rb").read())["features"], + "links": [ + { + "rel": "next", + "href": f"http://localhost:{webserver_port}/request", + "method": "POST", + "body": {"token": "page_2"}, + "headers": {"foo": "bar"}, + } + ], + } + + filename = str(tmp_vsimem / "tmp.json") + gdal.FileFromMemBuffer(filename, json.dumps(initial_doc)) + + next_page_doc = { + "type": "FeatureCollection", + "stac_version": "1.0.0-beta.2", + "stac_extensions": [], + "features": json.loads(open("data/stacit/test_page2.json", "rb").read())[ + "features" + ], + } + + handler = webserver.SequentialHandler() + handler.add( + "POST", + "/request", + 200, + {"Content-type": "application/json"}, + json.dumps(next_page_doc), + expected_headers={"Content-Type": "application/json", "foo": "bar"}, + expected_body=b'{\n "token":"page_2"\n}', + ) + with webserver.install_http_handler(handler): + ds = gdal.Open(filename) + assert ds is not None + assert ds.RasterCount == 1 + assert ds.RasterXSize == 40 + assert ds.RasterYSize == 20 + assert ds.GetSpatialRef().GetName() == "NAD27 / UTM zone 11N" + assert ds.GetGeoTransform() == pytest.approx( + [440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0], rel=1e-8 + ) + + +############################################################################### +# Test force opening a STACIT file + + +def test_stacit_force_opening(tmp_vsimem): + + filename = str(tmp_vsimem / "test.foo") + + with open("data/stacit/test.json", "rb") as fsrc: + with gdaltest.vsi_open(filename, "wb") as fdest: + fdest.write(fsrc.read(1)) + fdest.write(b" " * (1000 * 1000)) + fdest.write(fsrc.read()) + + with pytest.raises(Exception): + gdal.OpenEx(filename) + + ds = gdal.OpenEx(filename, allowed_drivers=["STACIT"]) + assert ds.GetDriver().GetDescription() == "STACIT" + + +############################################################################### +# Test force opening a URL as STACIT + + +def test_stacit_force_opening_url(): + + drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["STACIT"]) + assert drv.GetDescription() == "STACIT" + + +############################################################################### +# Test force opening, but provided file is still not recognized (for good reasons) + + +def test_stacit_force_opening_no_match(): + + drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["STACIT"]) + assert drv is None diff --git a/autotest/gdrivers/stacta.py b/autotest/gdrivers/stacta.py index f0452ffb31ed..564cfc5fbd5d 100755 --- a/autotest/gdrivers/stacta.py +++ b/autotest/gdrivers/stacta.py @@ -398,3 +398,47 @@ def test_stacta_with_raster_extension_errors(): with gdaltest.tempfile("/vsimem/test.json", json.dumps(j)): with gdal.quiet_errors(): assert gdal.Open("/vsimem/test.json") is not None + + +############################################################################### +# Test force opening a STACTA file + + +def test_stacta_force_opening(tmp_vsimem): + + filename = str(tmp_vsimem / "test.foo") + + with open("data/stacta/test.json", "rb") as fsrc: + with gdaltest.vsi_open(filename, "wb") as fdest: + fdest.write(fsrc.read(1)) + fdest.write(b" " * (1000 * 1000)) + fdest.write(fsrc.read()) + + with pytest.raises(Exception): + gdal.OpenEx(filename) + + with gdaltest.vsi_open(tmp_vsimem / "WorldCRS84Quad/0/0/0.tif", "wb") as fdest: + fdest.write(open("data/stacta/WorldCRS84Quad/0/0/0.tif", "rb").read()) + + ds = gdal.OpenEx(filename, allowed_drivers=["STACTA"]) + assert ds.GetDriver().GetDescription() == "STACTA" + + +############################################################################### +# Test force opening a URL as STACTA + + +def test_stacta_force_opening_url(): + + drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["STACTA"]) + assert drv.GetDescription() == "STACTA" + + +############################################################################### +# Test force opening, but provided file is still not recognized (for good reasons) + + +def test_stacta_force_opening_no_match(): + + drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["STACTA"]) + assert drv is None diff --git a/autotest/gdrivers/tiledb_multidim.py b/autotest/gdrivers/tiledb_multidim.py index 68a7c436351c..7b3b87f7da1c 100755 --- a/autotest/gdrivers/tiledb_multidim.py +++ b/autotest/gdrivers/tiledb_multidim.py @@ -685,8 +685,8 @@ def test(): filename, "data/small_world.tif", format="TileDB", - creationOptions=["INTERLEAVE=ATTRIBUTES"], - ) + creationOptions=["INTERLEAVE=ATTRIBUTES", "CREATE_GROUP=NO"], + ), ds = gdal.OpenEx(filename, gdal.OF_MULTIDIM_RASTER) rg = ds.GetRootGroup() assert rg.GetMDArrayNames() == [ diff --git a/autotest/gdrivers/tiledb_read.py b/autotest/gdrivers/tiledb_read.py index 64724a87d8d9..2f4607830304 100755 --- a/autotest/gdrivers/tiledb_read.py +++ b/autotest/gdrivers/tiledb_read.py @@ -32,8 +32,20 @@ import gdaltest import pytest +from osgeo import gdal + +pytestmark = pytest.mark.require_driver("TileDB") + -@pytest.mark.require_driver("TileDB") def test_tiledb_open(): ut = gdaltest.GDALTest("TileDB", "tiledb_array", 1, 4857) ut.testOpen() + + +############################################################################### + + +def test_tiledb_force_identify(): + + drv = gdal.IdentifyDriverEx("data/tiledb_array", allowed_drivers=["TileDB"]) + assert drv is not None diff --git a/autotest/gdrivers/tiledb_write.py b/autotest/gdrivers/tiledb_write.py index 1bfa45155c81..8fc07d0e5f6f 100755 --- a/autotest/gdrivers/tiledb_write.py +++ b/autotest/gdrivers/tiledb_write.py @@ -30,6 +30,7 @@ ############################################################################### import math +import os import gdaltest import pytest @@ -45,7 +46,7 @@ def test_tiledb_write_complex(tmp_path, mode): src_ds = gdal.Open("../gcore/data/cfloat64.tif") - options = ["INTERLEAVE=%s" % (mode)] + options = ["INTERLEAVE=%s" % (mode), "CREATE_GROUP=NO"] dsname = str(tmp_path / "tiledb_complex64") new_ds = gdaltest.tiledb_drv.CreateCopy(dsname, src_ds, options=options) @@ -56,6 +57,11 @@ def test_tiledb_write_complex(tmp_path, mode): bnd = new_ds.GetRasterBand(1) assert bnd.Checksum() == 5028, "Did not get expected checksum on still-open file" + with pytest.raises( + Exception, match="only supported for datasets created with CREATE_GROUP=YES" + ): + new_ds.BuildOverviews("NEAR", [2]) + bnd = None new_ds = None @@ -430,10 +436,208 @@ def test_tiledb_write_nodata_not_identical_all_bands(tmp_path): def test_tiledb_write_nodata_error_after_rasterio(tmp_path): dsname = str(tmp_path / "test_tiledb_write_nodata_error_after_rasterio.tiledb") - ds = gdal.GetDriverByName("TileDB").Create(dsname, 1, 1) + ds = gdal.GetDriverByName("TileDB").Create( + dsname, 1, 1, options=["CREATE_GROUP=NO"] + ) ds.GetRasterBand(1).Fill(0) ds.GetRasterBand(1).FlushCache() with pytest.raises( Exception, match="cannot be called after pixel values have been set" ): ds.GetRasterBand(1).SetNoDataValue(1) + + +def test_tiledb_write_create_group(tmp_path): + + # Create dataset and add a overview level + dsname = str(tmp_path / "test_tiledb_write_create_group.tiledb") + ds = gdal.GetDriverByName("TileDB").Create(dsname, 1, 2) + ds.Close() + + # Check that it resulted in an auxiliary dataset + ds = gdal.OpenEx(dsname, gdal.OF_MULTIDIM_RASTER) + assert set(ds.GetRootGroup().GetMDArrayNames()) == set( + [ + "l_0", + ] + ) + ds.Close() + + ds = gdal.Open(dsname) + assert ds.RasterXSize == 1 + assert ds.RasterYSize == 2 + + +def test_tiledb_write_overviews(tmp_path): + + # This dataset name must be kept short, otherwise strange I/O errors will + # occur on Windows ! + dsname = str(tmp_path / "test.tiledb") + + src_ds = gdal.Open("data/rgbsmall.tif") + src_ds = gdal.Translate("", src_ds, format="MEM") + src_ds.GetRasterBand(1).SetNoDataValue(254) + + # Create dataset and add a overview level + ds = gdal.GetDriverByName("TileDB").CreateCopy(dsname, src_ds) + ds.BuildOverviews("NEAR", [2]) + assert ds.GetRasterBand(1).GetOverviewCount() == 1 + assert ds.GetRasterBand(1).GetOverview(-1) is None + assert ds.GetRasterBand(1).GetOverview(1) is None + ref_ds = gdal.Translate("", src_ds, format="MEM") + ref_ds.BuildOverviews("NEAR", [2]) + assert [ + ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(ds.RasterCount) + ] == [ + ref_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() + for i in range(ref_ds.RasterCount) + ] + ds.Close() + + # Check that it resulted in an auxiliary dataset + ds = gdal.OpenEx(dsname, gdal.OF_MULTIDIM_RASTER) + assert set(ds.GetRootGroup().GetMDArrayNames()) == set( + [ + "l_0", + "l_1", + ] + ) + ds.Close() + ds = gdal.Open(dsname + "/l_1") + assert ds.RasterXSize == src_ds.RasterXSize // 2 + assert ds.RasterYSize == src_ds.RasterYSize // 2 + assert ds.RasterCount == src_ds.RasterCount + assert ds.GetRasterBand(1).GetNoDataValue() == 254 + assert ds.GetRasterBand(1).GetMetadataItem("RESAMPLING") == "NEAREST" + assert ds.GetGeoTransform()[0] == src_ds.GetGeoTransform()[0] + assert ds.GetGeoTransform()[1] == src_ds.GetGeoTransform()[1] * 2 + assert ds.GetGeoTransform()[2] == src_ds.GetGeoTransform()[2] * 2 + assert ds.GetGeoTransform()[3] == src_ds.GetGeoTransform()[3] + assert ds.GetGeoTransform()[4] == src_ds.GetGeoTransform()[4] * 2 + assert ds.GetGeoTransform()[5] == src_ds.GetGeoTransform()[5] * 2 + ds.Close() + + # Check we can access the overview after re-opening + ds = gdal.Open(dsname) + assert ds.GetRasterBand(1).GetOverviewCount() == 1 + assert ds.GetRasterBand(1).GetOverview(-1) is None + assert ds.GetRasterBand(1).GetOverview(1) is None + assert [ + ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(ds.RasterCount) + ] == [ + ref_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() + for i in range(ref_ds.RasterCount) + ] + with pytest.raises( + Exception, match="Cannot delete overviews in TileDB format in read-only mode" + ): + ds.BuildOverviews("", []) + with pytest.raises( + Exception, match="Cannot create overviews in TileDB format in read-only mode" + ): + ds.BuildOverviews("NEAR", [2]) + ds.Close() + + # Update existing overview and change to AVERAGE resampling + ds = gdal.Open(dsname, gdal.GA_Update) + ds.BuildOverviews("AVERAGE", [2]) + ds.Close() + + ds = gdal.Open(dsname) + ref_ds = gdal.Translate("", src_ds, format="MEM") + ref_ds.BuildOverviews("AVERAGE", [2]) + assert ds.GetRasterBand(1).GetOverview(0).GetMetadataItem("RESAMPLING") == "AVERAGE" + assert [ + ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(ds.RasterCount) + ] == [ + ref_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() + for i in range(ref_ds.RasterCount) + ] + ds.Close() + + # Clear overviews + ds = gdal.Open(dsname, gdal.GA_Update) + ds.BuildOverviews(None, []) + assert ds.GetRasterBand(1).GetOverviewCount() == 0 + ds.Close() + + # Check there are no more overviews after reopening + assert not os.path.exists(dsname + "/l_1") + + ds = gdal.OpenEx(dsname, gdal.OF_MULTIDIM_RASTER) + assert ds.GetRootGroup().GetMDArrayNames() == ["l_0"] + ds.Close() + + ds = gdal.Open(dsname) + assert ds.GetRasterBand(1).GetOverviewCount() == 0 + ds.Close() + + # Try accessing an overview band after clearing overviews + # (the GDAL API doesn't really promise this is safe to do in general, but + # this is implemented in this driver) + ds = gdal.Open(dsname, gdal.GA_Update) + ds.BuildOverviews("NEAR", [2]) + ovr_band = ds.GetRasterBand(1).GetOverview(0) + ds.BuildOverviews(None, []) + with pytest.raises(Exception, match="Dataset has been closed"): + ovr_band.ReadRaster() + with pytest.raises(Exception, match="Dataset has been closed"): + ovr_band.GetDataset().ReadRaster() + ds.Close() + + # Test adding overviews in 2 steps + ds = gdal.Open(dsname, gdal.GA_Update) + ds.BuildOverviews("NEAR", [2]) + ds.Close() + ds = gdal.Open(dsname, gdal.GA_Update) + ds.BuildOverviews("NEAR", [4]) + ref_ds = gdal.Translate("", src_ds, format="MEM") + ref_ds.BuildOverviews("NEAR", [2, 4]) + assert ds.GetRasterBand(1).GetOverviewCount() == 2 + assert [ + ds.GetRasterBand(i + 1).GetOverview(0).Checksum() for i in range(ds.RasterCount) + ] == [ + ref_ds.GetRasterBand(i + 1).GetOverview(0).Checksum() + for i in range(ref_ds.RasterCount) + ] + assert [ + ds.GetRasterBand(i + 1).GetOverview(1).Checksum() for i in range(ds.RasterCount) + ] == [ + ref_ds.GetRasterBand(i + 1).GetOverview(1).Checksum() + for i in range(ref_ds.RasterCount) + ] + ds.Close() + + +def test_tiledb_write_overviews_as_geotiff(tmp_path): + + # We don't want to promote that since GDAL 3.10 because we have now native + # support for overviews, but GeoTIFF side-car .ovr used to work until now + # due to base PAM mechanisms. So test this + + dsname = str(tmp_path / "test.tiledb") + + src_ds = gdal.Open("data/rgbsmall.tif") + src_ds = gdal.Translate("", src_ds, format="MEM") + src_ds.GetRasterBand(1).SetNoDataValue(0) + gdal.GetDriverByName("TileDB").CreateCopy( + dsname, src_ds, options=["CREATE_GROUP=NO"] + ) + + ds = gdal.Open(dsname) + with gdal.config_option("TILEDB_GEOTIFF_OVERVIEWS", "YES"): + ds.BuildOverviews("NEAR", [2]) + ds.Close() + + assert os.path.exists(str(tmp_path / "test.tiledb" / "test.tdb_0.ovr")) + + ds = gdal.Open(dsname) + assert ds.GetRasterBand(1).GetOverviewCount() == 1 + assert ds.GetRasterBand(1).GetOverview(0) is not None + ds.Close() + + # If there are GeoTIFF .ovr, handle them through PAM even in update mode. + ds = gdal.Open(dsname, gdal.GA_Update) + ds.BuildOverviews(None, []) + assert ds.GetRasterBand(1).GetOverviewCount() == 0 + ds.Close() diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py index 1df52fd84912..4b37ad125d75 100755 --- a/autotest/gdrivers/vicar.py +++ b/autotest/gdrivers/vicar.py @@ -560,3 +560,8 @@ def test_vicar_open_from_pds3(): assert ds assert ds.GetDriver().ShortName == "VICAR" assert struct.unpack("B", ds.GetRasterBand(1).ReadRaster())[0] == ord("x") + + ds = gdal.OpenEx("/vsimem/test", allowed_drivers=["VICAR"]) + assert ds + assert ds.GetDriver().ShortName == "VICAR" + assert struct.unpack("B", ds.GetRasterBand(1).ReadRaster())[0] == ord("x") diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py index 706e69085efe..579a4003509f 100755 --- a/autotest/gdrivers/vrtfilt.py +++ b/autotest/gdrivers/vrtfilt.py @@ -238,3 +238,27 @@ def test_vrtfilt_invalid_kernel_size(): with pytest.raises(Exception): vrt_ds.GetRasterBand(1).SetMetadata(md, "vrt_sources") + + +############################################################################### + + +def test_vrtfilt_serialize_separatable_kernel(): + + vrt_ds = gdal.GetDriverByName("VRT").Create("", 1, 1, 1) + + filterSourceXML = """ + data/rgbsmall.tif + 1 + + 3 + 1 1 1 + + """ + + md = {} + md["source_0"] = filterSourceXML + + vrt_ds.GetRasterBand(1).SetMetadata(md, "vrt_sources") + + assert filterSourceXML in vrt_ds.GetMetadata("xml:VRT")[0] diff --git a/autotest/gdrivers/vrtlut.py b/autotest/gdrivers/vrtlut.py index 060aec9e5664..251e89ae21ff 100755 --- a/autotest/gdrivers/vrtlut.py +++ b/autotest/gdrivers/vrtlut.py @@ -28,8 +28,12 @@ # DEALINGS IN THE SOFTWARE. ############################################################################### +import struct import gdaltest +import pytest + +from osgeo import gdal ############################################################################### # Simple test @@ -39,3 +43,13 @@ def test_vrtlut_1(): tst = gdaltest.GDALTest("VRT", "vrt/byte_lut.vrt", 1, 4655) tst.testOpen() + + +############################################################################### + + +@pytest.mark.require_driver("AAIGRID") +def test_vrtlut_with_nan(): + + ds = gdal.Open("data/vrt/lut_with_nan.vrt") + assert struct.unpack("B" * 2 * 3, ds.ReadRaster()) == (0, 10, 10, 15, 20, 20) diff --git a/autotest/gdrivers/vrtprocesseddataset.py b/autotest/gdrivers/vrtprocesseddataset.py index 1c353d170732..b11483b16df0 100755 --- a/autotest/gdrivers/vrtprocesseddataset.py +++ b/autotest/gdrivers/vrtprocesseddataset.py @@ -676,19 +676,20 @@ def test_vrtprocesseddataset_dehazing_different_resolution(tmp_vsimem): src_ds.GetRasterBand(1).WriteArray( np.array([[1, 1, 2, 2, 3, 3], [1, 1, 2, 2, 3, 3]]) ) - src_ds.SetGeoTransform([0, 0.5, 0, 0, 0, 0.5]) + src_ds.SetGeoTransform([0, 0.5 * 10, 0, 0, 0, 0.5 * 10]) + src_ds.BuildOverviews("NEAR", [2]) src_ds.Close() gain_filename = str(tmp_vsimem / "gain.tif") gain_ds = gdal.GetDriverByName("GTiff").Create(gain_filename, 3, 1, 1) gain_ds.GetRasterBand(1).WriteArray(np.array([[2, 4, 6]])) - gain_ds.SetGeoTransform([0, 1, 0, 0, 0, 1]) + gain_ds.SetGeoTransform([0, 1 * 10, 0, 0, 0, 1 * 10]) gain_ds.Close() offset_filename = str(tmp_vsimem / "offset.tif") offset_ds = gdal.GetDriverByName("GTiff").Create(offset_filename, 3, 1, 1) offset_ds.GetRasterBand(1).WriteArray(np.array([[1, 2, 3]])) - offset_ds.SetGeoTransform([0, 1, 0, 0, 0, 1]) + offset_ds.SetGeoTransform([0, 1 * 10, 0, 0, 0, 1 * 10]) offset_ds.Close() ds = gdal.Open( @@ -712,6 +713,10 @@ def test_vrtprocesseddataset_dehazing_different_resolution(tmp_vsimem): ds.GetRasterBand(1).ReadAsArray(), np.array([[1, 2, 6, 8, 15, 15], [1, 2, 6, 8, 15, 15]]), ) + np.testing.assert_equal( + ds.GetRasterBand(1).GetOverview(0).ReadAsArray(), + np.array([[1, 6, 15]]), + ) ############################################################################### @@ -1181,7 +1186,7 @@ def test_vrtprocesseddataset_serialize(tmp_vsimem): with gdaltest.tempfile(vrt_filename, content): ds = gdal.Open(vrt_filename) np.testing.assert_equal(ds.GetRasterBand(1).ReadAsArray(), np.array([[11, 12]])) - assert ds.GetRasterBand(1).GetStatistics(False, False) == [0.0, 0.0, 0.0, -1.0] + assert ds.GetRasterBand(1).GetStatistics(False, False) is None ds.GetRasterBand(1).ComputeStatistics(False) ds.Close() diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py index 1eab4bc2405e..9e7ca4da5508 100755 --- a/autotest/gdrivers/wms.py +++ b/autotest/gdrivers/wms.py @@ -37,6 +37,7 @@ import gdaltest import pytest +import webserver from osgeo import gdal @@ -1162,3 +1163,40 @@ def test_wms_cache_path(): with pytest.raises(Exception): gdal.Open("") + + +# Launch a single webserver in a module-scoped fixture. +@pytest.fixture(scope="module") +def webserver_launch(): + + process, port = webserver.launch(handler=webserver.DispatcherHttpHandler) + + yield process, port + + webserver.server_stop(process, port) + + +@pytest.fixture(scope="function") +def webserver_port(webserver_launch): + + webserver_process, webserver_port = webserver_launch + + if webserver_port == 0: + pytest.skip() + yield webserver_port + + +@pytest.mark.require_curl +@gdaltest.enable_exceptions() +def test_wms_force_opening_url(tmp_vsimem, webserver_port): + + handler = webserver.SequentialHandler() + handler.add( + "GET", + "/?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities", + 200, + {"Content-type": "application/xml"}, + open("data/wms/demo_mapserver_org.xml", "rb").read(), + ) + with webserver.install_http_handler(handler): + gdal.OpenEx(f"http://localhost:{webserver_port}", allowed_drivers=["WMS"]) diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py index 532ccf027bc2..93e117939475 100755 --- a/autotest/gdrivers/wmts.py +++ b/autotest/gdrivers/wmts.py @@ -34,6 +34,7 @@ import gdaltest import pytest +import webserver from osgeo import gdal @@ -1870,6 +1871,18 @@ def test_wmts_check_no_overflow_zoom_level(): gdal.Unlink(inputXml) +############################################################################### +# Test fix for https://github.com/OSGeo/gdal/issues/10348 + + +def test_wmts_clip_extent_with_union_of_tile_matrix_extent(): + + ds = gdal.Open("data/wmts/clip_WGS84BoundingBox_with_tilematrix.xml") + assert ds.GetGeoTransform() == pytest.approx( + (-46133.17, 0.5971642834779389, 0.0, 6301219.54, 0.0, -0.5971642834779389) + ) + + ############################################################################### # Test when local wmts tiles are missing @@ -1925,3 +1938,82 @@ def test_wmts_24(): data = struct.unpack("h", structval) # Expect a null value for the pixel data assert data[0] == 0 + + +############################################################################### +# Test force opening a URL as WMTS + + +def test_wmts_force_identifying_url(): + + drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["WMTS"]) + assert drv.GetDescription() == "WMTS" + + +# Launch a single webserver in a module-scoped fixture. +@pytest.fixture(scope="module") +def webserver_launch(): + + process, port = webserver.launch(handler=webserver.DispatcherHttpHandler) + + yield process, port + + webserver.server_stop(process, port) + + +@pytest.fixture(scope="function") +def webserver_port(webserver_launch): + + webserver_process, webserver_port = webserver_launch + + if webserver_port == 0: + pytest.skip() + yield webserver_port + + +@pytest.mark.require_curl +@gdaltest.enable_exceptions() +def test_wmts_force_opening_url(tmp_vsimem, webserver_port): + + handler = webserver.SequentialHandler() + handler.add( + "GET", + "/", + 200, + {"Content-type": "application/xml"}, + open("data/wmts/WMTSCapabilities.xml", "rb").read(), + ) + with webserver.install_http_handler(handler): + gdal.OpenEx(f"http://localhost:{webserver_port}", allowed_drivers=["WMTS"]) + + +############################################################################### +# Test force opening + + +@gdaltest.enable_exceptions() +def test_wmts_force_opening(tmp_vsimem): + + filename = str(tmp_vsimem / "test.foo") + + with open("data/wmts/WMTSCapabilities.xml", "rb") as fsrc: + with gdaltest.vsi_open(filename, "wb") as fdest: + fdest.write(fsrc.read(1)) + fdest.write(b" " * (1000 * 1000)) + fdest.write(fsrc.read()) + + with pytest.raises(Exception): + gdal.OpenEx(filename) + + ds = gdal.OpenEx(filename, allowed_drivers=["WMTS"]) + assert ds.GetDriver().GetDescription() == "WMTS" + + +############################################################################### +# Test force opening, but provided file is still not recognized (for good reasons) + + +def test_wmts_force_opening_no_match(): + + drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["WMTS"]) + assert drv is None diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py index 2977b9bf9b11..9914bfa38602 100755 --- a/autotest/gdrivers/xyz.py +++ b/autotest/gdrivers/xyz.py @@ -557,3 +557,119 @@ def test_xyz_looks_like_missing_lines(): 9, 10, ) + + +############################################################################### + + +def yxzContent(): + content = """0 0 65 +0 1 66 +1 0 67 +1 1 68 +2 0 69 +2 1 70 +""" + return content + + +############################################################################### +# Test with open option COLUMN_ORDER. Basic case with YXZ + + +def test_xyz_column_order_basic_yxz(): + + content = yxzContent() + + gdal.FileFromMemBuffer("/vsimem/grid.xyz", content) + ds = gdal.OpenEx("/vsimem/grid.xyz", open_options=["COLUMN_ORDER=YXZ"]) + assert ds.RasterXSize == 2 and ds.RasterYSize == 3 + buf = ds.ReadRaster(0, 2, 2, 1) + assert struct.unpack("B" * 2, buf) == (69, 70) + buf = ds.ReadRaster(0, 1, 2, 1) + assert struct.unpack("B" * 2, buf) == (67, 68) + buf = ds.ReadRaster(0, 0, 2, 1) + assert struct.unpack("B" * 2, buf) == (65, 66) + buf = ds.ReadRaster(0, 2, 2, 1) + assert struct.unpack("B" * 2, buf) == (69, 70) + ds = None + gdal.Unlink("/vsimem/grid.xyz") + + +############################################################################### +# Test with open option COLUMN_ORDER. Overrides header + + +def test_xyz_column_order_overrides_header(): + + content = ( + """x y z +""" + + yxzContent() + ) + + gdal.FileFromMemBuffer("/vsimem/grid.xyz", content) + ds = gdal.OpenEx("/vsimem/grid.xyz", open_options=["COLUMN_ORDER=YXZ"]) + assert ds.RasterXSize == 2 and ds.RasterYSize == 3 + buf = ds.ReadRaster(0, 2, 2, 1) + assert struct.unpack("B" * 2, buf) == (69, 70) + ds = None + gdal.Unlink("/vsimem/grid.xyz") + + +############################################################################### +# Test with open option COLUMN_ORDER. Auto + + +def test_xyz_column_order_auto(): + + content = ( + """y x z +""" + + yxzContent() + ) + + gdal.FileFromMemBuffer("/vsimem/grid.xyz", content) + ds = gdal.OpenEx("/vsimem/grid.xyz", open_options=["COLUMN_ORDER=AUTO"]) + assert ds.RasterXSize == 2 and ds.RasterYSize == 3 + buf = ds.ReadRaster(0, 2, 2, 1) + assert struct.unpack("B" * 2, buf) == (69, 70) + ds = None + gdal.Unlink("/vsimem/grid.xyz") + + +############################################################################### +# Test with open option COLUMN_ORDER. wrong option + + +def test_xyz_column_order_wrong_option(): + + content = ( + """y x z +""" + + yxzContent() + ) + + gdal.FileFromMemBuffer("/vsimem/grid.xyz", content) + with pytest.raises(Exception): + gdal.OpenEx("/vsimem/grid.xyz", open_options=["COLUMN_ORDER=WRONG"]) + gdal.Unlink("/vsimem/grid.xyz") + + +############################################################################### +# Test with open option COLUMN_ORDER. XYZ + + +def test_xyz_column_order_xyz(): + + content = ( + """y x z +""" + + yxzContent() + ) + + gdal.FileFromMemBuffer("/vsimem/grid.xyz", content) + ds = gdal.OpenEx("/vsimem/grid.xyz", open_options=["COLUMN_ORDER=XYZ"]) + assert ds.RasterXSize == 3 and ds.RasterYSize == 2 + ds = None + gdal.Unlink("/vsimem/grid.xyz") diff --git a/autotest/gdrivers/zarr_driver.py b/autotest/gdrivers/zarr_driver.py index ec4b1e1689d2..3056cd1b0ce7 100644 --- a/autotest/gdrivers/zarr_driver.py +++ b/autotest/gdrivers/zarr_driver.py @@ -723,9 +723,9 @@ def test_zarr_read_array_attributes(): "double": 1.5, "doublearray": [1.5, 2.5], "int": 1, + "intarray": [1, 2], "int64": 1234567890123, "int64array": [1234567890123, -1234567890123], - "intarray": [1, 2], "intdoublearray": [1, 2.5], "mixedstrintarray": ["foo", 1], "null": "", @@ -1437,12 +1437,46 @@ def create(): assert attr assert attr.Write(4000000000) == gdal.CE_None + attr = rg.CreateAttribute( + "int64_attr", [], gdal.ExtendedDataType.Create(gdal.GDT_Int64) + ) + assert attr + assert attr.Write(12345678901234) == gdal.CE_None + + attr = rg.CreateAttribute( + "uint64_attr", [], gdal.ExtendedDataType.Create(gdal.GDT_UInt64) + ) + assert attr + # We cannot write UINT64_MAX + # assert attr.Write(18000000000000000000) == gdal.CE_None + assert attr.Write(9000000000000000000) == gdal.CE_None + attr = rg.CreateAttribute( "int_array_attr", [2], gdal.ExtendedDataType.Create(gdal.GDT_Int32) ) assert attr assert attr.Write([12345678, -12345678]) == gdal.CE_None + attr = rg.CreateAttribute( + "uint_array_attr", [2], gdal.ExtendedDataType.Create(gdal.GDT_UInt32) + ) + assert attr + assert attr.Write([12345678, 4000000000]) == gdal.CE_None + + attr = rg.CreateAttribute( + "int64_array_attr", [2], gdal.ExtendedDataType.Create(gdal.GDT_Int64) + ) + assert attr + assert attr.Write([12345678091234, -12345678091234]) == gdal.CE_None + + attr = rg.CreateAttribute( + "uint64_array_attr", [2], gdal.ExtendedDataType.Create(gdal.GDT_UInt64) + ) + assert attr + # We cannot write UINT64_MAX + # assert attr.Write([12345678091234, 18000000000000000000]) == gdal.CE_None + assert attr.Write([12345678091234, 9000000000000000000]) == gdal.CE_None + attr = rg.CreateAttribute( "double_attr", [], gdal.ExtendedDataType.Create(gdal.GDT_Float64) ) @@ -1519,17 +1553,52 @@ def update(): attr = rg.GetAttribute("int_attr") assert attr assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int32 + assert attr.ReadAsInt() == 12345678 + assert attr.ReadAsInt64() == 12345678 assert attr.ReadAsDouble() == 12345678 attr = rg.GetAttribute("uint_attr") assert attr - assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Float64 + assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int64 + assert attr.ReadAsInt64() == 4000000000 assert attr.ReadAsDouble() == 4000000000 + attr = rg.GetAttribute("int64_attr") + assert attr + assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int64 + assert attr.ReadAsInt64() == 12345678901234 + assert attr.ReadAsDouble() == 12345678901234 + + attr = rg.GetAttribute("uint64_attr") + assert attr + assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int64 + assert attr.ReadAsInt64() == 9000000000000000000 + assert attr.ReadAsDouble() == 9000000000000000000 + attr = rg.GetAttribute("int_array_attr") assert attr assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int32 assert attr.ReadAsIntArray() == (12345678, -12345678) + assert attr.ReadAsInt64Array() == (12345678, -12345678) + assert attr.ReadAsDoubleArray() == (12345678, -12345678) + + attr = rg.GetAttribute("uint_array_attr") + assert attr + assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int64 + assert attr.ReadAsInt64Array() == (12345678, 4000000000) + assert attr.ReadAsDoubleArray() == (12345678, 4000000000) + + attr = rg.GetAttribute("int64_array_attr") + assert attr + assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int64 + assert attr.ReadAsInt64Array() == (12345678091234, -12345678091234) + assert attr.ReadAsDoubleArray() == (12345678091234, -12345678091234) + + attr = rg.GetAttribute("uint64_array_attr") + assert attr + assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int64 + assert attr.ReadAsInt64Array() == (12345678091234, 9000000000000000000) + assert attr.ReadAsDoubleArray() == (12345678091234, 9000000000000000000) attr = rg.GetAttribute("double_attr") assert attr diff --git a/autotest/ogr/data/csv/inf_nan.csv b/autotest/ogr/data/csv/inf_nan.csv new file mode 100644 index 000000000000..7ab5a1f7cd1e --- /dev/null +++ b/autotest/ogr/data/csv/inf_nan.csv @@ -0,0 +1,5 @@ +id,v +1,10 +2,inf +3,-inf +4,NaN diff --git a/autotest/ogr/data/dxf/closed_polyline_with_bulge.dxf b/autotest/ogr/data/dxf/closed_polyline_with_bulge.dxf new file mode 100644 index 000000000000..b367a69a8c3d --- /dev/null +++ b/autotest/ogr/data/dxf/closed_polyline_with_bulge.dxf @@ -0,0 +1,64 @@ + 0 +SECTION + 2 +ENTITIES + 0 +LWPOLYLINE + 5 +215 +330 +1F +100 +AcDbEntity + 8 +test +100 +AcDbPolyline + 90 + 8 + 70 + 129 + 43 +0.5 + 10 +40585366.70650577 + 20 +3433935.538090975 + 10 +40585329.92564863 + 20 +3433998.440817071 + 42 +0.2621272319479089 + 10 +40585297.73920335 + 20 +3434017.254552271 + 10 +40585271.13131783 + 20 +3434017.686781913 + 10 +40585252.16981492 + 20 +3433885.990375476 + 10 +40585256.74147 + 20 +3433885.916111596 + 42 +0.1393571566538866 + 10 +40585329.65156154 + 20 +3433905.365607637 + 10 +40585364.24837356 + 20 +3433925.992208718 + 42 +0.4117239835866821 + 0 +ENDSEC + 0 +EOF diff --git a/autotest/ogr/data/esrijson/GetLatLon.json b/autotest/ogr/data/esrijson/GetLatLon.json new file mode 100644 index 000000000000..e40a4ae2b9a1 --- /dev/null +++ b/autotest/ogr/data/esrijson/GetLatLon.json @@ -0,0 +1,139 @@ +{ + "trs": "WA330160N0260E0SN070", + "generatedplss": [ + "WA330160N0260E0SN070" + ], + "coordinates": [ + { + "plssid": "WA330160N0260E0SN070", + "lat": 46.889846925914661, + "lon": -119.61030783431359 + } + ], + "features": [ + { + "attributes": { + "landdescription": "WA330160N0260E0SN070" + }, + "geometry": { + "rings": [ + [ + [ + -119.60204327043593, + 46.886243867876424 + ], + [ + -119.60206398468807, + 46.882628224420934 + ], + [ + -119.60732767297685, + 46.882649819203635 + ], + [ + -119.6125944631483, + 46.882671183730082 + ], + [ + -119.6126044856519, + 46.882671170222224 + ], + [ + -119.61785486360311, + 46.882664173764368 + ], + [ + -119.61875770280301, + 46.882662936567044 + ], + [ + -119.61874405829215, + 46.883568936820438 + ], + [ + -119.61868552316993, + 46.886246722756596 + ], + [ + -119.61868498238411, + 46.886271509249347 + ], + [ + -119.61867486286243, + 46.886734870031582 + ], + [ + -119.61866382256761, + 46.887240158406691 + ], + [ + -119.6186061309634, + 46.889880080462206 + ], + [ + -119.61859592700011, + 46.890346766295536 + ], + [ + -119.61858348713005, + 46.890915726238376 + ], + [ + -119.61858325446639, + 46.89092222006439 + ], + [ + -119.61847427175444, + 46.893957399712157 + ], + [ + -119.61845184261844, + 46.894581451904436 + ], + [ + -119.61836141820194, + 46.897097152613171 + ], + [ + -119.61782949338284, + 46.897096441799754 + ], + [ + -119.61263370425482, + 46.897089367425643 + ], + [ + -119.61256327453992, + 46.8970893336651 + ], + [ + -119.60729432661518, + 46.897086677014869 + ], + [ + -119.60202277267778, + 46.897083939339161 + ], + [ + -119.60202262984565, + 46.893471725151699 + ], + [ + -119.60202248521686, + 46.8898595819661 + ], + [ + -119.60204327043593, + 46.886243867876424 + ] + ] + ], + "spatialReference": { + "wkid": 4326, + "latestWkid": 4326 + } + } + } + ], + "status": "success" +} \ No newline at end of file diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.TablesByName.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.TablesByName.atx new file mode 100644 index 000000000000..f4eaf0253170 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.TablesByName.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbindexes new file mode 100644 index 000000000000..b02aa7510589 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbtable new file mode 100644 index 000000000000..f48181819f71 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbtablx new file mode 100644 index 000000000000..3d6f920bbf82 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000002.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000002.gdbtable new file mode 100644 index 000000000000..a0af90eaae1f Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000002.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000002.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000002.gdbtablx new file mode 100644 index 000000000000..7c12c5681950 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000002.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbindexes new file mode 100644 index 000000000000..58df68d525b4 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbtable new file mode 100644 index 000000000000..f8006ccdaad9 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbtablx new file mode 100644 index 000000000000..2f80ed4fe5fe Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.CatItemsByPhysicalName.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.CatItemsByPhysicalName.atx new file mode 100644 index 000000000000..1e7ad8630e15 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.CatItemsByPhysicalName.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.CatItemsByType.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.CatItemsByType.atx new file mode 100644 index 000000000000..4519bd34bec5 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.CatItemsByType.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.FDO_UUID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.FDO_UUID.atx new file mode 100644 index 000000000000..f0a699c8fb58 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.FDO_UUID.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbindexes new file mode 100644 index 000000000000..a4f334d7ba2a Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbtable new file mode 100644 index 000000000000..0cbf02d63282 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbtablx new file mode 100644 index 000000000000..93fec31b61e3 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.horizon b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.horizon new file mode 100644 index 000000000000..b64b92356a70 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.horizon differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.spx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.spx new file mode 100644 index 000000000000..15bba5bf1c63 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.spx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByName.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByName.atx new file mode 100644 index 000000000000..5f5004620ba9 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByName.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByParentTypeID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByParentTypeID.atx new file mode 100644 index 000000000000..269f1f31a465 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByParentTypeID.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByUUID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByUUID.atx new file mode 100644 index 000000000000..44d74cc880f4 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByUUID.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbindexes new file mode 100644 index 000000000000..bc887093f340 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbtable new file mode 100644 index 000000000000..bf93ec49a465 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbtablx new file mode 100644 index 000000000000..4d8932a45d48 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByDestinationID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByDestinationID.atx new file mode 100644 index 000000000000..0a32c40e3588 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByDestinationID.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByOriginID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByOriginID.atx new file mode 100644 index 000000000000..1664d21885e8 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByOriginID.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByType.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByType.atx new file mode 100644 index 000000000000..0413692ccd84 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByType.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.FDO_UUID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.FDO_UUID.atx new file mode 100644 index 000000000000..282a6a278350 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.FDO_UUID.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbindexes new file mode 100644 index 000000000000..c608a88be082 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbtable new file mode 100644 index 000000000000..553f570678a6 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbtablx new file mode 100644 index 000000000000..431307d13c60 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByBackwardLabel.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByBackwardLabel.atx new file mode 100644 index 000000000000..8797338e7a9c Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByBackwardLabel.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByDestItemTypeID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByDestItemTypeID.atx new file mode 100644 index 000000000000..47d2132ee8b7 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByDestItemTypeID.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByForwardLabel.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByForwardLabel.atx new file mode 100644 index 000000000000..233026824883 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByForwardLabel.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByName.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByName.atx new file mode 100644 index 000000000000..70ed36c3fea8 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByName.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByOriginItemTypeID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByOriginItemTypeID.atx new file mode 100644 index 000000000000..139b478cc0a4 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByOriginItemTypeID.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByUUID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByUUID.atx new file mode 100644 index 000000000000..dea48d3ebdbb Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByUUID.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbindexes new file mode 100644 index 000000000000..2a98c93adab6 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbtable new file mode 100644 index 000000000000..a25ba57b9184 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbtablx new file mode 100644 index 000000000000..bf096e13d28f Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbindexes new file mode 100644 index 000000000000..c9d0caa2233c Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbtable new file mode 100644 index 000000000000..451b4e263cc6 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbtablx new file mode 100644 index 000000000000..8ced06e569cc Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.horizon b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.horizon new file mode 100644 index 000000000000..bab2232e79cb --- /dev/null +++ b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.horizon @@ -0,0 +1 @@ +÷^"ѾˆSÁÖˆ,~ÑcÁ÷^"ÑNYWAÖˆ,~ÑcA \ No newline at end of file diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.spx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.spx new file mode 100644 index 000000000000..c52ff8ff444f Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.spx differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/gdb b/autotest/ogr/data/filegdb/objectid64/3features.gdb/gdb new file mode 100644 index 000000000000..a786e127004d Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/gdb differ diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/timestamps b/autotest/ogr/data/filegdb/objectid64/3features.gdb/timestamps new file mode 100644 index 000000000000..977ba66918c8 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/timestamps differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000001.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000001.gdbtable new file mode 100644 index 000000000000..08d801103d45 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000001.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000001.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000001.gdbtablx new file mode 100644 index 000000000000..52fde329b77d Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000001.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000002.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000002.gdbtable new file mode 100644 index 000000000000..0b29eb53e07d Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000002.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000002.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000002.gdbtablx new file mode 100644 index 000000000000..b17fb6b96e25 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000002.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000003.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000003.gdbtable new file mode 100644 index 000000000000..5300ca649431 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000003.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000003.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000003.gdbtablx new file mode 100644 index 000000000000..730418420e46 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000003.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.freelist b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.freelist new file mode 100644 index 000000000000..040b0de5c092 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.freelist differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.gdbtable new file mode 100644 index 000000000000..56afc1dd9910 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.gdbtablx new file mode 100644 index 000000000000..0a43ae9a2000 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000005.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000005.gdbtable new file mode 100644 index 000000000000..9a0fe221dc4a Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000005.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000005.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000005.gdbtablx new file mode 100644 index 000000000000..4a92352cb2d6 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000005.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.FDO_OriginID.atx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.FDO_OriginID.atx new file mode 100644 index 000000000000..9fc0f2b2ec2e Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.FDO_OriginID.atx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbindexes new file mode 100644 index 000000000000..9e15d35d6136 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbtable new file mode 100644 index 000000000000..1da41b719ca6 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbtablx new file mode 100644 index 000000000000..e5f0a9e3946b Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000007.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000007.gdbtable new file mode 100644 index 000000000000..231ae0568629 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000007.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000007.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000007.gdbtablx new file mode 100644 index 000000000000..5ed1ca9acb22 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000007.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbindexes new file mode 100644 index 000000000000..cc24e2a06b9b Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbtable new file mode 100644 index 000000000000..c99336adb5db Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbtablx new file mode 100644 index 000000000000..a3af82aa62a8 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.horizon new file mode 100644 index 000000000000..b64b92356a70 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.horizon differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.spx new file mode 100644 index 000000000000..5fa796d466b1 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.spx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbindexes new file mode 100644 index 000000000000..cc24e2a06b9b Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbtable new file mode 100644 index 000000000000..c99336adb5db Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbtablx new file mode 100644 index 000000000000..d4842ffc23d1 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.horizon new file mode 100644 index 000000000000..b64b92356a70 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.horizon differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.spx new file mode 100644 index 000000000000..5fa796d466b1 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.spx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbindexes new file mode 100644 index 000000000000..cc24e2a06b9b Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbtable new file mode 100644 index 000000000000..c99336adb5db Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbtablx new file mode 100644 index 000000000000..eee05bd71076 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.horizon new file mode 100644 index 000000000000..b64b92356a70 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.horizon differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.spx new file mode 100644 index 000000000000..5fa796d466b1 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.spx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbindexes new file mode 100644 index 000000000000..cc24e2a06b9b Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbtable new file mode 100644 index 000000000000..c99336adb5db Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbtablx new file mode 100644 index 000000000000..b83ce08a274d Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.horizon new file mode 100644 index 000000000000..b64b92356a70 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.horizon differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.spx new file mode 100644 index 000000000000..5fa796d466b1 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.spx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbindexes new file mode 100644 index 000000000000..cc24e2a06b9b Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbtable new file mode 100644 index 000000000000..c99336adb5db Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbtablx new file mode 100644 index 000000000000..f343e6d9eb39 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.horizon new file mode 100644 index 000000000000..b64b92356a70 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.horizon differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.spx new file mode 100644 index 000000000000..5fa796d466b1 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.spx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbindexes new file mode 100644 index 000000000000..cc24e2a06b9b Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbtable new file mode 100644 index 000000000000..c99336adb5db Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbtablx new file mode 100644 index 000000000000..3a77f69dfcb1 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.horizon new file mode 100644 index 000000000000..b64b92356a70 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.horizon differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.spx new file mode 100644 index 000000000000..5fa796d466b1 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.spx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbindexes new file mode 100644 index 000000000000..cc24e2a06b9b Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbindexes differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbtable new file mode 100644 index 000000000000..e035332fb4d8 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbtable differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbtablx new file mode 100644 index 000000000000..f29a29ad7844 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbtablx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.horizon new file mode 100644 index 000000000000..b64b92356a70 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.horizon differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.spx new file mode 100644 index 000000000000..5fa796d466b1 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.spx differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/gdb b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/gdb new file mode 100644 index 000000000000..506f9c628294 Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/gdb differ diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/timestamps b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/timestamps new file mode 100644 index 000000000000..fca0d9f1179b Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/timestamps differ diff --git a/autotest/ogr/data/geojson/feature_with_type_Topology_property.json b/autotest/ogr/data/geojson/feature_with_type_Topology_property.json new file mode 100644 index 000000000000..9b9f0bbd6dcf --- /dev/null +++ b/autotest/ogr/data/geojson/feature_with_type_Topology_property.json @@ -0,0 +1,7 @@ +{ +"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:EPSG::27700" } }, +"features": [ +{ "properties": { "type": "Topology" }, "geometry": null, "type": "Feature" } +], +"type": "FeatureCollection" +} diff --git a/autotest/ogr/data/geojson/point_with_utf8bom.json b/autotest/ogr/data/geojson/point_with_utf8bom.json index e9596eb9425d..28c794825fe6 100644 --- a/autotest/ogr/data/geojson/point_with_utf8bom.json +++ b/autotest/ogr/data/geojson/point_with_utf8bom.json @@ -1 +1 @@ -{ "geometry": { "type": "Point", "coordinates": [ 100.0, 0.0 ] } } \ No newline at end of file +{ "geometry": { "type": "Point", "coordinates": [ 100.0, 0.0 ] }, "type": "Feature" } diff --git a/autotest/ogr/data/gml/min_example/ft1_schema.xsd b/autotest/ogr/data/gml/min_example/ft1_schema.xsd new file mode 100644 index 000000000000..a1d71b57ff07 --- /dev/null +++ b/autotest/ogr/data/gml/min_example/ft1_schema.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/autotest/ogr/data/gml/min_example/ft2_schema.xsd b/autotest/ogr/data/gml/min_example/ft2_schema.xsd new file mode 100644 index 000000000000..08439de44bc9 --- /dev/null +++ b/autotest/ogr/data/gml/min_example/ft2_schema.xsd @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/autotest/ogr/data/gml/min_example/minimal_example.gml b/autotest/ogr/data/gml/min_example/minimal_example.gml new file mode 100644 index 000000000000..31282fae09e7 --- /dev/null +++ b/autotest/ogr/data/gml/min_example/minimal_example.gml @@ -0,0 +1,55 @@ + + + + + + Rechtsbestand + 430050 + 2021-01-13+01:00 + + + + + + + + 431972.151 5347601.362 431964.001 5347621.025 431963.856 5347621.360 431956.503 5347639.346 431955.348 5347642.027 431946.479 5347638.798 431947.704 5347635.782 431940.320 5347632.646 431940.752 5347631.530 431947.244 5347615.889 431947.460 5347615.331 431952.550 5347600.374 431933.614 5347599.266 431911.933 5347598.080 431892.851 5347597.085 431878.817 5347596.364 431869.832 5347595.804 431854.833 5347594.983 431838.573 5347594.178 431818.376 5347593.085 431792.611 5347591.726 431758.084 5347589.805 431735.436 5347588.520 431731.173 5347591.906 431728.161 5347606.839 431723.676 5347628.792 431721.715 5347650.938 431733.163 5347652.690 431746.073 5347652.536 431783.096 5347652.203 431811.603 5347653.307 431823.703 5347653.718 431835.730 5347654.240 431866.763 5347655.648 431875.746 5347655.985 431885.769 5347656.421 431893.342 5347656.775 431897.351 5347656.950 431914.654 5347658.077 431924.753 5347658.734 431929.434 5347659.234 431929.953 5347659.228 431947.776 5347660.460 431964.722 5347662.703 431979.637 5347668.972 431992.836 5347674.484 432002.386 5347678.817 432009.223 5347679.625 432013.965 5347679.123 432026.152 5347674.309 432033.238 5347671.223 432049.740 5347642.567 432046.810 5347639.601 432047.754 5347637.811 432058.913 5347615.334 432066.808 5347599.121 432072.679 5347587.378 432074.245 5347588.138 432091.528 5347556.472 432072.344 5347546.918 432050.620 5347535.949 432045.918 5347533.671 432038.566 5347551.879 432032.299 5347567.628 432027.252 5347580.028 432025.523 5347584.384 432022.856 5347590.974 432020.624 5347596.670 432013.056 5347615.437 432000.188 5347619.036 431986.354 5347610.086 431972.967 5347601.353 431972.151 5347601.362 + + + + + + + + + + + 430070 + 2004-02-26+01:00 + 8266.565325510000000 + + + + + + + + 510586.451 5282926.087 510579.955 5282909.071 510578.087 5282904.956 510574.792 5282901.504 510570.005 5282892.827 510563.498 5282882.145 510556.314 5282871.907 510548.528 5282862.557 510546.805 5282860.887 510539.391 5282853.427 510537.215 5282852.868 510536.092 5282851.866 510535.345 5282849.863 510529.578 5282844.630 510523.285 5282839.283 510520.438 5282836.833 510510.099 5282829.034 510494.586 5282819.115 510475.245 5282809.633 510450.727 5282800.476 510442.555 5282796.904 510440.289 5282805.125 510437.725 5282812.455 510433.622 5282841.344 510431.571 5282855.567 510428.379 5282877.789 510427.163 5282886.678 510424.276 5282906.789 510456.971 5282916.295 510465.753 5282914.533 510464.393 5282919.643 510460.259 5282923.636 510455.585 5282935.854 510453.023 5282942.406 510447.304 5282951.287 510443.543 5282957.060 510469.192 5282962.663 510493.040 5282968.485 510507.141 5282970.845 510519.369 5282971.533 510539.995 5282974.905 510566.854 5282975.621 510580.431 5282977.090 510591.818 5282986.558 510594.415 5282961.223 510591.371 5282943.546 510588.986 5282934.983 510586.451 5282926.087 + + + + + + + + + 510782.868 5283252.645 510784.376 5283248.425 510788.725 5283250.100 510792.850 5283250.330 510838.847 5283246.304 510855.506 5283244.667 510879.146 5283240.489 510903.164 5283234.754 510950.903 5283222.063 510977.629 5283213.222 510986.789 5283209.461 510995.585 5283199.808 511013.361 5283202.064 511025.750 5283196.420 511043.924 5283187.230 511069.535 5283172.830 511086.886 5283162.305 511106.717 5283149.117 511110.471 5283147.790 511123.993 5283138.369 511140.221 5283126.731 511175.681 5283101.681 511193.260 5283090.156 511213.766 5283077.637 511233.067 5283067.227 511243.733 5283061.469 511267.011 5283050.733 511293.591 5283040.115 511311.985 5283033.816 511334.736 5283024.524 511367.164 5283016.029 511389.832 5283010.962 511401.538 5283009.984 511409.042 5283009.443 511428.027 5283007.480 511441.309 5283006.395 511457.967 5283005.317 511472.298 5283004.789 511498.634 5283004.507 511519.567 5283003.882 511526.096 5283003.339 511531.873 5283003.018 511539.527 5283002.477 511545.005 5283001.710 511564.744 5282998.304 511588.538 5282993.016 511611.283 5282987.283 511631.630 5282979.988 511645.668 5282976.126 511654.526 5282973.699 511671.572 5282966.175 511686.665 5282959.982 511702.663 5282951.234 511740.462 5282921.858 511763.377 5282942.910 511770.049 5282945.591 511775.076 5282945.712 511779.583 5282943.165 511782.505 5282944.949 511822.034 5282913.243 511824.515 5282911.248 511825.340 5282910.916 511826.241 5282910.807 511827.141 5282910.809 511828.042 5282910.921 511828.866 5282911.257 511829.691 5282911.592 511830.440 5282912.037 511831.114 5282912.595 511831.713 5282913.263 511832.236 5282914.042 511832.610 5282914.821 511834.212 5282938.608 511828.029 5282954.044 511852.613 5282966.320 511851.216 5282952.313 511852.850 5282923.198 511852.126 5282910.637 511851.185 5282893.853 511850.446 5282888.294 511847.448 5282886.733 511861.425 5282875.758 511865.183 5282872.543 511864.139 5282869.762 511863.398 5282864.982 511850.637 5282831.391 511855.517 5282829.845 511919.784 5282809.305 511922.636 5282808.421 511929.815 5282820.439 511934.810 5282836.231 511934.196 5282842.454 511933.661 5282847.454 511937.490 5282846.128 511987.718 5282830.005 512045.183 5282797.226 512047.224 5282790.006 512054.215 5282783.464 512068.803 5282767.934 512109.633 5282725.341 512137.673 5282699.393 512137.224 5282698.947 512127.865 5282689.592 512105.777 5282667.540 512077.698 5282639.586 512027.723 5282605.362 512115.531 5282523.078 512155.990 5282479.707 512176.683 5282451.520 512185.750 5282421.753 512184.438 5282403.302 512183.634 5282392.964 512173.659 5282390.720 512160.526 5282391.804 512152.346 5282392.454 512143.868 5282391.769 512137.797 5282388.756 512130.459 5282381.294 512122.314 5282365.272 512120.825 5282359.379 512117.723 5282335.811 512116.232 5282331.362 512114.442 5282326.024 512106.658 5282316.338 512088.172 5282293.294 512071.333 5282272.254 512071.943 5282267.253 512069.087 5282269.470 512066.231 5282271.687 512028.429 5282300.394 512012.880 5282308.253 512016.771 5282313.485 512014.291 5282315.147 511973.113 5282343.735 511888.879 5282402.022 511886.400 5282403.796 511894.263 5282411.369 511899.730 5282416.716 511894.169 5282420.372 511841.500 5282454.829 511796.419 5282484.522 511753.969 5282512.444 511746.470 5282510.206 511741.071 5282508.639 511686.251 5282494.081 511694.314 5282477.092 511696.197 5282473.428 511702.750 5282460.772 511711.105 5282447.896 511738.487 5282413.498 511743.978 5282406.619 511744.429 5282406.175 511765.490 5282381.211 511763.017 5282379.316 511749.906 5282369.732 511743.162 5282364.828 511736.719 5282360.147 511726.604 5282352.791 511722.708 5282349.894 511718.588 5282346.551 511708.999 5282338.641 511697.313 5282328.948 511688.698 5282321.818 511656.825 5282350.984 511646.115 5282340.737 511641.172 5282336.060 511637.428 5282332.496 511628.815 5282324.254 511626.793 5282322.361 511630.480 5282317.033 511655.817 5282292.189 511659.952 5282288.085 511665.065 5282283.094 511678.295 5282270.895 511681.228 5282267.789 511685.440 5282263.240 511693.862 5282254.478 511695.518 5282251.480 511697.702 5282247.594 511700.564 5282242.488 511700.278 5282235.485 511695.934 5282231.031 511675.107 5282214.429 511668.141 5282208.858 511656.378 5282199.499 511655.323 5282201.609 511646.583 5282219.818 511643.517 5282214.477 511638.433 5282205.131 511633.424 5282196.230 511628.486 5282188.662 511625.492 5282184.989 511604.915 5282155.718 511597.130 5282146.255 511594.059 5282143.581 511581.052 5282156.115 511570.147 5282168.652 511524.346 5282220.463 511514.122 5282230.335 511513.373 5282229.333 511510.441 5282232.106 511503.825 5282238.428 511499.089 5282242.975 511494.428 5282247.411 511498.100 5282250.086 511494.341 5282253.746 511497.716 5282254.530 511511.635 5282273.674 511512.682 5282275.010 511529.371 5282297.827 511457.163 5282347.475 511455.510 5282348.583 511450.344 5282342.794 511436.456 5282345.989 511434.353 5282346.986 511426.468 5282350.527 511340.249 5282390.813 511328.608 5282396.236 511329.596 5282389.903 511328.714 5282380.343 511327.464 5282367.115 511325.848 5282349.218 511324.598 5282336.323 511323.929 5282332.877 511319.990 5282313.086 511319.693 5282311.863 511312.526 5282293.066 511301.745 5282280.375 511296.954 5282274.809 511291.341 5282267.352 511283.706 5282257.334 511284.764 5282253.780 511294.018 5282240.906 511292.978 5282236.125 511290.492 5282240.565 511278.454 5282257.435 511275.218 5282261.986 511255.063 5282285.397 511236.636 5282307.812 511231.087 5282306.357 511227.336 5282305.682 511224.845 5282313.235 511215.962 5282328.111 511230.423 5282338.919 511233.118 5282342.592 511221.745 5282364.465 511214.143 5282376.676 511211.578 5282383.562 511210.070 5282387.781 511204.065 5282388.437 511190.330 5282390.411 511183.417 5282395.732 511179.133 5282399.058 511174.925 5282402.385 511165.544 5282403.033 511157.740 5282403.574 511154.738 5282403.791 511152.937 5282403.898 511141.757 5282404.099 511135.678 5282404.310 511131.101 5282404.412 511128.925 5282404.075 511118.424 5282402.610 511104.396 5282400.693 511101.470 5282400.354 511089.243 5282398.664 511086.467 5282398.325 511080.240 5282397.758 511073.414 5282397.078 511069.962 5282396.738 511066.136 5282396.397 511061.260 5282395.833 511059.010 5282395.606 511057.283 5282395.713 511050.680 5282396.146 511039.574 5282396.680 511026.516 5282397.433 511022.014 5282397.647 510986.814 5282401.915 510959.050 5282402.751 510955.674 5282402.412 510952.449 5282401.850 510947.575 5282399.729 510943.831 5282395.944 510938.813 5282391.044 510933.420 5282385.921 510930.130 5282380.136 510929.460 5282377.244 510920.751 5282379.673 510909.190 5282382.875 510897.776 5282387.077 510891.394 5282389.510 510889.817 5282390.174 510885.463 5282391.166 510879.232 5282392.599 510873.527 5282393.922 510866.246 5282395.576 510857.237 5282397.670 510851.007 5282398.992 510848.155 5282399.876 510842.148 5282401.755 510838.846 5282402.193 510827.664 5282403.506 510825.788 5282403.391 510808.981 5282402.693 510808.531 5282402.803 510808.599 5282406.471 510822.832 5282419.278 510813.278 5282432.375 510806.057 5282442.031 510800.565 5282450.023 510797.705 5282454.130 510795.449 5282457.349 510788.895 5282471.229 510784.601 5282480.446 510782.039 5282485.998 510775.109 5282500.656 510768.255 5282515.091 510791.113 5282529.471 510783.962 5282541.905 510754.432 5282524.291 510747.204 5282537.502 510732.063 5282529.139 510717.442 5282523.444 510673.654 5282506.248 510673.721 5282510.805 510667.942 5282511.128 510657.965 5282510.331 510657.652 5282517.333 510656.514 5282523.776 510654.250 5282530.886 510649.727 5282542.547 510640.757 5282565.203 510639.400 5282568.646 510634.576 5282580.751 510630.204 5282591.635 510627.112 5282599.965 510624.396 5282608.184 510622.963 5282612.294 510621.838 5282612.181 510618.064 5282624.288 510619.414 5282624.847 510617.825 5282631.846 510549.934 5282624.942 510551.844 5282606.163 510576.300 5282608.319 510576.532 5282604.763 510577.838 5282588.094 510591.567 5282589.009 510591.644 5282588.008 510592.639 5282577.118 510593.712 5282564.672 510609.767 5282566.035 510609.996 5282563.702 510612.669 5282538.256 510612.669 5282538.144 510597.515 5282536.561 510600.794 5282507.670 510590.137 5282509.096 510590.167 5282492.425 510590.197 5282476.087 510601.657 5282446.212 510580.052 5282443.616 510556.298 5282425.901 510547.009 5282417.549 510542.584 5282457.551 510515.900 5282441.944 510515.099 5282428.939 510511.743 5282417.708 510504.448 5282426.919 510497.602 5282436.576 510491.507 5282446.567 510485.935 5282457.005 510476.974 5282474.771 510470.575 5282486.651 510499.962 5282501.041 510503.560 5282502.826 510497.984 5282515.819 510495.268 5282523.928 510493.686 5282528.037 510489.685 5282541.367 510490.422 5282548.704 510487.948 5282547.365 510459.313 5282531.754 510444.847 5282523.948 510440.034 5282529.719 510433.042 5282537.042 510430.337 5282539.593 510426.729 5282543.254 510420.340 5282549.133 510413.351 5282555.345 510412.523 5282557.010 510411.017 5282560.230 510402.977 5282566.662 510388.926 5282577.862 510387.347 5282579.082 510386.897 5282579.414 510385.695 5282580.190 510370.218 5282591.387 510335.734 5282616.333 510332.128 5282618.882 510319.058 5282627.528 510316.428 5282629.302 510299.526 5282640.497 510293.967 5282644.155 510296.886 5282648.495 510280.951 5282664.471 510277.943 5282668.578 510273.424 5282677.794 510269.344 5282694.236 510267.148 5282705.234 510263.907 5282713.898 510263.604 5282715.120 510263.377 5282716.453 510263.225 5282717.675 510263.223 5282719.009 510263.370 5282720.232 510263.593 5282721.455 510263.891 5282722.678 510264.339 5282723.790 510264.938 5282724.903 510265.611 5282725.904 510266.360 5282726.906 510267.259 5282727.796 510268.158 5282728.576 510269.207 5282729.244 510275.655 5282732.034 510277.680 5282731.927 510294.480 5282736.180 510319.077 5282743.225 510330.178 5282745.135 510371.947 5282758.213 510421.891 5282772.528 510433.069 5282773.215 510437.278 5282769.110 510440.728 5282769.894 510443.879 5282769.677 510451.594 5282777.027 510456.388 5282781.481 510483.684 5282789.643 510497.626 5282797.004 510515.091 5282806.705 510521.912 5282810.162 510538.993 5282824.753 510547.382 5282832.658 510555.095 5282840.452 510564.231 5282849.916 510571.941 5282860.044 510578.827 5282869.392 510584.066 5282876.181 510583.381 5282881.403 510587.953 5282884.524 510600.925 5282888.771 510609.173 5282891.453 510610.264 5282910.460 510611.214 5282924.021 510612.964 5282951.810 510614.818 5282963.593 510616.679 5282971.710 510620.785 5282982.610 510624.294 5282992.174 510626.304 5283001.180 510625.627 5283001.734 510627.923 5283018.521 510628.366 5283021.967 510629.193 5283021.302 510629.255 5283028.526 510627.892 5283035.303 510625.548 5283045.079 510617.176 5283069.293 510614.676 5283082.291 510614.442 5283087.626 510615.542 5283101.187 510619.121 5283113.641 510620.026 5283110.753 510623.725 5283098.534 510628.700 5283085.873 510636.833 5283069.106 510646.017 5283052.452 510647.071 5283050.564 510659.938 5283029.582 510661.744 5283026.918 510662.271 5283026.030 510668.439 5283017.039 510673.630 5283009.380 510682.200 5283000.393 510689.191 5282993.071 510690.319 5282991.739 510696.330 5282986.749 510700.162 5282983.644 510703.392 5282981.428 510707.750 5282978.435 510711.130 5282976.107 510716.237 5282973.449 510725.249 5282968.686 510734.261 5282963.924 510736.814 5282962.595 510741.398 5282958.936 510754.471 5282948.624 510759.055 5282944.965 510762.211 5282942.526 510767.771 5282937.868 510775.286 5282931.547 510783.101 5282925.004 510792.043 5282917.464 510794.824 5282915.135 510809.395 5282906.604 510815.554 5282903.059 510818.933 5282901.398 510827.269 5282897.190 510834.028 5282893.869 510842.663 5282890.106 510848.519 5282887.672 510859.858 5282882.802 510876.897 5282878.611 510893.833 5282889.313 510902.658 5282904.889 510912.067 5282928.579 510898.536 5282942.558 510894.101 5282947.106 510893.273 5282947.882 510890.793 5282950.545 510879.968 5282961.750 510874.105 5282967.741 510873.653 5282968.296 510872.826 5282969.183 510868.317 5282973.398 510861.327 5282979.942 510858.170 5282982.826 510849.603 5282990.923 510848.250 5282992.143 510843.289 5282996.802 510840.659 5282999.242 510836.074 5283003.568 510829.385 5283009.779 510827.957 5283011.110 510821.644 5283016.989 510813.452 5283024.643 510810.821 5283027.083 510807.514 5283030.188 510805.711 5283031.852 510797.519 5283039.395 510791.356 5283045.051 510783.691 5283052.150 510775.950 5283059.249 510772.267 5283062.687 510765.803 5283068.566 510759.190 5283074.666 510758.364 5283075.331 510752.127 5283080.210 510735.147 5283093.182 510725.005 5283101.055 510719.671 5283104.601 510725.506 5283113.614 510732.326 5283117.850 510742.733 5283129.650 510751.118 5283139.001 510753.214 5283141.450 510760.327 5283149.466 510770.434 5283161.043 510774.701 5283165.941 510775.366 5283171.388 510776.169 5283183.615 510778.286 5283215.294 510782.197 5283250.421 510782.868 5283252.645 + + + + + + + + + diff --git a/autotest/ogr/data/gml/min_example/minimal_example.xsd b/autotest/ogr/data/gml/min_example/minimal_example.xsd new file mode 100644 index 000000000000..df213dd1a8a4 --- /dev/null +++ b/autotest/ogr/data/gml/min_example/minimal_example.xsd @@ -0,0 +1,5 @@ + + + + + diff --git a/autotest/ogr/data/gml/same_nested_property_name.gml b/autotest/ogr/data/gml/same_nested_property_name.gml new file mode 100644 index 000000000000..11dffc32bc8d --- /dev/null +++ b/autotest/ogr/data/gml/same_nested_property_name.gml @@ -0,0 +1,14 @@ + + + + + 0 0 + foo + bar + + + diff --git a/autotest/ogr/data/gmlas/test_ossfuzz_70511.xsd b/autotest/ogr/data/gmlas/test_ossfuzz_70511.xsd new file mode 100644 index 000000000000..045587271fa4 --- /dev/null +++ b/autotest/ogr/data/gmlas/test_ossfuzz_70511.xsd @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/autotest/ogr/data/kml/point_with_external_style.kml b/autotest/ogr/data/kml/point_with_external_style.kml new file mode 100644 index 000000000000..aee7354616d2 --- /dev/null +++ b/autotest/ogr/data/kml/point_with_external_style.kml @@ -0,0 +1,13 @@ + + + + + point + + my point + style_of_point_with_external_style/style.kml#myStyle + 2,49,0 + + + + diff --git a/autotest/ogr/data/kml/style_of_point_with_external_style/style.kml b/autotest/ogr/data/kml/style_of_point_with_external_style/style.kml new file mode 100644 index 000000000000..8131fdee5e29 --- /dev/null +++ b/autotest/ogr/data/kml/style_of_point_with_external_style/style.kml @@ -0,0 +1,14 @@ + + + + + diff --git a/autotest/ogr/data/mitab/utf8.mid b/autotest/ogr/data/mitab/utf8.mid new file mode 100644 index 000000000000..8a99fb046564 --- /dev/null +++ b/autotest/ogr/data/mitab/utf8.mid @@ -0,0 +1,3 @@ +"Значение Ð","Значение Б","Значение Ð’","Значение Г","Значение Д" +"Значение 1","Значение 2","Значение 3","Значение 4","Значение 5" +"Полигон","Синий","Заливка","Ра Б б","ЪЫÐЩ" diff --git a/autotest/ogr/data/mitab/utf8.mif b/autotest/ogr/data/mitab/utf8.mif new file mode 100644 index 000000000000..55f4f1eb9697 --- /dev/null +++ b/autotest/ogr/data/mitab/utf8.mif @@ -0,0 +1,31 @@ +Version 1520 +Charset "UTF-8" +Delimiter "," +CoordSys Earth Projection 8, 1001, "m", 39, 0, 1, 7500000, 0 Bounds (-749281.53901, -10002137.4978) (15749281.539, 10002137.4978) +Columns 5 + Поле_Ð Char(10) + Поле_Б Char(10) + Поле_Ð’ Char(10) + Поле_Г Char(10) + Поле_Д Char(10) +Data + +Point 7404648.72 6144520.22 + Symbol (35,16711680,12) +Pline 4 +7404638.32 6144512.27 +7404646.55 6144515.77 +7404653.33 6144520.94 +7404657.51 6144525.21 + Pen (2,2,65280) +Region 1 + 6 +7404649.37 6144522.85 +7404646.78 6144518.96 +7404642.44 6144519.88 +7404642.59 6144522.85 +7404645.79 6144523.76 +7404649.37 6144522.85 + Pen (1,2,0) + Brush (2,16777215,16777215) + Center 7404645.9 6144521.36 diff --git a/autotest/ogr/data/parquet/schema.json b/autotest/ogr/data/parquet/schema_1_1_0.json similarity index 52% rename from autotest/ogr/data/parquet/schema.json rename to autotest/ogr/data/parquet/schema_1_1_0.json index ad2fd9459437..26e0f59313aa 100644 --- a/autotest/ogr/data/parquet/schema.json +++ b/autotest/ogr/data/parquet/schema_1_1_0.json @@ -7,7 +7,7 @@ "properties": { "version": { "type": "string", - "const": "1.0.0" + "const": "1.1.0" }, "primary_column": { "type": "string", @@ -23,7 +23,7 @@ "properties": { "encoding": { "type": "string", - "const": "WKB" + "pattern": "^(WKB|point|linestring|polygon|multipoint|multilinestring|multipolygon)$" }, "geometry_types": { "type": "array", @@ -36,7 +36,7 @@ "crs": { "oneOf": [ { - "$ref": "https://proj.org/schemas/v0.5/projjson.schema.json" + "$ref": "https://proj.org/schemas/v0.7/projjson.schema.json" }, { "type": "null" @@ -71,6 +71,56 @@ }, "epoch": { "type": "number" + }, + "covering": { + "type": "object", + "required": [ + "bbox" + ], + "properties": { + "bbox": { + "type": "object", + "required": ["xmin", "xmax", "ymin", "ymax"], + "properties": { + "xmin": { + "type": "array", + "items": [ + { "type": "string", "minLength": 1 }, + { "const": "xmin" } + ], + "minItems": 2, + "maxItems": 2 + }, + "xmax": { + "type": "array", + "items": [ + { "type": "string", "minLength": 1 }, + { "const": "xmax" } + ], + "minItems": 2, + "maxItems": 2 + }, + "ymin": { + "type": "array", + "items": [ + { "type": "string", "minLength": 1 }, + { "const": "ymin" } + ], + "minItems": 2, + "maxItems": 2 + }, + "ymax": { + "type": "array", + "items": [ + { "type": "string", "minLength": 1 }, + { "const": "ymax" } + ], + "minItems": 2, + "maxItems": 2 + } + } + } + } } } } diff --git a/autotest/ogr/data/parquet/test_with_fid_and_geometry_bbox.parquet b/autotest/ogr/data/parquet/test_with_fid_and_geometry_bbox.parquet new file mode 100644 index 000000000000..79f577585eae Binary files /dev/null and b/autotest/ogr/data/parquet/test_with_fid_and_geometry_bbox.parquet differ diff --git a/autotest/ogr/data/shp/date_empty_string.dbf b/autotest/ogr/data/shp/date_empty_string.dbf new file mode 100644 index 000000000000..2aaa96f938aa Binary files /dev/null and b/autotest/ogr/data/shp/date_empty_string.dbf differ diff --git a/autotest/ogr/data/xlsx/with_xml_prefix.xlsx b/autotest/ogr/data/xlsx/with_xml_prefix.xlsx new file mode 100644 index 000000000000..4d23ef8ddf26 Binary files /dev/null and b/autotest/ogr/data/xlsx/with_xml_prefix.xlsx differ diff --git a/autotest/ogr/data/xodr/5g_living_lab_A39_Wolfsburg-West.xodr b/autotest/ogr/data/xodr/5g_living_lab_A39_Wolfsburg-West.xodr new file mode 100644 index 000000000000..57cc798a758c --- /dev/null +++ b/autotest/ogr/data/xodr/5g_living_lab_A39_Wolfsburg-West.xodr @@ -0,0 +1,7424 @@ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/autotest/ogr/ogr_arrow.py b/autotest/ogr/ogr_arrow.py index 5c2088f71165..cba6928589bc 100755 --- a/autotest/ogr/ogr_arrow.py +++ b/autotest/ogr/ogr_arrow.py @@ -738,38 +738,59 @@ def test_ogr_arrow_write_arrow_fid_in_input_but_not_in_output(tmp_vsimem): @gdaltest.enable_exceptions() -def test_ogr_arrow_write_arrow_fid_in_output_but_not_in_input(tmp_vsimem): +def test_ogr_arrow_ipc_read_stdin(tmp_path): - src_ds = ogr.Open("data/poly.shp") - src_lyr = src_ds.GetLayer(0) - - outfilename = str(tmp_vsimem / "poly.feather") - with ogr.GetDriverByName("Arrow").CreateDataSource(outfilename) as dst_ds: - dst_lyr = dst_ds.CreateLayer( + outfilename = str(tmp_path / "poly.bin") + with ogr.GetDriverByName("Arrow").CreateDataSource(outfilename) as ds: + lyr = ds.CreateLayer( "test", - srs=src_lyr.GetSpatialRef(), - geom_type=ogr.wkbPoint, - options=["GEOMETRY_ENCODING=WKB", "FID=my_fid"], + geom_type=ogr.wkbNone, + options=["FORMAT=STREAM"], ) + fld_defn = ogr.FieldDefn("foo") + fld_defn.SetComment("x" * (1024 * 1024)) + lyr.CreateField(fld_defn) + f = ogr.Feature(lyr.GetLayerDefn()) + f["foo"] = "bar" + lyr.CreateFeature(f) - stream = src_lyr.GetArrowStream(["INCLUDE_FID=NO"]) - schema = stream.GetSchema() + assert gdal.VSIStatL(outfilename).size > 1024 * 1024 - success, error_msg = dst_lyr.IsArrowSchemaSupported(schema) - assert success + # By default, as the header section is larger than 1 MB, we can't + # identify /vsistdin/ + with gdaltest.config_options( + { + "CPL_VSISTDIN_FILE": outfilename, + "CPL_VSISTDIN_RESET_POSITION": "YES", + "CPL_VSISTDIN_FILE_CLOSE": "YES", + } + ): + with pytest.raises(Exception): + gdal.Open("/vsistdin/") - for i in range(schema.GetChildrenCount()): - if schema.GetChild(i).GetName() not in ("wkb_geometry", "OGC_FID"): - dst_lyr.CreateFieldFromArrowSchema(schema.GetChild(i)) + with gdaltest.config_options( + { + "CPL_VSISTDIN_FILE": outfilename, + "CPL_VSISTDIN_RESET_POSITION": "YES", + "CPL_VSISTDIN_FILE_CLOSE": "YES", + } + ): + ds = gdal.OpenEx("/vsistdin/", allowed_drivers=["ARROW"]) + lyr = ds.GetLayer(0) + f = lyr.GetNextFeature() + assert f["foo"] == "bar" - while True: - array = stream.GetNextRecordBatch() - if array is None: - break - assert dst_lyr.WriteArrowBatch(schema, array) == ogr.OGRERR_NONE - ds = ogr.Open(outfilename) - lyr = ds.GetLayer(0) - src_lyr.ResetReading() - for i in range(src_lyr.GetFeatureCount()): - assert str(src_lyr.GetNextFeature()) == str(lyr.GetNextFeature()) +############################################################################### + + +@gdaltest.enable_exceptions() +def test_ogr_arrow_vsi_arrow_file_system(): + + version = int( + ogr.GetDriverByName("ARROW").GetMetadataItem("ARROW_VERSION").split(".")[0] + ) + if version < 16: + pytest.skip("requires Arrow >= 16.0.0") + + ogr.Open("vsi://data/arrow/test.feather") diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py index 0d861ffa26d3..6b8924722eee 100755 --- a/autotest/ogr/ogr_csv.py +++ b/autotest/ogr/ogr_csv.py @@ -27,6 +27,7 @@ # Boston, MA 02111-1307, USA. ############################################################################### +import math import pathlib import sys @@ -3089,6 +3090,96 @@ def test_ogr_csv_geom_coord_precision_OGR_APPLY_GEOM_SET_PRECISION(tmp_vsimem): assert b"MULTIPOLYGON" in data +############################################################################### +# Test invalid GEOMETRY option + + +@gdaltest.enable_exceptions() +def test_ogr_csv_invalid_geometry_option(tmp_vsimem): + + filename = str(tmp_vsimem / "test.csv") + ds = gdal.GetDriverByName("CSV").Create(filename, 0, 0, 0, gdal.GDT_Unknown) + with pytest.raises( + Exception, + match="Geometry type 3D Line String is not compatible with GEOMETRY=AS_XYZ", + ): + ds.CreateLayer( + "test", geom_type=ogr.wkbLineString25D, options=["GEOMETRY=AS_XYZ"] + ) + + filename = str(tmp_vsimem / "test2.csv") + ds = gdal.GetDriverByName("CSV").Create(filename, 0, 0, 0, gdal.GDT_Unknown) + with gdal.quiet_errors(), pytest.raises( + Exception, match="Unsupported value foo for creation option GEOMETRY" + ): + ds.CreateLayer("test", geom_type=ogr.wkbLineString25D, options=["GEOMETRY=foo"]) + + +############################################################################### +# Test force opening a CSV file + + +@gdaltest.enable_exceptions() +def test_ogr_csv_force_opening(tmp_vsimem): + + filename = str(tmp_vsimem / "test.bin") + + with gdaltest.vsi_open(filename, "wb") as fdest: + fdest.write(b"foo\nbar\n") + + with pytest.raises(Exception): + gdal.OpenEx(filename) + + ds = gdal.OpenEx(filename, allowed_drivers=["CSV"]) + assert ds.GetDriver().GetDescription() == "CSV" + + +############################################################################### +# Test opening a CSV file with inf/nan numeric values + + +@gdaltest.enable_exceptions() +def test_ogr_csv_inf_nan(): + + ds = gdal.OpenEx("data/csv/inf_nan.csv", open_options=["AUTODETECT_TYPE=YES"]) + lyr = ds.GetLayer(0) + assert lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTReal + f = lyr.GetNextFeature() + assert f["v"] == 10.0 + f = lyr.GetNextFeature() + assert f["v"] == float("inf") + f = lyr.GetNextFeature() + assert f["v"] == float("-inf") + f = lyr.GetNextFeature() + assert math.isnan(f["v"]) + + +############################################################################### +# Test reading invalid WKT + + +@gdaltest.enable_exceptions() +def test_ogr_csv_invalid_wkt(tmp_vsimem): + + filename = str(tmp_vsimem / "test.csv") + + with gdaltest.vsi_open(filename, "wb") as fdest: + fdest.write(b"id,WKT\n") + fdest.write(b'1,"POINT (1"\n') + fdest.write(b'1,"POINT (1 2)"\n') + + ds = ogr.Open(filename) + lyr = ds.GetLayer(0) + gdal.ErrorReset() + with gdal.quiet_errors(): + f = lyr.GetNextFeature() + assert gdal.GetLastErrorMsg() == "Ignoring invalid WKT: POINT (1" + assert f.GetGeometryRef() is None + f = lyr.GetNextFeature() + assert gdal.GetLastErrorMsg() == "" + assert f.GetGeometryRef().ExportToWkt() == "POINT (1 2)" + + ############################################################################### diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py index 9878ad6d6be4..154a1cab5030 100755 --- a/autotest/ogr/ogr_db2_hack.py +++ b/autotest/ogr/ogr_db2_hack.py @@ -44,14 +44,12 @@ def test_ogr_db2_hack_1(): # XDR Case. geom = ogr.CreateGeometryFromWkt("POINT(10 20)") wkb = geom.ExportToWkb(byte_order=ogr.wkbXDR).decode("latin1") - geom.Destroy() assert wkb[0] == "0", "WKB wkbXDR point geometry has wrong byte order" # NDR Case. geom = ogr.CreateGeometryFromWkt("POINT(10 20)") wkb = geom.ExportToWkb(byte_order=ogr.wkbNDR).decode("latin1") - geom.Destroy() assert wkb[0] == "1", "WKB wkbNDR point geometry has wrong byte order" @@ -65,14 +63,12 @@ def test_ogr_db2_hack_1(): # XDR Case. geom = ogr.CreateGeometryFromWkt("POINT(10 20)") wkb = geom.ExportToWkb(byte_order=ogr.wkbXDR).decode("latin1") - geom.Destroy() assert wkb[0] == chr(0), "WKB wkbXDR point geometry has wrong byte order" # NDR Case. geom = ogr.CreateGeometryFromWkt("POINT(10 20)") wkb = geom.ExportToWkb(byte_order=ogr.wkbNDR).decode("latin1") - geom.Destroy() assert wkb[0] == chr(1), "WKB wkbNDR point geometry has wrong byte order" @@ -90,7 +86,6 @@ def test_ogr_db2_hack_3(): geom = ogr.CreateGeometryFromWkt(wkt) wkb = geom.ExportToWkb() - geom.Destroy() # Check primary byte order value. assert ( @@ -107,6 +102,4 @@ def test_ogr_db2_hack_3(): "Conversion to/from DB2 format seems to have " "corrupted geometry." ) - geom.Destroy() - ogr.SetGenerate_DB2_V72_BYTE_ORDER(0) diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py index 1e11b9d389e8..d2ecbd72d34d 100644 --- a/autotest/ogr/ogr_dxf.py +++ b/autotest/ogr/ogr_dxf.py @@ -3890,12 +3890,21 @@ def test_ogr_dxf_54(): # Test hidden objects in blocks -def test_ogr_dxf_55(): - - with gdaltest.config_option("DXF_MERGE_BLOCK_GEOMETRIES", "FALSE"): - ds = ogr.Open("data/dxf/block-hidden-entities.dxf") +@pytest.mark.parametrize("use_config_option", [True, False]) +def test_ogr_dxf_55(use_config_option): + + if use_config_option: + with gdaltest.config_option("DXF_MERGE_BLOCK_GEOMETRIES", "FALSE"): + ds = ogr.Open("data/dxf/block-hidden-entities.dxf") + else: + ds = gdal.OpenEx( + "data/dxf/block-hidden-entities.dxf", + open_options={"MERGE_BLOCK_GEOMETRIES": False}, + ) lyr = ds.GetLayer(0) + assert lyr.GetFeatureCount() == 6 + # Red features should be hidden, black features should be visible for number, f in enumerate(lyr): assert "#ff000000)" in f.GetStyleString() or "#000000)" in f.GetStyleString(), ( @@ -3993,3 +4002,30 @@ def test_ogr_dxf_read_broken_file_2(): lyr = ds.GetLayer(0) for f in lyr: pass + + +############################################################################### + + +def test_ogr_dxf_read_closed_polyline_with_bulge(): + """Test https://github.com/OSGeo/gdal/issues/10153""" + + ds = ogr.Open("data/dxf/closed_polyline_with_bulge.dxf") + lyr = ds.GetLayer(0) + f = lyr.GetNextFeature() + g = f.GetGeometryRef() + assert g.GetX(0) == g.GetX(g.GetPointCount() - 1) + assert g.GetY(0) == g.GetY(g.GetPointCount() - 1) + assert ( + g.ExportToWkt() + == "LINESTRING (40585366.7065058 3433935.53809098,40585329.9256486 3433998.44081707,40585329.9256486 3433998.44081707,40585328.5387678 3434000.63680805,40585327.0051198 3434002.73293274,40585325.3318693 3434004.71939884,40585323.526833 3434006.58692634,40585321.5984435 3434008.32679087,40585319.5557093 3434009.93086443,40585317.4081735 3434011.39165342,40585315.1658683 3434012.70233358,40585312.8392691 3434013.85678191,40585310.4392448 3434014.84960528,40585307.9770074 3434015.67616559,40585305.4640596 3434016.33260146,40585302.9121409 3434016.81584629,40585300.3331728 3434017.12364253,40585297.7392033 3434017.25455227,40585271.1313178 3434017.68678191,40585252.1698149 3433885.99037548,40585256.74147 3433885.9161116,40585256.74147 3433885.9161116,40585266.2920614 3433886.0916242,40585275.8076317 3433886.92740148,40585285.2425893 3433888.41943902,40585294.551729 3433890.56058809,40585303.6904483 3433893.34058991,40585312.6149614 3433896.74612477,40585321.2825086 3433900.76087591,40585329.6515615 3433905.36560764,40585364.2483736 3433925.99220872,40585364.2483736 3433925.99220872,40585364.6481964 3433926.24937651,40585365.0296424 3433926.53308859,40585365.3909523 3433926.84203644,40585365.7304596 3433927.17479516,40585366.0465985 3433927.52983003,40585366.337911 3433927.90550359,40585366.6030535 3433928.30008319,40585366.840803 3433928.71174899,40585367.0500632 3433929.13860232,40585367.2298688 3433929.5786745,40585367.3793906 3433930.02993587,40585367.4979389 3433930.49030515,40585367.5849671 3433930.95765907,40585367.6400736 3433931.42984214,40585367.6630045 3433931.9046766,40585367.6536538 3433932.37997246,40585367.6120647 3433932.85353759,40585367.5384291 3433933.32318787,40585367.4330866 3433933.7867572,40585367.2965229 3433934.24210757,40585367.129368 3433934.68713883,40585366.9323928 3433935.11979846,40585366.7065058 3433935.53809098)" + ) + + ds = gdal.OpenEx( + "data/dxf/closed_polyline_with_bulge.dxf", + open_options=["CLOSED_LINE_AS_POLYGON=YES"], + ) + lyr = ds.GetLayer(0) + f = lyr.GetNextFeature() + g = f.GetGeometryRef() + assert g.GetGeometryType() == ogr.wkbPolygon diff --git a/autotest/ogr/ogr_esrijson.py b/autotest/ogr/ogr_esrijson.py index 0f5eda1c2e48..0c96b870f6d6 100755 --- a/autotest/ogr/ogr_esrijson.py +++ b/autotest/ogr/ogr_esrijson.py @@ -101,6 +101,15 @@ def test_ogr_esrijson_read_point(): rc = validate_layer(lyr, "esripoint", 1, ogr.wkbPoint, 7, extent) assert rc + layer_defn = lyr.GetLayerDefn() + + fld_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("objectid")) + assert fld_defn.GetAlternativeName() == "Object ID" + + fld_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("fooDate")) + assert fld_defn.GetType() == ogr.OFTDateTime + assert fld_defn.GetWidth() == 0 + ref = lyr.GetSpatialRef() gcs = int(ref.GetAuthorityCode("GEOGCS")) @@ -682,3 +691,51 @@ def test_ogr_esrijson_identify_srs(): sr = lyr.GetSpatialRef() assert sr assert sr.GetAuthorityCode(None) == "2223" + + +############################################################################### +# Test for https://github.com/OSGeo/gdal/issues/9996 + + +def test_ogr_esrijson_read_CadastralSpecialServices(): + + ds = ogr.Open("data/esrijson/GetLatLon.json") + lyr = ds.GetLayer(0) + sr = lyr.GetSpatialRef() + assert sr + assert sr.GetAuthorityCode(None) == "4326" + assert lyr.GetGeomType() != ogr.wkbNone + f = lyr.GetNextFeature() + assert f["landdescription"] == "WA330160N0260E0SN070" + assert f.GetGeometryRef().GetGeometryType() == ogr.wkbPolygon + + +############################################################################### +# Test force opening a ESRIJSON file + + +def test_ogr_esrijson_force_opening(tmp_vsimem): + + filename = str(tmp_vsimem / "test.json") + + with open("data/esrijson/esripoint.json", "rb") as fsrc: + with gdaltest.vsi_open(filename, "wb") as fdest: + fdest.write(fsrc.read(1)) + fdest.write(b" " * (1000 * 1000)) + fdest.write(fsrc.read()) + + with pytest.raises(Exception): + gdal.OpenEx(filename) + + ds = gdal.OpenEx(filename, allowed_drivers=["ESRIJSON"]) + assert ds.GetDriver().GetDescription() == "ESRIJSON" + + +############################################################################### +# Test force opening a URL as ESRIJSON + + +def test_ogr_esrijson_force_opening_url(): + + drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["ESRIJSON"]) + assert drv.GetDescription() == "ESRIJSON" diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py index 24e7af30bf3d..12c47f51e3bb 100755 --- a/autotest/ogr/ogr_fgdb.py +++ b/autotest/ogr/ogr_fgdb.py @@ -3143,3 +3143,30 @@ def test_ogr_filegdb_write_geom_coord_precision(tmp_path): "HighPrecision": "true", } } + + +############################################################################### +# Test dummy use of CreateLayerFromGeomFieldDefn() with a geometry field +# definition of type wkbNone + + +def test_ogr_filegdb_CreateLayerFromGeomFieldDefn_geom_type_none(tmp_path): + + filename = str(tmp_path / "test.gdb") + ds = gdal.GetDriverByName("FileGDB").Create(filename, 0, 0, 0, gdal.GDT_Unknown) + geom_fld = ogr.GeomFieldDefn("geometry", ogr.wkbNone) + ds.CreateLayerFromGeomFieldDefn("test", geom_fld) + ds.Close() + + ds = ogr.Open(filename) + lyr = ds.GetLayer(0) + assert lyr.GetGeomType() == ogr.wkbNone + ds.Close() + + filename2 = str(tmp_path / "test2.gdb") + gdal.VectorTranslate(filename2, filename, format="FileGDB") + + ds = ogr.Open(filename2) + lyr = ds.GetLayer(0) + assert lyr.GetGeomType() == ogr.wkbNone + ds.Close() diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py index f905273b2939..5cc7b962ffb5 100755 --- a/autotest/ogr/ogr_geojson.py +++ b/autotest/ogr/ogr_geojson.py @@ -1591,7 +1591,7 @@ def test_ogr_geojson_46(tmp_vsimem): ############################################################################### -# Test update support +# Test SetFeature() support @gdaltest.disable_exceptions() @@ -1764,7 +1764,7 @@ def test_ogr_geojson_47(tmp_vsimem): ############################################################################### -# Test update support with file that has a single feature not in a FeatureCollection +# Test SetFeature() support with file that has a single feature not in a FeatureCollection def test_ogr_geojson_48(tmp_vsimem): @@ -1802,6 +1802,34 @@ def test_ogr_geojson_48(tmp_vsimem): ) +############################################################################### +# Test UpdateFeature() support + + +def test_ogr_geojson_update_feature(tmp_vsimem): + + filename = str(tmp_vsimem / "test.json") + + with ogr.GetDriverByName("GeoJSON").CreateDataSource(filename) as ds: + lyr = ds.CreateLayer("test") + lyr.CreateField(ogr.FieldDefn("int64list", ogr.OFTInteger64List)) + f = ogr.Feature(lyr.GetLayerDefn()) + f["int64list"] = [123456790123, -123456790123] + lyr.CreateFeature(f) + + with ogr.Open(filename, update=1) as ds: + lyr = ds.GetLayer(0) + f = ogr.Feature(lyr.GetLayerDefn()) + f.SetFID(0) + f["int64list"] = [123456790123, -123456790123] + lyr.UpdateFeature(f, [0], [], False) + + with ogr.Open(filename) as ds: + lyr = ds.GetLayer(0) + f = lyr.GetNextFeature() + assert f["int64list"] == [123456790123, -123456790123] + + ############################################################################### # Test ARRAY_AS_STRING @@ -4280,6 +4308,28 @@ def test_ogr_geojson_test_ogrsf(): assert "ERROR" not in ret +############################################################################### +# Run test_ogrsf + + +def test_ogr_geojson_test_ogrsf_update(tmp_path): + + import test_cli_utilities + + if test_cli_utilities.get_test_ogrsf_path() is None: + pytest.skip() + + filename = str(tmp_path / "out.json") + gdal.VectorTranslate(filename, "data/poly.shp", format="GeoJSON") + + ret = gdaltest.runexternal( + test_cli_utilities.get_test_ogrsf_path() + f" {filename}" + ) + + assert "INFO" in ret + assert "ERROR" not in ret + + ############################################################################### # Test fix for https://github.com/OSGeo/gdal/issues/7313 @@ -4437,6 +4487,7 @@ def test_ogr_geojson_write_geometry_validity_fixing_rfc7946(tmp_vsimem): lyr = ds.GetLayer(0) f = lyr.GetNextFeature() assert f.GetGeometryRef().IsValid() + assert "((6.3889058 51.3181847," in f.GetGeometryRef().ExportToWkt() ############################################################################### @@ -5201,3 +5252,52 @@ def test_ogr_geojson_identify_jsonfg_with_geojson(): "data/jsonfg/crs_none.json", allowed_drivers=["GeoJSON", "JSONFG"] ) assert drv.GetDescription() == "JSONFG" + + +############################################################################### +# Test opening a file that has a "type: "Topology" feature property + + +def test_ogr_geojson_feature_with_type_Topology_property(): + + ds = gdal.OpenEx("data/geojson/feature_with_type_Topology_property.json") + assert ds.GetDriver().GetDescription() == "GeoJSON" + + +############################################################################### +# Test force opening a GeoJSON file + + +def test_ogr_geojson_force_opening(tmp_vsimem): + + filename = str(tmp_vsimem / "test.json") + + with gdaltest.vsi_open(filename, "wb") as f: + f.write( + b"{" + + b" " * (1000 * 1000) + + b' "type": "FeatureCollection", "features":[]}' + ) + + with pytest.raises(Exception): + gdal.OpenEx(filename) + + ds = gdal.OpenEx(filename, allowed_drivers=["GeoJSON"]) + assert ds.GetDriver().GetDescription() == "GeoJSON" + + drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["GeoJSON"]) + assert drv.GetDescription() == "GeoJSON" + + +############################################################################### +# Test force opening a STACTA file with GeoJSON + + +def test_ogr_geojson_force_opening_stacta(): + + if gdal.GetDriverByName("STACTA"): + ds = gdal.OpenEx("../gdrivers/data/stacta/test.json") + assert ds.GetDriver().GetDescription() == "STACTA" + + ds = gdal.OpenEx("../gdrivers/data/stacta/test.json", allowed_drivers=["GeoJSON"]) + assert ds.GetDriver().GetDescription() == "GeoJSON" diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py index b60a8969aa11..5d0862999e21 100755 --- a/autotest/ogr/ogr_geojsonseq.py +++ b/autotest/ogr/ogr_geojsonseq.py @@ -490,3 +490,28 @@ def test_ogr_geojsonseq_geom_coord_precision_not_4326(tmp_vsimem): gdal.VSIFCloseL(f) assert b'"coordinates": [ 2.363925, 45.151706, 9.877 ]' in data + + +############################################################################### +# Test force opening a GeoJSONSeq file + + +def test_ogr_geojsonseq_force_opening(tmp_vsimem): + + filename = str(tmp_vsimem / "test.json") + + with gdaltest.vsi_open(filename, "wb") as f: + f.write( + b"{" + + b" " * (1000 * 1000) + + b' "type": "Feature", "properties":{},"geometry":null}\n' + ) + + with pytest.raises(Exception): + gdal.OpenEx(filename) + + ds = gdal.OpenEx(filename, allowed_drivers=["GeoJSONSeq"]) + assert ds.GetDriver().GetDescription() == "GeoJSONSeq" + + drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["GeoJSONSeq"]) + assert drv.GetDescription() == "GeoJSONSeq" diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py index 51245d12808f..39cd29a1db86 100755 --- a/autotest/ogr/ogr_geom.py +++ b/autotest/ogr/ogr_geom.py @@ -982,50 +982,38 @@ def test_ogr_geom_flattenTo2D_triangle(): ############################################################################### +@gdaltest.enable_exceptions() def test_ogr_geom_linestring_limits(): geom = ogr.CreateGeometryFromWkt("LINESTRING EMPTY") assert geom.Length() == 0 - gdal.ErrorReset() - with gdal.quiet_errors(): + with pytest.raises(Exception): geom.GetPoint(-1) - assert gdal.GetLastErrorType() != 0 - gdal.ErrorReset() - with gdal.quiet_errors(): + with pytest.raises(Exception): geom.GetPoint(0) - assert gdal.GetLastErrorType() != 0 - gdal.ErrorReset() - with gdal.quiet_errors(): + with pytest.raises(Exception): geom.GetPoint_2D(-1) - assert gdal.GetLastErrorType() != 0 - gdal.ErrorReset() - with gdal.quiet_errors(): + with pytest.raises(Exception): geom.GetPoint_2D(0) - assert gdal.GetLastErrorType() != 0 - gdal.ErrorReset() - with gdal.quiet_errors(): + with pytest.raises(Exception): geom.SetPoint(-1, 5, 6, 7) - assert gdal.GetLastErrorType() != 0 - gdal.ErrorReset() - with gdal.quiet_errors(): + with pytest.raises(Exception): geom.SetPoint_2D(-1, 5, 6) - assert gdal.GetLastErrorType() != 0 - gdal.ErrorReset() - with gdal.quiet_errors(): - geom.SetPoint(2147000000, 5, 6, 7) - assert gdal.GetLastErrorType() != 0 + with pytest.raises(Exception): + geom.SetPoint((1 << 31) - 2, 5, 6, 7) - gdal.ErrorReset() - with gdal.quiet_errors(): - geom.SetPoint_2D(2147000000, 5, 6) - assert gdal.GetLastErrorType() != 0 + with pytest.raises(Exception): + geom.SetPoint_2D((1 << 31) - 2, 5, 6) + + with pytest.raises(Exception): + geom.SetPoint_2D((1 << 31) - 1, 5, 6) geom = ogr.CreateGeometryFromWkt("LINESTRING(0 0)") assert geom.Length() == 0 @@ -4519,3 +4507,13 @@ def test_ogr_geom_buffer_with_args(): with pytest.raises(Exception, match="Unsupported buffer option"): geom.Buffer(1, {"QUALITY": "HIGH"}) + + +def test_ogr_subgeom_use_after_parent_free(): + + g = ogr.CreateGeometryFromWkt("POLYGON ((0 0, 1 0, 1 1, 0 0))") + + exterior_ring = g.GetGeometryRef(0) + del g + + assert exterior_ring.GetPointCount() > 0 # does not crash diff --git a/autotest/ogr/ogr_geos.py b/autotest/ogr/ogr_geos.py index 343d28bf7967..fee81566d24f 100755 --- a/autotest/ogr/ogr_geos.py +++ b/autotest/ogr/ogr_geos.py @@ -309,6 +309,19 @@ def test_ogr_geos_centroid_point_empty(): ############################################################################### +def test_ogr_geos_centroid_polygon_with_empty_interior_ring(): + + g = ogr.CreateGeometryFromWkt("POLYGON((0 0,0 1,1 1,1 0,0 0))") + g.AddGeometry(ogr.Geometry(ogr.wkbLinearRing)) + + centroid = g.Centroid() + + assert centroid.ExportToWkt() == "POINT (0.5 0.5)" + + +############################################################################### + + @pytest.mark.require_geos(3, 12) def test_ogr_geos_pointzm_empty(): diff --git a/autotest/ogr/ogr_gml.py b/autotest/ogr/ogr_gml.py index 0d592827c032..d4624b100a7b 100755 --- a/autotest/ogr/ogr_gml.py +++ b/autotest/ogr/ogr_gml.py @@ -1362,6 +1362,35 @@ def test_ogr_gml_38(tmp_path, resolver): ds = None +############################################################################### +# Test GML_SKIP_RESOLVE_ELEMS=HUGE with a file with 2 nested identical property +# names + + +@pytest.mark.require_driver("SQLite") +@pytest.mark.require_geos +def test_ogr_gml_huge_resolver_same_nested_property_name(tmp_path): + + shutil.copy( + "data/gml/same_nested_property_name.gml", + tmp_path, + ) + + def check_ds(ds): + lyr = ds.GetLayer(0) + f = lyr.GetNextFeature() + assert f["gml_id"] == "test.0" + assert f["test"] == "foo" + assert f["bar|test"] == "bar" + + ds = ogr.Open(tmp_path / "same_nested_property_name.gml") + check_ds(ds) + + with gdal.config_option("GML_SKIP_RESOLVE_ELEMS", "HUGE"): + ds = ogr.Open(tmp_path / "same_nested_property_name.gml") + check_ds(ds) + + ############################################################################### # Test parsing XSD where simpleTypes not inlined, but defined elsewhere in the .xsd (#4328) @@ -4327,3 +4356,273 @@ def test_ogr_gml_geom_link_to_immediate_child(): "data/gml/link_to_immediate_child.gml", open_options=["WRITE_GFS=NO"] ) assert ds + + +############################################################################### +# Test scenario of https://github.com/OSGeo/gdal/issues/10332 + + +@pytest.mark.parametrize("use_create_geom_field", [False, True]) +@pytest.mark.parametrize("has_srs", [False, True]) +def test_ogr_gml_ogr2ogr_from_layer_with_name_geom_field( + tmp_vsimem, use_create_geom_field, has_srs +): + + ds = gdal.GetDriverByName("Memory").Create("", 0, 0, 0, gdal.GDT_Unknown) + if has_srs: + srs = osr.SpatialReference() + srs.ImportFromEPSG(4326) + srs.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER) + else: + srs = None + if use_create_geom_field: + lyr = ds.CreateLayer("test", geom_type=ogr.wkbNone) + my_geom_field = ogr.GeomFieldDefn("my_geom", ogr.wkbUnknown) + my_geom_field.SetSpatialRef(srs) + lyr.CreateGeomField(my_geom_field) + else: + lyr = ds.CreateLayer("test", geom_type=ogr.wkbUnknown, srs=srs) + f = ogr.Feature(lyr.GetLayerDefn()) + f.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT(2 49)")) + lyr.CreateFeature(f) + f = ogr.Feature(lyr.GetLayerDefn()) + f.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT(3 50)")) + lyr.CreateFeature(f) + + out_filename = str(tmp_vsimem / "out.gml") + gdal.VectorTranslate(out_filename, ds, format="GML") + + f = gdal.VSIFOpenL(out_filename, "rb") + assert f + try: + data = gdal.VSIFReadL(1, 10000, f) + finally: + gdal.VSIFCloseL(f) + + if has_srs: + assert ( + b'49 250 3' + in data + ) + else: + assert ( + b"2 493 50" + in data + ) + + +############################################################################### + + +@pytest.mark.parametrize("first_layer_has_srs", [False, True]) +def test_ogr_gml_ogr2ogr_from_layers_with_inconsistent_srs( + tmp_vsimem, first_layer_has_srs +): + + ds = gdal.GetDriverByName("Memory").Create("", 0, 0, 0, gdal.GDT_Unknown) + srs = osr.SpatialReference() + srs.ImportFromEPSG(4326) + srs.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER) + lyr = ds.CreateLayer( + "test", geom_type=ogr.wkbUnknown, srs=(srs if first_layer_has_srs else None) + ) + f = ogr.Feature(lyr.GetLayerDefn()) + f.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT(2 49)")) + lyr.CreateFeature(f) + + lyr = ds.CreateLayer( + "test2", geom_type=ogr.wkbUnknown, srs=(None if first_layer_has_srs else srs) + ) + f = ogr.Feature(lyr.GetLayerDefn()) + f.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT(3 50)")) + lyr.CreateFeature(f) + + out_filename = str(tmp_vsimem / "out.gml") + gdal.VectorTranslate(out_filename, ds, format="GML") + + f = gdal.VSIFOpenL(out_filename, "rb") + assert f + try: + data = gdal.VSIFReadL(1, 10000, f) + finally: + gdal.VSIFCloseL(f) + + assert b"" in data + + +#################################################################################### +# Test if gml can access and use imported schemas along with included schemas +# Open option is set to NO to disable the functionality + + +def test_ogr_gml_USE_SCHEMA_IMPORT_NO(tmp_path): + + # copy schema files and gml + shutil.copy("data/gml/min_example/ft1_schema.xsd", tmp_path) + shutil.copy("data/gml/min_example/ft2_schema.xsd", tmp_path) + shutil.copy("data/gml/min_example/minimal_example.xsd", tmp_path) + shutil.copy("data/gml/min_example/minimal_example.gml", tmp_path) + + ds = gdal.OpenEx( + tmp_path / "minimal_example.gml", open_options=["USE_SCHEMA_IMPORT=NO"] + ) + layer_count = ds.GetLayerCount() + assert ( + layer_count != 2 + ), f"Expected number of layers as '1' without open option set, but got {layer_count} " + + +############################################################################### +# Test if gml can access and use imported schemas along with included schemas +# Open option is set to YES to enable the functionality + + +def test_ogr_gml_USE_SCHEMA_IMPORT_YES(tmp_path): + + # copy schema files and gml + shutil.copy("data/gml/min_example/ft1_schema.xsd", tmp_path) + shutil.copy("data/gml/min_example/ft2_schema.xsd", tmp_path) + shutil.copy("data/gml/min_example/minimal_example.xsd", tmp_path) + shutil.copy("data/gml/min_example/minimal_example.gml", tmp_path) + + ds = gdal.OpenEx( + tmp_path / "minimal_example.gml", open_options=["USE_SCHEMA_IMPORT=YES"] + ) + + layer_count = ds.GetLayerCount() + assert ( + layer_count == 2 + ), f"Expected number of layers as '2' with open option set, but got {layer_count} " + + +############################################################################### +# Test if gml can access and use imported schemas along with included schemas +# Config option is set to YES to enable the functionality + + +def test_ogr_gml_GML_USE_SCHEMA_IMPORT_YES(tmp_path): + + # copy schema files and gml + shutil.copy("data/gml/min_example/ft1_schema.xsd", tmp_path) + shutil.copy("data/gml/min_example/ft2_schema.xsd", tmp_path) + shutil.copy("data/gml/min_example/minimal_example.xsd", tmp_path) + shutil.copy("data/gml/min_example/minimal_example.gml", tmp_path) + + with gdal.config_option("GML_USE_SCHEMA_IMPORT", "YES"): + ds = ogr.Open(tmp_path / "minimal_example.gml") + + layer_count = ds.GetLayerCount() + assert ( + layer_count == 2 + ), f"Expected number of layers as '2' with config option set, but got {layer_count} " + + +############################################################################### +# Test if gml can access and use imported schemas along with included schemas +# Config option is set to NO to disable the functionality + + +def test_ogr_gml_GML_USE_SCHEMA_IMPORT_NO(tmp_path): + + # copy schema files and gml + shutil.copy("data/gml/min_example/ft1_schema.xsd", tmp_path) + shutil.copy("data/gml/min_example/ft2_schema.xsd", tmp_path) + shutil.copy("data/gml/min_example/minimal_example.xsd", tmp_path) + shutil.copy("data/gml/min_example/minimal_example.gml", tmp_path) + + with gdal.config_option("GML_USE_SCHEMA_IMPORT", "NO"): + ds = ogr.Open(tmp_path / "minimal_example.gml") + + layer_count = ds.GetLayerCount() + assert ( + layer_count == 1 + ), f"Expected number of layers as '1' without config option set, but got {layer_count} " + + +######################################################################################################## +# Test if gml can access and use imported schemas along with included schemas with some features testing +# Open option is set to TRUE to enable the functionality + + +def test_ogr_gml_get_layers_by_name_from_imported_schema(tmp_path): + + # copy schema files and gml + shutil.copy("data/gml/min_example/ft1_schema.xsd", tmp_path) + shutil.copy("data/gml/min_example/ft2_schema.xsd", tmp_path) + shutil.copy("data/gml/min_example/minimal_example.xsd", tmp_path) + shutil.copy("data/gml/min_example/minimal_example.gml", tmp_path) + + ds = gdal.OpenEx( + tmp_path / "minimal_example.gml", open_options=["USE_SCHEMA_IMPORT=YES"] + ) + layer_count = ds.GetLayerCount() + assert layer_count == 2, f"Expected number of layers as '2', but got {layer_count} " + + # layer sanier + lyr = ds.GetLayerByName("sanier") + feat = lyr.GetNextFeature() + assert lyr is not None, "cannot find sanier" + + arokstatus = feat.GetFieldAsString("arokstatus") + assert ( + arokstatus == "Rechtsbestand" + ), f"Expected 'arokstatus' to be 'Rechtsbestand', but got {arokstatus}" + + # layer entwick + lyr = ds.GetLayerByName("entwick") + feat = lyr.GetNextFeature() + assert lyr is not None, "cannot find entwick" + + shape_len = feat.GetFieldAsDouble("SHAPE_Leng") + assert ( + shape_len == 8266.565325510000000 + ), f"Expected 'shape_len' to be '8266.565325510000000', but got {shape_len}" + + +####################################################################################################### +# Test if gml can access and use imported schemas along with included schemas with some features testing +# Open option is set to TRUE to enable the functionality + + +def test_ogr_gml_get_layers_by_name_from_imported_schema_more_tests(tmp_path): + + # copy schema files and gml + shutil.copy("data/gml/min_example/ft1_schema.xsd", tmp_path) + shutil.copy("data/gml/min_example/ft2_schema.xsd", tmp_path) + shutil.copy("data/gml/min_example/minimal_example.xsd", tmp_path) + shutil.copy("data/gml/min_example/minimal_example.gml", tmp_path) + + ds = gdal.OpenEx( + tmp_path / "minimal_example.gml", open_options=["USE_SCHEMA_IMPORT=YES"] + ) + + layer_count = ds.GetLayerCount() + assert layer_count == 2, f"Expected number of layers as '2', but got {layer_count} " + + # layer entwick + lyr = ds.GetLayerByName("entwick") + feat = lyr.GetNextFeature() + shape_len = feat.GetFieldAsDouble("SHAPE_Leng") + assert ( + shape_len == 8266.565325510000000 + ), f"Expected 'shape_len' to be '8266.565325510000000', but got {shape_len}" + + oa_nr = feat.GetFieldAsDouble("oa_nr") + assert isinstance( + oa_nr, float + ), f"Expected 'oa_nr' to be of type 'float', but got {type(oa_nr).__name__}" + assert oa_nr == 430070, f"Expected oa_nr to be '430070', but got {oa_nr}" + + # layer sanier + lyr = ds.GetLayerByName("sanier") + feat = lyr.GetNextFeature() + oa_nr = feat.GetFieldAsString("oa_nr") + assert isinstance( + oa_nr, str + ), f"Expected 'oa_nr' to be of type 'str', but got {type(oa_nr).__name__}" + assert oa_nr == "430050", f"Expected oa_nr to be '430050', but got {oa_nr}" + + dat_erst = feat.GetFieldAsDateTime("dat_erst") + assert isinstance( + dat_erst, list + ), f"Expected 'dat_erst' to be of type 'list', but got {type(dat_erst)}" diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py index 46ddda5f0e60..2343e8f7bf3b 100755 --- a/autotest/ogr/ogr_gml_geom.py +++ b/autotest/ogr/ogr_gml_geom.py @@ -1579,6 +1579,17 @@ def test_gml_invalid_geoms(): '0 0 4 0 4 4 0 4 0 0', "POLYGON ((0 0,4 0,4 4,0 4,0 0))", ), + ("", None), + ("", None), + ("", None), + ( + "", + None, + ), + ( + "0 0", + None, + ), ("", None), ("", None), ("", None), @@ -3003,3 +3014,22 @@ def test_gml_read_gml_ArcByCenterPoint_projected_crs_northing_easting(): """ ) assert g is not None + + +############################################################################### +# Test reading an OrientableCurve + + +def test_gml_OrientableCurve(): + + g = ogr.CreateGeometryFromGML( + """ 0 1 2 3 """ + ) + assert g is not None + assert g.ExportToWkt() == "LINESTRING (0 1,2 3)" + + g = ogr.CreateGeometryFromGML( + """ 0 1 2 3 """ + ) + assert g is not None + assert g.ExportToWkt() == "LINESTRING (2 3,0 1)" diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py index 13492e7ea21f..d3a82e6467c9 100755 --- a/autotest/ogr/ogr_gmlas.py +++ b/autotest/ogr/ogr_gmlas.py @@ -57,25 +57,18 @@ def module_disable_exceptions(): @pytest.fixture(autouse=True, scope="module") def startup_and_cleanup(): - gdal.SetConfigOption("GMLAS_WARN_UNEXPECTED", "YES") - # FileGDB embedded libxml2 cause random crashes with CPLValidateXML() use of external libxml2 - old_val_GDAL_XML_VALIDATION = gdal.GetConfigOption("GDAL_XML_VALIDATION") - if ( - ogr.GetDriverByName("FileGDB") is not None - and old_val_GDAL_XML_VALIDATION is None - ): - gdal.SetConfigOption("GDAL_XML_VALIDATION", "NO") + # hence GDAL_XML_VALIDATION=NO - yield + with gdaltest.config_options( + {"GMLAS_WARN_UNEXPECTED": "YES", "GDAL_XML_VALIDATION": "NO"} + ): + yield files = gdal.ReadDir("/vsimem/") if files is not None: print("Remaining files: " + str(files)) - gdal.SetConfigOption("GMLAS_WARN_UNEXPECTED", None) - gdal.SetConfigOption("GDAL_XML_VALIDATION", old_val_GDAL_XML_VALIDATION) - ############################################################################### @@ -620,12 +613,10 @@ def test_ogr_gmlas_validate(): ds = gdal.OpenEx("GMLAS:data/gmlas/gmlas_validate.xml") assert ds is not None myhandler = MyHandler() - gdal.PushErrorHandler(myhandler.error_handler) - gdal.SetConfigOption("GMLAS_WARN_UNEXPECTED", None) - lyr = ds.GetLayer(0) - lyr.GetFeatureCount() - gdal.SetConfigOption("GMLAS_WARN_UNEXPECTED", "YES") - gdal.PopErrorHandler() + with gdaltest.error_handler(myhandler.error_handler): + with gdal.config_option("GMLAS_WARN_UNEXPECTED", "NO"): + lyr = ds.GetLayer(0) + lyr.GetFeatureCount() assert not myhandler.error_list ds = gdal.OpenEx("GMLAS:data/gmlas/gmlas_validate.xml") @@ -3470,3 +3461,27 @@ def test_ogr_gmlas_bugfix_sf_2371(): ds = gdal.OpenEx("GMLAS:data/gmlas/citygml_empty_lod1.gml") lyr = ds.GetLayerByName("address1") assert lyr.GetFeatureCount() == 0 + + +############################################################################### +# Test force opening a GMLAS file + + +@gdaltest.enable_exceptions() +def test_ogr_gmlas_force_opening(tmp_vsimem): + + ds = gdal.OpenEx("data/gmlas/gmlas_test1.xml", allowed_drivers=["GMLAS"]) + assert ds.GetDriver().GetDescription() == "GMLAS" + + +############################################################################### +# Test we don't crash on a OSSFuzz generated xsd + + +@gdaltest.enable_exceptions() +def test_ogr_gmlas_ossfuzz_70511(): + + with gdal.quiet_errors(), pytest.raises( + Exception, match="Cannot get type definition for attribute y" + ): + gdal.OpenEx("GMLAS:", open_options=["XSD=data/gmlas/test_ossfuzz_70511.xsd"]) diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py index 6b8cfd24aec6..0b80cf0772cd 100755 --- a/autotest/ogr/ogr_gpkg.py +++ b/autotest/ogr/ogr_gpkg.py @@ -9251,6 +9251,20 @@ def test_ogr_gpkg_sql_gdal_get_pixel_value(tmp_vsimem): ds.ReleaseResultSet(sql_lyr) assert f[0] == 156 + with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"): + with ds.ExecuteSQL( + "select gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'georef', 440780 + 30, 3751080 - 30)" + ) as sql_lyr: + f = sql_lyr.GetNextFeature() + assert f[0] == 156 + + with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"): + with ds.ExecuteSQL( + "select gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'georef', 440780 + 30, 3751080 - 30, 'cubicspline')" + ) as sql_lyr: + f = sql_lyr.GetNextFeature() + assert f[0] == pytest.approx(150.1388888888889) + with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"): sql_lyr = ds.ExecuteSQL( "select gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'pixel', 1, 4)" @@ -9355,6 +9369,41 @@ def test_ogr_gpkg_sql_gdal_get_pixel_value(tmp_vsimem): ds.ReleaseResultSet(sql_lyr) assert f[0] is None + # Test Int64 + tmp_filename = str(tmp_vsimem / "tmp_int64.tif") + tmp_ds = gdal.GetDriverByName("GTiff").Create(tmp_filename, 1, 1, 1, gdal.GDT_Int64) + tmp_ds.WriteRaster(0, 0, 1, 1, struct.pack("q", (1 << 63) - 1)) + tmp_ds.Close() + + with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"): + with ds.ExecuteSQL( + f"select gdal_get_pixel_value('{tmp_filename}', 1, 'pixel', 0, 0)" + ) as sql_lyr: + f = sql_lyr.GetNextFeature() + assert f[0] == (1 << 63) - 1 + + # Test UInt64 + tmp_filename = str(tmp_vsimem / "tmp_uint64.tif") + tmp_ds = gdal.GetDriverByName("GTiff").Create( + tmp_filename, 2, 1, 1, gdal.GDT_UInt64 + ) + tmp_ds.WriteRaster(0, 0, 1, 1, struct.pack("Q", (1 << 63) - 1)) + tmp_ds.WriteRaster(1, 0, 1, 1, struct.pack("Q", (1 << 64) - 1)) + tmp_ds.Close() + + with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"): + with ds.ExecuteSQL( + f"select gdal_get_pixel_value('{tmp_filename}', 1, 'pixel', 0, 0)" + ) as sql_lyr: + f = sql_lyr.GetNextFeature() + assert f[0] == (1 << 63) - 1 + + with ds.ExecuteSQL( + f"select gdal_get_pixel_value('{tmp_filename}', 1, 'pixel', 1, 0)" + ) as sql_lyr: + f = sql_lyr.GetNextFeature() + assert f[0] == float((1 << 64) - 1) + ############################################################################### # Test SOZip writing and reading @@ -10510,3 +10559,42 @@ def test_ogr_gpkg_launder(tmp_vsimem): assert lyr.GetGeometryColumn() == "my_geom" lyr.CreateField(ogr.FieldDefn("_")) assert lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef() == "x_" + + +############################################################################### +# Test rename a "hidden" table with SQL + + +def test_gpkg_rename_hidden_table(tmp_vsimem): + + test_layer_path = str(tmp_vsimem / "test_gpkg_rename_hidden_table.gpkg") + + src_ds = gdal.OpenEx("../ogr/data/poly.shp") + gdal.VectorTranslate(test_layer_path, src_ds) + src_ds = None + + dst_ds = gdal.OpenEx( + test_layer_path, gdal.OF_UPDATE, open_options=["LIST_ALL_TABLES=NO"] + ) + dst_ds.ExecuteSQL("CREATE TABLE hidden_foo_table(id integer primary key);") + dst_ds = None + + dst_ds = gdal.OpenEx( + test_layer_path, gdal.OF_UPDATE, open_options=["LIST_ALL_TABLES=NO"] + ) + dst_ds.ExecuteSQL("ALTER TABLE hidden_foo_table RENAME TO hidden_bar_table") + dst_ds.ExecuteSQL("VACUUM") + dst_ds = None + + dst_ds = gdal.OpenEx(test_layer_path) + # Verify that layer exists + lyr = dst_ds.GetLayerByName("hidden_bar_table") + assert lyr is not None + dst_ds = None + + # Check that there is no more any reference to the layer + f = gdal.VSIFOpenL(test_layer_path, "rb") + content = gdal.VSIFReadL(1, 1000000, f).decode("latin1") + gdal.VSIFCloseL(f) + + assert "hidden_foo_table" not in content diff --git a/autotest/ogr/ogr_gtfs.py b/autotest/ogr/ogr_gtfs.py index aaf29eee35aa..e8defefbed09 100755 --- a/autotest/ogr/ogr_gtfs.py +++ b/autotest/ogr/ogr_gtfs.py @@ -33,7 +33,7 @@ import ogrtest import pytest -from osgeo import ogr +from osgeo import gdal, ogr pytestmark = pytest.mark.require_driver("GTFS") @@ -59,6 +59,10 @@ def test_ogr_gtfs_open(): assert ds assert ds.GetLayerCount() == 9 + ds = gdal.OpenEx("/vsizip/data/gtfs/gtfs_extract.zip", allowed_drivers=["GTFS"]) + assert ds + assert ds.GetLayerCount() == 9 + ############################################################################### @@ -99,6 +103,11 @@ def test_ogr_gtfs_content(): f = lyr.GetNextFeature() assert f is None + lyr = ds.GetLayerByName("routes") + assert lyr + lyr.SetAttributeFilter("route_type = 3") + assert lyr.GetFeatureCount() == 30 + lyr = ds.GetLayerByName("stops") assert lyr assert lyr.GetGeomType() == ogr.wkbPoint diff --git a/autotest/ogr/ogr_hana.py b/autotest/ogr/ogr_hana.py index d6a6266f9c28..479d6a85fdf4 100644 --- a/autotest/ogr/ogr_hana.py +++ b/autotest/ogr/ogr_hana.py @@ -424,7 +424,7 @@ def test_ogr_hana_18(): feat_new = ogr.Feature(feature_def=layer.GetLayerDefn()) feat_new.SetField("PRFEDEA", "9999") layer.CreateFeature(feat_new) - feat_new.Destroy() + feat_new = None layer.SetAttributeFilter("PRFEDEA = '9999'") feat = layer.GetNextFeature() @@ -438,7 +438,7 @@ def test_ogr_hana_18(): assert layer.SetFeature(feat) == 0, "SetFeature() method failed." fid = feat.GetFID() - feat.Destroy() + feat = None feat = layer.GetFeature(fid) assert feat is not None, "GetFeature(%d) failed." % fid @@ -1170,6 +1170,93 @@ def create_feature(fid, geom_wkt=None): layer.CommitTransaction() +############################################################################### +# Test REAL_VECTOR type + + +def test_ogr_hana_38(): + conn = create_connection() + layer_name = get_test_name() + table_name = f'"{gdaltest.hana_schema_name}"."{layer_name}"' + execute_sql( + conn, + f"CREATE COLUMN TABLE {table_name} (ID INT PRIMARY KEY, EMB1 REAL_VECTOR(3), EMB2 REAL_VECTOR)", + ) + execute_sql( + conn, + f"INSERT INTO {table_name} VALUES (1, TO_REAL_VECTOR('[0.1,0.2,0.3]'), TO_REAL_VECTOR('[0.1,0.2,0.3]'))", + ) + + def check_value(expected): + ds = open_datasource(0) + layer = ds.GetLayerByName(layer_name) + layer_defn = layer.GetLayerDefn() + assert layer.GetLayerDefn().GetFieldCount() == 2 + field_emb1 = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("EMB1")) + assert field_emb1.GetType() == ogr.OFTBinary + assert field_emb1.GetWidth() == 16 + field_emb2 = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("EMB2")) + assert field_emb2.GetType() == ogr.OFTBinary + assert field_emb2.GetWidth() == 65000 + check_feature_count(layer, 1) + feat = layer.GetNextFeature() + assert feat.GetFieldAsBinary("EMB1") == expected + assert feat.GetFieldAsBinary("EMB2") == expected + + # '[0.1,0.2,0.3]' + vec0 = b"\x03\x00\x00\x00\xCD\xCC\xCC\x3D\xCD\xCC\x4C\x3E\x9A\x99\x99\x3E" + # '[0.1,0.2,0.1]' + vec1 = b"\x03\x00\x00\x00\xCD\xCC\xCC\x3D\xCD\xCC\x4C\x3E\xCD\xCC\xCC\x3D" + + check_value(vec0) + + ds = open_datasource(1) + layer = ds.GetLayerByName(layer_name) + feat = layer.GetNextFeature() + feat.SetField("EMB1", vec1) + feat.SetField("EMB2", vec1) + layer.SetFeature(feat) + + check_value(vec1) + + +############################################################################### +# Verify a working fallback in case the fast extent estimation fails + + +def test_ogr_hana_39(): + conn = create_connection() + + # Create test table + layer_name = get_test_name() + table_name = f'"{gdaltest.hana_schema_name}"."{layer_name}"' + execute_sql( + conn, + f"CREATE COLUMN TABLE {table_name} (id INT, geom ST_Geometry(4326)) NO AUTO MERGE", + ) + + # Check extent. The table is empty so the extent should be (0, 0, 0, 0) + ds = open_datasource(0) + layer = ds.GetLayerByName(layer_name) + assert layer is not None, "did not get layer" + check_extent(layer, (0, 0, 0, 0), force=False) + + # Insert points without merging the delta. + # The fallback should be triggered and return the correct extent. + execute_sql( + conn, + f"INSERT INTO {table_name} (id, geom) VALUES (0, ST_GeomFromText('POINT(0 10)', 4326))", + ) + execute_sql( + conn, + f"INSERT INTO {table_name} (id, geom) VALUES (0, ST_GeomFromText('POINT(0 40)', 4326))", + ) + check_extent(layer, (0, 0, 10, 40), force=False) + + # Tear-down + execute_sql(conn, f"DROP TABLE {table_name}") + + ############################################################################### # Create a table from data/poly.shp @@ -1248,7 +1335,9 @@ def create_tpoly_table(ds, layer_name="TPOLY"): def get_connection_str(): uri = gdal.GetConfigOption("OGR_HANA_CONNECTION_STRING", None) if uri is not None: - conn_str = uri + ";ENCRYPT=YES;SSL_VALIDATE_CERTIFICATE=false;CHAR_AS_UTF8=1" + if "ENCRYPT" not in uri: + uri += ";ENCRYPT=YES" + conn_str = uri + ";SSL_VALIDATE_CERTIFICATE=false;CHAR_AS_UTF8=1" else: pytest.skip("OGR_HANA_CONNECTION_STRING not set") @@ -1311,8 +1400,8 @@ def open_datasource(update=0, open_opts=None): return gdal.OpenEx(conn_str, update, open_options=[open_opts]) -def check_extent(layer, expected, max_error=0.001): - actual = layer.GetExtent() +def check_extent(layer, expected, force=True, max_error=0.001): + actual = layer.GetExtent(force=force) minx = abs(actual[0] - expected[0]) maxx = abs(actual[1] - expected[1]) miny = abs(actual[2] - expected[2]) diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py index 3ff1e9084178..d2bea80434de 100755 --- a/autotest/ogr/ogr_join_test.py +++ b/autotest/ogr/ogr_join_test.py @@ -481,3 +481,69 @@ def test_ogr_join_23(): ds.ReleaseResultSet(sql_lyr) ds = None + + +############################################################################### +# Test join on special fields (FID) + + +def test_ogr_join_on_special_field(): + + ds = ogr.GetDriverByName("Memory").CreateDataSource("") + lyr1 = ds.CreateLayer("lyr1", options=["FID=fid1"]) + lyr1.CreateField(ogr.FieldDefn("a")) + lyr2 = ds.CreateLayer("lyr2", options=["FID=fid2"]) + lyr2.CreateField(ogr.FieldDefn("b")) + f = ogr.Feature(lyr1.GetLayerDefn()) + f.SetFID(1) + f["a"] = "a1" + f.SetGeometry(ogr.CreateGeometryFromWkt("POLYGON((0 0,0 1,1 1,0 0))")) + f.SetStyleString("dummy") + lyr1.CreateFeature(f) + f = ogr.Feature(lyr1.GetLayerDefn()) + f.SetFID(2) + f["a"] = "a2" + lyr1.CreateFeature(f) + f = ogr.Feature(lyr2.GetLayerDefn()) + f.SetFID(1) + f["b"] = "b1" + lyr2.CreateFeature(f) + f = ogr.Feature(lyr2.GetLayerDefn()) + f.SetFID(2) + f["b"] = "b2" + lyr2.CreateFeature(f) + + with ds.ExecuteSQL( + "SELECT a, b FROM lyr1 LEFT JOIN lyr2 ON lyr1.fid1 = lyr2.fid2" + ) as sql_lyr: + f = sql_lyr.GetNextFeature() + assert f["a"] == "a1" + assert f["b"] == "b1" + f = sql_lyr.GetNextFeature() + assert f["a"] == "a2" + assert f["b"] == "b2" + assert sql_lyr.GetNextFeature() is None + + # Kind of dummy, but testing Real special field ... + with ds.ExecuteSQL( + "SELECT a, b FROM lyr1 LEFT JOIN lyr2 ON lyr1.OGR_GEOM_AREA = 0.5" + ) as sql_lyr: + f = sql_lyr.GetNextFeature() + assert f["a"] == "a1" + assert f["b"] == "b1" + f = sql_lyr.GetNextFeature() + assert f["a"] == "a2" + assert f["b"] is None + assert sql_lyr.GetNextFeature() is None + + # Kind of dummy, but testing String special field ... + with ds.ExecuteSQL( + "SELECT a, b FROM lyr1 LEFT JOIN lyr2 ON lyr1.OGR_STYLE = 'dummy'" + ) as sql_lyr: + f = sql_lyr.GetNextFeature() + assert f["a"] == "a1" + assert f["b"] == "b1" + f = sql_lyr.GetNextFeature() + assert f["a"] == "a2" + assert f["b"] is None + assert sql_lyr.GetNextFeature() is None diff --git a/autotest/ogr/ogr_jsonfg.py b/autotest/ogr/ogr_jsonfg.py index 55db4212ce79..a94636f7af96 100755 --- a/autotest/ogr/ogr_jsonfg.py +++ b/autotest/ogr/ogr_jsonfg.py @@ -473,6 +473,32 @@ def test_jsonfg_read_two_features_types(): assert f.GetFID() == 1 +############################################################################### +# Test reading file with a single Feature larger than 6000 bytes + + +def test_jsonfg_read_single_feature_large(tmp_vsimem): + + tmp_file = str(tmp_vsimem / "test.json") + content = """{ + "type": "Feature", + "conformsTo" : [ "[ogc-json-fg-1-0.1:core]" ], + %s + "id": 1, + "geometry": { "type": "Point", "coordinates": [2, 49] }, + "properties": { "foo": 1 }, + "place": null, + "time": null + }""" % ( + " " * 100000 + ) + + gdal.FileFromMemBuffer(tmp_file, content) + + ds = gdal.OpenEx(tmp_file) + assert ds.GetDriver().GetDescription() == "JSONFG" + + ############################################################################### # Test time handling @@ -1292,3 +1318,27 @@ def test_ogr_jsonfg_geom_coord_precision(tmp_vsimem, single_layer): prec = geom_fld.GetCoordinatePrecision() assert prec.GetXYResolution() == 1e-2 assert prec.GetZResolution() == 1e-3 + + +############################################################################### +# Test force opening a GeoJSON file with JSONFG + + +def test_ogr_jsonfg_force_opening(): + + if ogr.GetDriverByName("GeoJSON"): + ds = gdal.OpenEx("data/geojson/featuretype.json") + assert ds.GetDriver().GetDescription() == "GeoJSON" + + ds = gdal.OpenEx("data/geojson/featuretype.json", allowed_drivers=["JSONFG"]) + assert ds.GetDriver().GetDescription() == "JSONFG" + + +############################################################################### +# Test force opening a URL as JSONFG + + +def test_ogr_jsonfg_force_opening_url(): + + drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["JSONFG"]) + assert drv.GetDescription() == "JSONFG" diff --git a/autotest/ogr/ogr_layer_algebra.py b/autotest/ogr/ogr_layer_algebra.py index f1d0cb14ca65..cb43912ef18e 100755 --- a/autotest/ogr/ogr_layer_algebra.py +++ b/autotest/ogr/ogr_layer_algebra.py @@ -261,6 +261,31 @@ def test_algebra_intersection_3(D1, D2, C): assert is_same(D1, C), "D1 != C" +def test_algebra_intersection_multipoint(): + + driver = ogr.GetDriverByName("MEMORY") + ds = driver.CreateDataSource("ds") + layer1 = ds.CreateLayer("layer1") + layer2 = ds.CreateLayer("layer2") + + g1 = "LINESTRING (0 0, 1 1)" + geom1 = ogr.CreateGeometryFromWkt(g1) + feat1 = ogr.Feature(layer1.GetLayerDefn()) + feat1.SetGeometry(geom1) + layer1.CreateFeature(feat1) + + g2 = "LINESTRING (0 1, 1 0)" + geom2 = ogr.CreateGeometryFromWkt(g2) + feat2 = ogr.Feature(layer2.GetLayerDefn()) + feat2.SetGeometry(geom2) + layer2.CreateFeature(feat2) + + layer3 = ds.CreateLayer("layer3") + layer1.Intersection(layer2, layer3, ["PROMOTE_TO_MULTI=YES"]) + f = layer3.GetNextFeature() + assert f.GetGeometryRef().ExportToIsoWkt() == "MULTIPOINT ((0.5 0.5))" + + def test_algebra_KEEP_LOWER_DIMENSION_GEOMETRIES(): driver = ogr.GetDriverByName("MEMORY") diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py index 5576ee4fa71a..777058abd284 100755 --- a/autotest/ogr/ogr_libkml.py +++ b/autotest/ogr/ogr_libkml.py @@ -455,6 +455,17 @@ def test_ogr_libkml_write_kmz_use_doc_off(tmp_vsimem): ogr_libkml_check_write(tmp_vsimem / "libkml_use_doc_off.kmz") +def test_ogr_libkml_write_kmz_simulate_cloud(tmp_vsimem): + with gdal.config_option("CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE", "FORCED"): + ogr_libkml_write(tmp_vsimem / "test_ogr_libkml_write_kmz_simulate_cloud.kmz") + + ogr_libkml_check_write(tmp_vsimem / "test_ogr_libkml_write_kmz_simulate_cloud.kmz") + + with gdal.config_option("CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE", "FORCED"): + with pytest.raises(Exception): + ogr_libkml_write("/i_do/not/exist.kmz") + + ############################################################################### # Test reading attributes with XML content in them # @@ -707,10 +718,8 @@ def test_ogr_libkml_camera(tmp_vsimem): ds = None - f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_camera.kml", "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_camera.kml", "rb") as f: + data = f.read().decode("ascii") assert not ( data.find("") == -1 @@ -771,10 +780,8 @@ def test_ogr_libkml_write_layer_lookat(tmp_vsimem): ds.CreateLayer("test2", options=options) ds = None - f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_layer_lookat.kml", "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_layer_lookat.kml", "rb") as f: + data = f.read().decode("ascii") assert not ( data.find("") == -1 @@ -816,10 +823,8 @@ def test_ogr_libkml_write_layer_camera(tmp_vsimem): ds.CreateLayer("test", options=options) ds = None - f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_layer_camera.kml", "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_layer_camera.kml", "rb") as f: + data = f.read().decode("ascii") assert not ( data.find("") == -1 @@ -884,10 +889,8 @@ def test_ogr_libkml_write_snippet(tmp_vsimem): lyr.CreateFeature(feat) ds = None - f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_snippet.kml", "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_snippet.kml", "rb") as f: + data = f.read().decode("ascii") assert data.find("test_snippet") != -1 @@ -920,10 +923,8 @@ def test_ogr_libkml_write_atom_author(tmp_vsimem): assert ds is not None, "Unable to create %s." % filepath ds = None - f = gdal.VSIFOpenL(filepath, "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open(filepath, "rb") as f: + data = f.read().decode("ascii") assert not ( data.find( @@ -949,10 +950,8 @@ def test_ogr_libkml_write_atom_link(tmp_vsimem): assert ds is not None, "Unable to create %s." % filepath ds = None - f = gdal.VSIFOpenL(filepath, "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open(filepath, "rb") as f: + data = f.read().decode("ascii") assert not ( data.find( @@ -976,10 +975,8 @@ def test_ogr_libkml_write_phonenumber(tmp_vsimem): assert ds is not None, "Unable to create %s." % filepath ds = None - f = gdal.VSIFOpenL(filepath, "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open(filepath, "rb") as f: + data = f.read().decode("ascii") assert data.find("tel:911") != -1 @@ -1013,10 +1010,8 @@ def test_ogr_libkml_write_region(tmp_vsimem): ) ds = None - f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_region.kml", "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_region.kml", "rb") as f: + data = f.read().decode("ascii") assert not ( data.find("49") == -1 @@ -1071,10 +1066,10 @@ def test_ogr_libkml_write_screenoverlay(tmp_vsimem): ) ds = None - f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_screenoverlay.kml", "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open( + tmp_vsimem / "ogr_libkml_write_screenoverlay.kml", "rb" + ) as f: + data = f.read().decode("ascii") assert not ( data.find("http://foo") == -1 @@ -1135,10 +1130,8 @@ def test_ogr_libkml_write_model(tmp_vsimem): ds = None - f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_model.kml", "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_model.kml", "rb") as f: + data = f.read().decode("ascii") assert not ( data.find("2") == -1 @@ -1274,10 +1267,10 @@ def test_ogr_libkml_read_write_style(tmp_vsimem): ds = None src_ds = None - f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open( + tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb" + ) as f: + data = f.read().decode("ascii") lines = [l.strip() for l in data.split("\n")] lines_got = lines[ @@ -1308,10 +1301,10 @@ def test_ogr_libkml_read_write_style(tmp_vsimem): ds = None src_ds = None - f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open( + tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb" + ) as f: + data = f.read().decode("ascii") lines = [l.strip() for l in data.split("\n")] lines_got = lines[ @@ -1346,10 +1339,12 @@ def test_ogr_libkml_read_write_style(tmp_vsimem): assert feat.GetStyleString() == style_string ds = None - f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb") - data = gdal.VSIFReadL(1, 2048, f) - data = data.decode("ascii") - gdal.VSIFCloseL(f) + with gdaltest.vsi_open( + tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb" + ) as f: + data = f.read().decode("ascii") + + assert "#unknown_style" in data expected_style = """