Skip to content

Commit

Permalink
Merge pull request #4019 from rouault/move_experimental_to_stable
Browse files Browse the repository at this point in the history
Move content of proj_experimental.h to proj.h
  • Loading branch information
rouault authored Jan 31, 2024
2 parents fee3ebb + 22d15f6 commit 107c80a
Show file tree
Hide file tree
Showing 5 changed files with 721 additions and 688 deletions.
3 changes: 3 additions & 0 deletions docs/source/development/reference/datatypes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -996,4 +996,7 @@ C API for ISO-19111 functionality
:content-only:
:members:

.. doxygengroup:: iso19111_advanced_types
:project: doxygen_api
:content-only:

11 changes: 11 additions & 0 deletions docs/source/development/reference/functions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,18 @@ Conversely, objects returned by :c:func:`proj_create` and :c:func:`proj_create_a
which are not of type CRS (can be tested with :c:func:`proj_is_crs`),
will return an error when used with functions of this section.
Base functions
~~~~~~~~~~~~~~
.. doxygengroup:: iso19111_functions
:project: doxygen_api
:content-only:
Advanced functions
~~~~~~~~~~~~~~~~~~
Available in :file:`proj.h` since PROJ 9.4. Previously were available in :file:`proj_experimental.h`.
.. doxygengroup:: iso19111_advanced_functions
:project: doxygen_api
:content-only:
4 changes: 2 additions & 2 deletions src/iso19111/c_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5208,7 +5208,7 @@ PJ *proj_create_conversion_two_point_equidistant(
* linear_unit_conv_factor).
* Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor).
*
* @deprecated. Replaced by proj_create_conversion_tunisia_mining_grid
* @since 9.2
*/
PJ *proj_create_conversion_tunisia_mining_grid(
PJ_CONTEXT *ctx, double center_lat, double center_long,
Expand Down Expand Up @@ -5242,7 +5242,7 @@ PJ *proj_create_conversion_tunisia_mining_grid(
* linear_unit_conv_factor).
* Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor).
*
* @since 9.2
* @deprecated Replaced by proj_create_conversion_tunisia_mining_grid
*/
PJ *proj_create_conversion_tunisia_mapping_grid(
PJ_CONTEXT *ctx, double center_lat, double center_long,
Expand Down
Loading

0 comments on commit 107c80a

Please sign in to comment.