Skip to content

Commit

Permalink
Doc: use 'ellipsoidal' to refer to the ellipsoidal formulation (to be…
Browse files Browse the repository at this point in the history 
… opposed to the spherical one)

Instead of 'elliptical'.
Was suggested by @cffk in OSGeo#2030 (comment)

An elliptical projection is a projection whose global shape fits inside an
ellipsoid, like Mollweide. At least according to
https://www.merriam-webster.com/dictionary/elliptical%20projection
and
https://en.wikipedia.org/wiki/Mollweide_projection
  • Loading branch information
@rouault
rouault committed Mar 10, 2020
1 parent dc4acc0 commit bc96c03
Show file tree
Hide file tree
Showing 38 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion docs/source/operations/projections/aea.rst
View file
Expand Up @@ -6,7 +6,7 @@ Albers Equal Area
+---------------------+----------------------------------------------------------+
| **Classification** | Conic |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
4 changes: 2 additions & 2 deletions docs/source/operations/projections/aeqd.rst
View file
Expand Up @@ -6,7 +6,7 @@ Azimuthal Equidistant
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Alias** | aeqd |
+---------------------+----------------------------------------------------------+
Expand All @@ -33,7 +33,7 @@ Options

.. option:: +guam

Use Guam elliptical formulas. Only accurate near the Island of Guam
Use Guam ellipsoidal formulas. Only accurate near the Island of Guam
(:math:`\lambda\approx 144.5^{\circ}`, :math:`\phi\approx 13.5^{\circ}`)

.. include:: ../options/k_0.rst
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/alsk.rst
View file
Expand Up @@ -6,7 +6,7 @@ Modified Stererographics of Alaska
+---------------------+----------------------------------------------------------+
| **Classification** | Modified azimuthal |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Alaska |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/bonne.rst
View file
Expand Up @@ -7,7 +7,7 @@ Bonne (Werner lat_1=90)
+---------------------+----------------------------------------------------------+
| **Classification** | Miscellaneous |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/calcofi.rst
View file
Expand Up @@ -10,7 +10,7 @@ California Cooperative Oceanic Fisheries Investigations program, known as CalCOF
+---------------------+----------------------------------------------------------+
| **Classification** | Conformal cylindrical |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Only valid for the west coast of USA and Mexico |
+---------------------+----------------------------------------------------------+
Expand Down
6 changes: 3 additions & 3 deletions docs/source/operations/projections/cass.rst
View file
Expand Up @@ -9,7 +9,7 @@ Although the Cassini projection has been largely replaced by the Transverse Merc
+---------------------+-------------------------------------------------------------------------+
| **Classification** | Transverse and oblique cylindrical |
+---------------------+-------------------------------------------------------------------------+
| **Available forms** | Forward and inverse, Spherical and Elliptical |
| **Available forms** | Forward and inverse, Spherical and ellipsoidal |
+---------------------+-------------------------------------------------------------------------+
| **Defined area** | Global, but best used near the central meridian with long, narrow areas |
+---------------------+-------------------------------------------------------------------------+
Expand Down Expand Up @@ -100,8 +100,8 @@ Inverse projection
\lambda = \arctan2(\tan(x), \cos(y+\phi_0))
Elliptical form
===============
Ellipsoidal form
================

Forward projection
------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/cea.rst
View file
Expand Up @@ -7,7 +7,7 @@ Equal Area Cylindrical
+---------------------+----------------------------------------------------------+
| **Classification** | Cylindrical |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/eqdc.rst
View file
Expand Up @@ -7,7 +7,7 @@ Equidistant Conic
+---------------------+----------------------------------------------------------+
| **Classification** | Conic |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, elliptical projection |
| **Available forms** | Forward and inverse, ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/geos.rst
View file
Expand Up @@ -10,7 +10,7 @@ scanning angle intervals.
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/gn_sinu.rst
View file
Expand Up @@ -7,7 +7,7 @@ General Sinusoidal Series
+---------------------+----------------------------------------------------------+
| **Classification** | Pseudocylindrical |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/gs48.rst
View file
Expand Up @@ -7,7 +7,7 @@ Mod. Stererographics of 48 U.S.
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | The lower 48 states of the U.S. |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/gs50.rst
View file
Expand Up @@ -7,7 +7,7 @@ Mod. Stererographics of 50 U.S.
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | All 50 states of the U.S. |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/healpix.rst
View file
Expand Up @@ -6,7 +6,7 @@ HEALPix
+---------------------+----------------------------------------------------------+
| **Classification** | Miscellaneous |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/imw_p.rst
View file
Expand Up @@ -7,7 +7,7 @@ International Map of the World Polyconic
+---------------------+----------------------------------------------------------+
| **Classification** | Pseudoconical |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/krovak.rst
View file
Expand Up @@ -7,7 +7,7 @@ Krovak
+---------------------+----------------------------------------------------------+
| **Classification** | Conical |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global, but more accurate around Czechoslovakia |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/labrd.rst
View file
Expand Up @@ -7,7 +7,7 @@ Laborde
+---------------------+----------------------------------------------------------+
| **Classification** | Cylindrical |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global, but more accurate around Madagascar |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/laea.rst
View file
Expand Up @@ -7,7 +7,7 @@ Lambert Azimuthal Equal Area
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/lagrng.rst
View file
Expand Up @@ -7,7 +7,7 @@ Lagrange
+---------------------+----------------------------------------------------------+
| **Classification** | Miscellaneous |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/lcc.rst
View file
Expand Up @@ -20,7 +20,7 @@ justifies adding this otherwise non-standard projection.
+---------------------+----------------------------------------------------------+
| **Classification** | Conformal conic |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection.|
| **Available forms** | Forward and inverse, spherical and ellipsoidal .|
| | One or two standard parallels (1SP and 2SP). |
| | "LCC 2SP Michigan" form can be used by setting |
| | `+k_0` parameter to specify elliposid scale. |
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/lcca.rst
View file
Expand Up @@ -7,7 +7,7 @@ Lambert Conformal Conic Alternative
+---------------------+----------------------------------------------------------+
| **Classification** | Conical |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/leac.rst
View file
Expand Up @@ -7,7 +7,7 @@ Lambert Equal Area Conic
+---------------------+----------------------------------------------------------+
| **Classification** | Conical |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/lee_os.rst
View file
Expand Up @@ -7,7 +7,7 @@ Lee Oblated Stereographic
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/lsat.rst
View file
Expand Up @@ -7,7 +7,7 @@ Space oblique for LANDSAT
+---------------------+----------------------------------------------------------+
| **Classification** | Cylindrical |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/mbtfps.rst
View file
Expand Up @@ -7,7 +7,7 @@ McBryde-Thomas Flat-Polar Sinusoidal
+---------------------+----------------------------------------------------------+
| **Classification** | Pseudocylindrical |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
6 changes: 3 additions & 3 deletions docs/source/operations/projections/merc.rst
View file
Expand Up @@ -12,7 +12,7 @@ The projection is conformal which makes it suitable for navigational purposes.
+---------------------+----------------------------------------------------------+
| **Classification** | Conformal cylindrical |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global, but best used near the equator |
+---------------------+----------------------------------------------------------+
Expand Down Expand Up @@ -112,10 +112,10 @@ Inverse projection
\phi = \frac{\pi}{2} - 2 \arctan \left[ e^{-y/k_0} \right]
Elliptical form
Ellisoidal form
***************

For the elliptical form of the projection we introduce the scaling factor:
For the ellipsoidal form of the projection we introduce the scaling factor:

.. math::
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/mil_os.rst
View file
Expand Up @@ -7,7 +7,7 @@ Miller Oblated Stereographic
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/source/operations/projections/misrsom.rst
View file
Expand Up @@ -7,7 +7,7 @@ Space oblique for MISR
+---------------------+----------------------------------------------------------+
| **Classification** | Conformal |
+---------------------+----------------------------------------------------------+
| **Available forms** | Forward and inverse, spherical and elliptical projection |
| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
Expand Down

0 comments on commit bc96c03

Please sign in to comment.