Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move content of proj_experimental.h to proj.h #4019

Merged
merged 3 commits into from
Jan 31, 2024
Merged

Move content of proj_experimental.h to proj.h #4019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3032fb
Move content of proj_experimental.h to proj.h
rouault Jan 29, 2024
4bc8a5a
Doc: reference C API that used to be proj_experimental.h
rouault Jan 29, 2024
22d15f6
proj_create_conversion_tunisia_mining_grid(): fix mixed-up deprecatio…
rouault Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/source/development/reference/datatypes.rst
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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