Update docs for 9.6.0

[Backport 9.6] Build: make sure that BUILD_SHARED_LIBS is initialized before defining DEFAULT_EMBED_RESOURCE_FILES

CMakeLists.txt

@@ -156,6 +156,13 @@ include(ProjConfig)
 include(ProjMac)
 include(policies)
 
+##############################################
+### SWITCH BETWEEN STATIC OR SHARED LIBRARY###
+##############################################
+
+# default config is shared
+option(BUILD_SHARED_LIBS "Build PROJ library shared." ON)
+
 ################################################################################
 # Check for nlohmann_json
 ################################################################################
@@ -368,6 +375,9 @@ function (is_sharp_embed_available res)
 endfunction()
 
 is_sharp_embed_available(IS_SHARP_EMBED_AVAILABLE_RES)
+if (NOT DEFINED BUILD_SHARED_LIBS)
+    message(FATAL_ERROR "BUILD_SHARED_LIBS should be set")
+endif()
 if (NOT BUILD_SHARED_LIBS)
     set(DEFAULT_EMBED_RESOURCE_FILES ON)
 else()

NEWS.md

@@ -75,6 +75,8 @@
 
 * Fix typo in parameter for ITRF97 in ITRF2014 file (#4408)
 
+* Retry on "SSL connection timeout" (#4419)
+
 
 ## 9.5.1
 

docs/source/conf.py

@@ -26,13 +26,12 @@ author = "PROJ contributors"
 version = "9.6"
 
 # The full project version, used as the replacement for |release|
-release = "9.6.0-dev"
+release = "9.6.0"
 
 # PROJ-data version
-data_version = "1.20"
+data_version = "1.21"
 
-today_date = date.today()
-# today_date = date(Y, M, D)  # or use a specific date
+today_date = date.today() # or use a specific date
 today_fmt = "%d %b %Y"
 
 copyright = "1983-{}, PROJ contributors".format(today_date.year)

docs/source/download.rst

@@ -26,8 +26,8 @@ Download
 Current Release
 --------------------------------------------------------------------------------
 
-* **2024-12-01** `proj-9.5.1.tar.gz`_ (`md5`_)
-* **2024-12-01** `proj-data-1.20.tar.gz`_
+* **2025-03-15** `proj-9.6.0.tar.gz`_ (`md5`_)
+* **2025-03-15** `proj-data-1.21.tar.gz`_
 
 .. note::
 
@@ -40,6 +40,7 @@ Current Release
 Past Releases
 --------------------------------------------------------------------------------
 
+* **2024-12-01** `proj-9.5.1.tar.gz`_
 * **2024-09-15** `proj-9.5.0.tar.gz`_
 * **2024-06-01** `proj-9.4.1.tar.gz`_
 * **2024-03-01** `proj-9.4.0.tar.gz`_
@@ -79,6 +80,7 @@ Past Releases
 * **2015-09-13** `proj-4.9.2.tar.gz`_
 * **2015-03-04** `proj-4.9.1.tar.gz`_
 
+* **2024-12-01** `proj-data-1.20.tar.gz`_
 * **2024-09-15** `proj-data-1.19.tar.gz`_
 * **2024-06-01** `proj-data-1.18.tar.gz`_
 * **2024-06-01** `proj-data-1.17.tar.gz`_
@@ -120,7 +122,8 @@ Past Releases
 * **2018-03-01** `proj-datumgrid-oceania-1.1.zip`_
 * **2018-03-01** `proj-datumgrid-oceania-1.0.zip`_
 
-.. _`md5`: https://download.osgeo.org/proj/proj-9.5.1.tar.gz.md5
+.. _`md5`: https://download.osgeo.org/proj/proj-9.6.0.tar.gz.md5
+.. _`proj-9.6.0.tar.gz`: https://download.osgeo.org/proj/proj-9.6.0.tar.gz
 .. _`proj-9.5.1.tar.gz`: https://download.osgeo.org/proj/proj-9.5.1.tar.gz
 .. _`proj-9.5.0.tar.gz`: https://download.osgeo.org/proj/proj-9.5.0.tar.gz
 .. _`proj-9.4.1.tar.gz`: https://download.osgeo.org/proj/proj-9.4.1.tar.gz
@@ -162,6 +165,7 @@ Past Releases
 .. _`proj-4.9.2.tar.gz`: https://download.osgeo.org/proj/proj-4.9.2.tar.gz
 .. _`proj-4.9.3.tar.gz`: https://download.osgeo.org/proj/proj-4.9.3.tar.gz
 
+.. _`proj-data-1.21.tar.gz`: https://download.osgeo.org/proj/proj-data-1.21.tar.gz
 .. _`proj-data-1.20.tar.gz`: https://download.osgeo.org/proj/proj-data-1.20.tar.gz
 .. _`proj-data-1.19.tar.gz`: https://download.osgeo.org/proj/proj-data-1.19.tar.gz
 .. _`proj-data-1.18.tar.gz`: https://download.osgeo.org/proj/proj-data-1.18.tar.gz

docs/source/news.rst

@@ -3,6 +3,85 @@
 News
 ###############################################################################
 
+9.6.0
+++++++++++++++++++++
+*March 15th 2025*
+
+Updates
+-------
+
+* :program:`projinfo`: display whether an operation is time-dependent (`#4255 <https://github.com/OSGeo/PROJ/issues/4255>`_)
+
+* Add CMake options ``EMBED_RESOURCE_FILES`` and ``USE_ONLY_EMBEDDED_RESOURCE_FILES`` for ``proj.db`` and ``proj.ini`` embedding (`#4265 <https://github.com/OSGeo/PROJ/issues/4265>`_, `#4274 <https://github.com/OSGeo/PROJ/issues/4274>`_)
+
+* Database: ingest deprecated ESRI names to be able to better import old WKT ESRI (`#4282 <https://github.com/OSGeo/PROJ/issues/4282>`_)
+
+* :c:func:`proj_factors()`: enhance speed when called repeatedly on same compound or projected CRS (`#4289 <https://github.com/OSGeo/PROJ/issues/4289>`_)
+
+* Add Airocean projection (formerly Dymaxion) (`#4303 <https://github.com/OSGeo/PROJ/issues/4303>`_)
+
+* :cpp:func:`createOperations()`: Optimization by avoiding database lookups for CRS (typically PROJ strings) using unknown datums (`#4320 <https://github.com/OSGeo/PROJ/issues/4320>`_)
+
+* PROJJSON export: for a Projected CRS, add an explicit type=GeographicCRS/GeodeticCRS members to the base_crs member (`#4331 <https://github.com/OSGeo/PROJ/issues/4331>`_)
+
+* :c:func:`proj_trans_bounds()`: make it work when target CRS is a CompoundCRS (`#4333 <https://github.com/OSGeo/PROJ/issues/4333>`_)
+
+* :cpp:func:`createOperations()`: do Helmert transformation in 2D when one of source or target CRS is compound (`#4337 <https://github.com/OSGeo/PROJ/issues/4337>`_)
+
+* Map EPSG method 'Vertical Offset by Grid Interpolation (asc)' to ``+proj=vgridshift`` (`#4344 <https://github.com/OSGeo/PROJ/issues/4344>`_)
+
+* Add support for 'Coordinate Frame rotation full matrix (geocen)' and Coordinate Frame rotation full matrix (geog2D)' methods (`#4348 <https://github.com/OSGeo/PROJ/issues/4348>`_)
+
+* Add a CMake ``EMBED_RESOURCE_DIRECTORY`` option to embed .tif/.json files in to libproj (`#4349 <https://github.com/OSGeo/PROJ/issues/4349>`_, `#4373 <https://github.com/OSGeo/PROJ/issues/4373>`_)
+
+* Take into account new EPSG methods 'Cartesian Grid Offsets by TIN Interpolation (JSON)' and 'Vertical Offset by TIN Interpolation (JSON)' (`#4353 <https://github.com/OSGeo/PROJ/issues/4353>`_)
+
+* Added an option ``native_ca`` to ``proj.ini`` and an environment variable :envvar:`PROJ_NATIVE_CA` to be able to configure curl to use the operating system CA store. (`#4356 <https://github.com/OSGeo/PROJ/issues/4356>`_)
+
+* Database: add an optional ``step_direction`` column to the ``concatenated_operation_step`` table (`#4357 <https://github.com/OSGeo/PROJ/issues/4357>`_)
+
+* Database: replicate EGM2008 grid transformation record to WGS 84 realizations (`#4363 <https://github.com/OSGeo/PROJ/issues/4363>`_)
+
+* Improve ETRFxxx to ETRFyyy, and WGS 84 (xxx) to WGS 84 (yyy) (`#4364 <https://github.com/OSGeo/PROJ/issues/4364>`_)
+
+* Build: Update to C++17 version (`#4366 <https://github.com/OSGeo/PROJ/issues/4366>`_, `#4369 <https://github.com/OSGeo/PROJ/issues/4369>`_)
+
+* Add bash completion script for projinfo (`#4371 <https://github.com/OSGeo/PROJ/issues/4371>`_)
+
+* Dispatch content of ``4D_api.cpp`` into multiple .cpp files (`#4393 <https://github.com/OSGeo/PROJ/issues/4393>`_)
+
+* Add :c:func:`proj_trans_bounds_3D()` (`#4394 <https://github.com/OSGeo/PROJ/issues/4394>`_)
+
+* Database: add a ``engineering_datum`` and ``engineering_crs`` tables; import few related EPSG records (`#4396 <https://github.com/OSGeo/PROJ/issues/4396>`_)
+
+* NKG transformations: Add support for EUREF-FIN in Finish transformations (`#4399 <https://github.com/OSGeo/PROJ/issues/4399>`_)
+
+* Add Spilhaus projection (`#4401 <https://github.com/OSGeo/PROJ/issues/4401>`_)
+
+* Export ESRI:54099 `WGS_1984_Spilhaus_Ocean_Map_in_Square` as PROJ string (`#4402 <https://github.com/OSGeo/PROJ/issues/4402>`_)
+
+* Database: update to EPSG v12.004 (`#4413 <https://github.com/OSGeo/PROJ/issues/4413>`_)
+
+* :c:func:`proj_download_file()`: invalidate in-memory caches related to downloaded file (for the current context) (`#4414 <https://github.com/OSGeo/PROJ/issues/4414>`_)
+
+
+Bug Fixes
+---------
+
+* :cpp:func:`createObjectsFromName()`: be more tolerant about N/S vs North/South, absence of zone or height (`#4318 <https://github.com/OSGeo/PROJ/issues/4318>`_)
+
+* :cpp:func:`createFromPROJString`: avoid repeated openings of proj.db and proj.ini and lookup of 'epsg' (`#4334 <https://github.com/OSGeo/PROJ/issues/4334>`_)
+
+* Debugging/internals: append sub-grid index to grid name when opening a multi-grid TIFF file (`#4381 <https://github.com/OSGeo/PROJ/issues/4381>`_)
+
+* :cpp:func:`createOperations()`: use more appropriate operation when using a 'PROJ {grid_name}' geoid model, based on matching the vertical datum (`#4379 <https://github.com/OSGeo/PROJ/issues/4379>`_)
+
+* :c:func:`proj_clone()`: properly propagate ``errorIfBestTransformationNotAvailable`` and other flags from source object (`#4382 <https://github.com/OSGeo/PROJ/issues/4382>`_)
+
+* Inverse ``+proj=cass``: fix non-convergence on inputs where easting=false_easting or northing=false_northing (`#4386 <https://github.com/OSGeo/PROJ/issues/4386>`_)
+
+* Fix typo in parameter for ITRF97 in ITRF2014 file (`#4408 <https://github.com/OSGeo/PROJ/issues/4408>`_)
+
 9.5.1. Release Notes
 ++++++++++++++++++++
 *December 1st 2024*

scripts/projinfo-bash-completion.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+# Hashbang deliberately missing because this file should be sourced, not executed
 
 function_exists() {
     declare -f -F "$1" > /dev/null

src/lib_proj.cmake

@@ -1,13 +1,5 @@
 message(STATUS "Configuring proj library:")
 
-##############################################
-### SWITCH BETWEEN STATIC OR SHARED LIBRARY###
-##############################################
-
-# default config is shared
-option(BUILD_SHARED_LIBS
-  "Build PROJ library shared." ON)
-
 find_package(Threads QUIET)
 if(Threads_FOUND AND CMAKE_USE_PTHREADS_INIT)
   add_definitions(-DPROJ_HAS_PTHREADS)

src/networkfilemanager.cpp

@@ -1696,7 +1696,8 @@ static double GetNewRetryDelay(int response_code, double dfOldDelay,
         (response_code == 400 && pszErrBuf &&
          strstr(pszErrBuf, "RequestTimeout")) ||
         (pszCurlError && strstr(pszCurlError, "Connection reset by peer")) ||
-        (pszCurlError && strstr(pszCurlError, "Connection timed out"))) {
+        (pszCurlError && strstr(pszCurlError, "Connection timed out")) ||
+        (pszCurlError && strstr(pszCurlError, "SSL connection timeout"))) {
         // Use an exponential backoff factor of 2 plus some random jitter
         // We don't care about cryptographic quality randomness, hence:
         // coverity[dont_call]