diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-12-27 22:16:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-27 22:16:10 +0100 |
| commit | 123011447a2d7d25041cc3e466408a0d81bb4d3b (patch) | |
| tree | 450cb1f8db7247c224fc309465cea0f22b045bc8 /docs/source | |
| parent | 81ec8c0b58d66333fccd3703dab62a11132a0331 (diff) | |
| parent | 6bb14fa874562eb4879a3b80b51b22cd2add058e (diff) | |
| download | PROJ-123011447a2d7d25041cc3e466408a0d81bb4d3b.tar.gz PROJ-123011447a2d7d25041cc3e466408a0d81bb4d3b.zip | |
Merge pull request #1210 from rouault/remove_proj_defs_dat
Remove proj_def.dat (#201)
Diffstat (limited to 'docs/source')
| -rw-r--r-- | docs/source/operations/options/ellps.rst | 2 | ||||
| -rw-r--r-- | docs/source/resource_files.rst | 15 | ||||
| -rw-r--r-- | docs/source/usage/differences.rst | 11 | ||||
| -rw-r--r-- | docs/source/usage/projections.rst | 1 |
4 files changed, 15 insertions, 14 deletions
diff --git a/docs/source/operations/options/ellps.rst b/docs/source/operations/options/ellps.rst index af98d377..b754f741 100644 --- a/docs/source/operations/options/ellps.rst +++ b/docs/source/operations/options/ellps.rst @@ -2,4 +2,4 @@ See :option:`proj -le` for a list of available ellipsoids. - *Defaults to "WGS84".* + *Defaults to "GRS80".* diff --git a/docs/source/resource_files.rst b/docs/source/resource_files.rst index bd21486c..53843571 100644 --- a/docs/source/resource_files.rst +++ b/docs/source/resource_files.rst @@ -393,15 +393,6 @@ Below is a list of the init files that are packaged with PROJ. The defaults file ------------------------------------------------------------------------------- -The ``proj_def.dat`` file supplies default parameters for PROJ. It uses the same -syntax as the init files described above. The identifiers in the defaults file -describe to what the parameters should apply. If the ``<general>`` identifier is -used, then all parameters in that section applies for all proj-strings. Otherwise -the identifier is connected to a specific projection. With the defaults file -supplied with PROJ the default ellipsoid is set to WGS84 (for all proj-strings). -Apart from that only the Albers Equal Area, -:doc:`Lambert Conic Conformal<operations/projections/lcc>` and the -:doc:`Lagrange<operations/projections/lagrng>` projections have default parameters. -Defaults can be ignored by adding the ``+no_def`` parameter to a proj-string. - - +Before PROJ 6.0, a ``proj_def.dat`` file could be used to supply default +parameters to PROJ. It has been removed due to the confusion and errors it +caused. diff --git a/docs/source/usage/differences.rst b/docs/source/usage/differences.rst index 7d9d6ced..5694e4d0 100644 --- a/docs/source/usage/differences.rst +++ b/docs/source/usage/differences.rst @@ -58,3 +58,14 @@ should return the same output for both. Adding the ``+over`` flag to the projection definition provides the old behaviour. + +Version 6.0.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +Removal of proj_def.dat +----------------------- + +Before PROJ 6, the proj_def.dat was used to provide general and per-projection +parameters, when +no_defs was not specified. It has now been removed. In case, +no ellipsoid or datum specification is provided in the PROJ string, the +default ellipsoid is GRS80 (was WGS84 in previous PROJ versions). diff --git a/docs/source/usage/projections.rst b/docs/source/usage/projections.rst index 20e82763..8f1ccd50 100644 --- a/docs/source/usage/projections.rst +++ b/docs/source/usage/projections.rst @@ -26,7 +26,6 @@ documenting the individual :doc:`projections<../operations/projections/index>`. +lat_0 Latitude of origin +lon_0 Central meridian +lon_wrap Center longitude to use for wrapping (see below) - +no_defs Don't use the /usr/share/proj/proj_def.dat defaults file +over Allow longitude output outside -180 to 180 range, disables wrapping (see below) +pm Alternate prime meridian (typically a city name, see below) |