diff options
| author | Andrew Bell <andrew.bell.ia@gmail.com> | 2019-05-15 10:47:03 -0400 |
|---|---|---|
| committer | Andrew Bell <andrew.bell.ia@gmail.com> | 2019-05-15 10:47:03 -0400 |
| commit | 8f268409d37cea329d263e177b83e42f8384d3c7 (patch) | |
| tree | c4d0f3dd19456600f718a6e0c8573577f433549b /docs/source/usage | |
| parent | 886ced02f0aaab5d66d16459435f7447cf976650 (diff) | |
| parent | d67203a6f76a74f5ac029ff052dbcc72e3b59624 (diff) | |
| download | PROJ-8f268409d37cea329d263e177b83e42f8384d3c7.tar.gz PROJ-8f268409d37cea329d263e177b83e42f8384d3c7.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'docs/source/usage')
| -rw-r--r-- | docs/source/usage/differences.rst | 6 | ||||
| -rw-r--r-- | docs/source/usage/environmentvars.rst | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/docs/source/usage/differences.rst b/docs/source/usage/differences.rst index d5eebe8e..4d05543a 100644 --- a/docs/source/usage/differences.rst +++ b/docs/source/usage/differences.rst @@ -97,8 +97,8 @@ Effectively this means that the direction of the operation has been reversed, so that what in PROJ 5 was a forward operation is now an inverse operation and vice versa. -Pipelines written for PROJ 5 can be migrated to PROJ 6 by adding :option:` -+inv` to forward steps involving the deformation operation. Similarly +Pipelines written for PROJ 5 can be migrated to PROJ 6 by adding :option:`+inv` +to forward steps involving the deformation operation. Similarly :option:`+inv` should be removed from inverse steps to be compatible with PROJ 6. @@ -113,4 +113,4 @@ the time span for which they wish to apply a given deformation. The parameter exclusive with :option:`+t_epoch`. :option:`+dt` is used when deformation for a set amount of time is needed and :option:`+t_epoch` is used (in conjunction with the observation time of the input coordinate) when -deformation from a specific epoch to the observation time is needed.
\ No newline at end of file +deformation from a specific epoch to the observation time is needed. diff --git a/docs/source/usage/environmentvars.rst b/docs/source/usage/environmentvars.rst index 478e2eab..c8dfe28e 100644 --- a/docs/source/usage/environmentvars.rst +++ b/docs/source/usage/environmentvars.rst @@ -40,6 +40,16 @@ done by setting the variable with no content:: in other locations as well, amongst those are the users home directory, ``/usr/share/proj`` and the current folder. + You can also set the location of the resource files using + :func:`proj_context_set_search_paths` in the `proj.h` API header. + +.. versionchanged:: 6.1.0 + + Starting with PROJ version 6.1.0, the paths set by + :func:`proj_context_set_search_paths` will have priority over the + :envvar:`PROJ_LIB` to allow for mutliple versions of PROJ + resource files on your system without conflicting. + .. envvar:: PROJ_DEBUG Set the debug level of PROJ. The default debug level is zero, which results |