Merge branch 'master' into dependabot/github_actions/actions/checkout…

…-4.2.2
OSGeo · Mar 2, 2025 · 2e8c150 · 2e8c150
2 parents d8fa549 + a23da19
commit 2e8c150
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 36 deletions.
diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml
@@ -321,7 +321,7 @@ jobs:
       - name: Checkout GDAL
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Install development packages
-        uses: msys2/setup-msys2@c52d1fa9c7492275e60fe763540fb601f5f232a1 # v2.25.0
+        uses: msys2/setup-msys2@61f9e5e925871ba6c9e3e8da24ede83ea27fa91f # v2.27.0
         with:
           msystem: MINGW64
           update: true
@@ -420,7 +420,7 @@ jobs:
       shell: pwsh
       run: |
         echo "JAVA_HOME=$env:JAVA_HOME_11_X64" >> %GITHUB_ENV%
-    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
+    - uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
       with:
         activate-environment: gdalenv
         miniforge-version: latest
@@ -526,7 +526,7 @@ jobs:
         git config --global core.autocrlf false
     - name: Checkout GDAL
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
+    - uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
       with:
         activate-environment: gdalenv
         miniforge-version: latest
@@ -697,7 +697,7 @@ jobs:
         git config --global core.autocrlf false
     - name: Checkout GDAL
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
+    - uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
       with:
         activate-environment: gdalenv
         python-version: 3.9

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -109,7 +109,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@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+      uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -129,6 +129,6 @@ jobs:
         cmake --build build -j$(nproc)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+      uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -50,7 +50,7 @@ jobs:
         path: ~/conda_pkgs_dir
         key: ${{ runner.os }}-${{ steps.get-date.outputs.today }}-conda-${{ env.CACHE_NUMBER }}
 
-    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
+    - uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
       with:
         miniforge-version: latest
         use-mamba: true

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -29,7 +29,7 @@ jobs:
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
+      - uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
         with:
             channels: conda-forge
             auto-update-conda: true

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -41,7 +41,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
         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@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
         with:
           sarif_file: results.sarif
diff --git a/doc/source/_extensions/sphinxcontrib_programoutput_gdal.py b/doc/source/_extensions/sphinxcontrib_programoutput_gdal.py
@@ -219,7 +219,7 @@ class ProgramOutputCache(defaultdict):
     """
     Execute command and cache their output.
 
-    This class is a mapping.  Its keys are :class:`Command` objects represeting
+    This class is a mapping.  Its keys are :class:`Command` objects representing
     command invocations.  Its values are tuples of the form ``(returncode,
     output)``, where ``returncode`` is the integral return code of the command,
     and ``output`` is the output as unicode string.

diff --git a/doc/source/drivers/raster/bag.rst b/doc/source/drivers/raster/bag.rst
@@ -345,7 +345,7 @@ The other following creation options are available:
 
       Path to a XML file that can serve as a template.
       This will typically be a customized version of the base
-      bag_template.xml file. The file can contain other substituable
+      bag_template.xml file. The file can contain other substitutable
       variables than the ones mentioned above by using a similar syntax.
 
 -  .. co:: VAR_xxxx
@@ -448,7 +448,7 @@ Usage examples
       $ gdal_translate data/test_vr.bag -oo MODE=RESAMPLED_GRID -oo RES_FILTER_MIN=4 -oo RES_FILTER_MAX=8 out.tif
 
 -  Converting a GeoTIFF file to a BAG dataset, and provide a custom
-   value for the ABSTRACT substituable variable.
+   value for the ABSTRACT substitutable variable.
 
    ::
 

diff --git a/doc/source/drivers/raster/gti.rst b/doc/source/drivers/raster/gti.rst
@@ -277,7 +277,7 @@ mentioned in the previous section.
 .. code-block:: xml
 
     <GDALTileIndexDataset>
-        <IndexDataset>PG:dbname=my_db</IndexDataset>   <!-- required for stanalone XML GTI files. Ignored if embedded in the xml:GTI metadata domain of the layer  -->
+        <IndexDataset>PG:dbname=my_db</IndexDataset>   <!-- required for standalone XML GTI files. Ignored if embedded in the xml:GTI metadata domain of the layer  -->
         <IndexLayer>my_layer</IndexLayer>              <!-- optional, but required if there are multiple layers in IndexDataset -->
         <Filter>pub_date >= '2023/12/01'</Filter>      <!-- optional -->
         <SortField>pub_date</SortField>                <!-- optional -->

diff --git a/doc/source/drivers/raster/netcdf.rst b/doc/source/drivers/raster/netcdf.rst
@@ -693,9 +693,9 @@ The :cpp:func:`GDALGroup::GetMDArrayNames` method supports the following options
 - SHOW_ALL=YES/NO. Defaults to NO. If set to YES, all variables will be listed.
 - SHOW_ZERO_DIM=YES/NO. Defaults to NO. If set to NO, variables with 0-dimension
   will not be listed.
-- SHOW_COORDINATES=YES/NO. Defaults to YES. If set to NO, variables refererenced
+- SHOW_COORDINATES=YES/NO. Defaults to YES. If set to NO, variables referenced
   in the ``coordinates`` attribute of another variable will not be listed.
-- SHOW_BOUNDS=YES/NO. Defaults to YES. If set to NO, variables refererenced
+- SHOW_BOUNDS=YES/NO. Defaults to YES. If set to NO, variables referenced
   in the ``bounds`` attribute of another variable will not be listed.
 - SHOW_INDEXING=YES/NO. Defaults to YES. If set to NO,
   single-dimensional variables whose name is equal to the name of their indexing

diff --git a/doc/source/drivers/raster/vrt_processed_dataset.rst b/doc/source/drivers/raster/vrt_processed_dataset.rst
@@ -268,7 +268,7 @@ The following required arguments must be specified:
 
 - ``tone_ceil``: Maximum threshold beyond which we give up saturation.
 
-- ``top_margin``: Margin to allow for dynamics in brighest areas (between 0 and 1, should be close to 0)
+- ``top_margin``: Margin to allow for dynamics in brightest areas (between 0 and 1, should be close to 0)
 
 
 The following optional arguments may be specified:
@@ -353,5 +353,3 @@ When using ExprTk, the following configuration options are available:
 
      Indicates the maximum per-pixel runtime of an ExprTk expression. ExprTk performs runtime
      checks only when loops are used.
-
-
diff --git a/doc/source/drivers/raster/wms_wmts_cache.rst b/doc/source/drivers/raster/wms_wmts_cache.rst
@@ -7,7 +7,7 @@ subdirectory of the current directory), unless the :config:`GDAL_DEFAULT_WMS_CAC
 configuration option is specified.
 
 Starting with GDAL 3.9, the directory of the cache is set according to the
-following logic (first listed criterion is prioritary over following ones):
+following logic (first listed criterion has priority over following ones):
 
 - Value of the <Path> sub-element of <Cache>, if specified.
 

diff --git a/doc/source/drivers/vector/filegdb.rst b/doc/source/drivers/vector/filegdb.rst
@@ -67,12 +67,12 @@ Relationships
 
 Relationship retrieval is supported.
 
-Hiearchical organization
-------------------------
+Hierarchical organization
+-------------------------
 
 .. versionadded:: 3.4
 
-The hiearchical organization of tables and feature classes as top-level
+The hierarchical organization of tables and feature classes as top-level
 element or within a feature dataset can be explored using the methods
 :cpp:func:`GDALDataset::GetRootGroup`,
 :cpp:func:`GDALGroup::GetGroupNames`, :cpp:func:`GDALGroup::OpenGroup`,

diff --git a/doc/source/drivers/vector/flatgeobuf.rst b/doc/source/drivers/vector/flatgeobuf.rst
@@ -95,7 +95,7 @@ Creation Issues
 
 * Currently, NULL geometries are not supported with :lco:`SPATIAL_INDEX=YES`.
 
-  `More background and dicussion on this issue at <https://github.com/flatgeobuf/flatgeobuf/discussions/260>`__
+  `More background and discussion on this issue at <https://github.com/flatgeobuf/flatgeobuf/discussions/260>`__
 
 * The creation of the packet Hilbert R-Tree requires an amount of RAM which
   is at least the number of features times 83 bytes.

diff --git a/doc/source/drivers/vector/libkml.rst b/doc/source/drivers/vector/libkml.rst
@@ -149,7 +149,7 @@ List style
 
 The following dataset creation options can be used to control how the
 main folder (folder of layers) appear in the Places panel of the Earth
-browser, trough a
+browser, through a
 `<ListStyle> <https://developers.google.com/kml/documentation/kmlreference#liststyle>`__
 element:
 
@@ -447,7 +447,7 @@ Do not confuse them with the same named dataset creation options.
 
 The following layer creation options can be used to control how the
 folder of a layer appear in the Places panel of the Earth browser,
-trough a
+through a
 `<ListStyle> <https://developers.google.com/kml/documentation/kmlreference#liststyle>`__
 element:
 

diff --git a/doc/source/drivers/vector/openfilegdb.rst b/doc/source/drivers/vector/openfilegdb.rst
@@ -262,8 +262,8 @@ Relationships
 
 Relationship retrieval, creation, deletion and updating is supported.
 
-Hiearchical organization
-------------------------
+Hierarchical organization
+-------------------------
 
 .. versionadded:: 3.4
 

diff --git a/doc/source/drivers/vector/pgeo.rst b/doc/source/drivers/vector/pgeo.rst
@@ -115,7 +115,7 @@ Prerequisites
 #. Install MDB Tools. The official upstream of MDB Tools is maintained
    at `https://github.com/mdbtools/mdbtools <https://github.com/mdbtools/mdbtools>`__
    Version 0.9.4 or later is recommended for best compatibility with the PGeo driver.
-   With the latest version no additional configuration (the followings) is required on Debian Linux and
+   With the latest version no additional configuration (the following) is required on Debian Linux and
    :bash:`ogrinfo sample.mdb` works fine.
 
 

diff --git a/doc/source/programs/gdal_edit.rst b/doc/source/programs/gdal_edit.rst
@@ -118,7 +118,7 @@ It works only with raster formats that support update access to existing dataset
 
     Store user-defined values for band statistics (minimum, maximum,
     mean and standard deviation). If any of the values is set to None,
-    the real statistics are calclulated from the file and the ones set
+    the real statistics are calculated from the file and the ones set
     to None are used from the real statistics.
 
     .. versionadded:: 2.4

diff --git a/doc/source/software_using_gdal.rst b/doc/source/software_using_gdal.rst
@@ -86,7 +86,7 @@ Proprietary license / Other
 - `FalconView  <http://www.falconview.org>`_  Windows-based GIS platform with roots in military mission planning, now available as a free GIS visualization and analysis package.
 - `flighttrack  <http://flighttrack.sourceforge.net>`_  GPS track viewing and downloading software for Mac.
 - `FME  <http://www.safe.com>`_  A GIS translator package includes a GDAL plugin.
-- `GenGIS  <hhttps://beikolab.cs.dal.ca/gengis/Main_Page>`_  Software for geospatial analysis of genetic data.
+- `GenGIS  <https://beikolab.cs.dal.ca/gengis/Main_Page>`_  Software for geospatial analysis of genetic data.
 - `Geographic Imager  <https://www.avenza.com/geographic-imager>`_  DEM / aerial / satellite image processing GIS plug-in for Adobe Photoshop, by Avenza Systems.
 - `GeoDMS  <https://geodms.nl/>`_  A framework for building spatial calculation models.
 - `GeoFusion  <http://www.geofusion.com>`_  3D visualization.

diff --git a/doc/source/tutorials/vector_api_tut.rst b/doc/source/tutorials/vector_api_tut.rst
@@ -771,7 +771,7 @@ two main callbacks to get:
   a set of values for a specific column/field in a subset of features.
   This is the equivalent of a
   `Series <https://arrow.apache.org/docs/python/pandas.html#series>`_ in a Pandas DataFrame.
-  This is a potentially hiearchical structure that can aggregate
+  This is a potentially hierarchical structure that can aggregate
   sub arrays, and in OGR usage, the main array will be a StructArray which is
   the collection of OGR attribute and geometry fields.
   The layout of buffers and children arrays per data type is detailed in the

diff --git a/doc/source/tutorials/wktproblems.rst b/doc/source/tutorials/wktproblems.rst
@@ -102,7 +102,7 @@ parameter relating it to EPSG or some other authority space. However, in
 SF WKT the name itself is the only key.
 
 By convention OGR and Cadcorp have translated the datum names in a
-particular way from the EPSG database in order to produce comparible
+particular way from the EPSG database in order to produce comparable
 names. The rule is to convert all non alphanumeric characters to
 underscores, then to strip any leading, trailing or repeating
 underscores. This produces well behaved datum names like

diff --git a/doc/source/user/virtual_file_systems.rst b/doc/source/user/virtual_file_systems.rst
@@ -856,23 +856,23 @@ The following configuration options are specific to the /vsiaz/ handler:
 
      object_id of the managed identity you would like the token for, when using
      Azure Instance Metadata Service (IMDS) authentication in a Azure
-     Virtual Matchine. Required if your VM has multiple user-assigned managed identities.
+     Virtual Machine. Required if your VM has multiple user-assigned managed identities.
      This option may be set as a path-specific option with :cpp:func:`VSISetPathSpecificOption`
 
 - .. config:: AZURE_IMDS_CLIENT_ID
      :since: 3.8
 
      client_id of the managed identity you would like the token for, when using
      Azure Instance Metadata Service (IMDS) authentication in a Azure
-     Virtual Matchine. Required if your VM has multiple user-assigned managed identities.
+     Virtual Machine. Required if your VM has multiple user-assigned managed identities.
      This option may be set as a path-specific option with :cpp:func:`VSISetPathSpecificOption`
 
 - .. config:: AZURE_IMDS_MSI_RES_ID
      :since: 3.8
 
      msi_res_id (Azure Resource ID) of the managed identity you would like the token for, when using
      Azure Instance Metadata Service (IMDS) authentication in a Azure
-     Virtual Matchine. Required if your VM has multiple user-assigned managed identities.
+     Virtual Machine. Required if your VM has multiple user-assigned managed identities.
      This option may be set as a path-specific option with :cpp:func:`VSISetPathSpecificOption`
 
 Several authentication methods are possible, and are attempted in the following order: