diff options
Diffstat (limited to 'docs/source')
| -rw-r--r-- | docs/source/apps/geod.rst | 2 | ||||
| -rw-r--r-- | docs/source/conf.py | 7 | ||||
| -rw-r--r-- | docs/source/development/api.rst | 2 | ||||
| -rw-r--r-- | docs/source/glossary.rst | 4 | ||||
| -rw-r--r-- | docs/source/index.rst | 2 | ||||
| -rw-r--r-- | docs/source/projections/cass.rst | 6 | ||||
| -rw-r--r-- | docs/source/projections/eck1.rst | 4 | ||||
| -rw-r--r-- | docs/source/projections/fouc_s.rst | 4 | ||||
| -rw-r--r-- | docs/source/projections/geos.rst | 2 | ||||
| -rw-r--r-- | docs/source/projections/hatano.rst | 4 | ||||
| -rw-r--r-- | docs/source/projections/wag2.rst | 4 | ||||
| -rw-r--r-- | docs/source/projections/wag3.rst | 4 |
12 files changed, 13 insertions, 32 deletions
diff --git a/docs/source/apps/geod.rst b/docs/source/apps/geod.rst index 3637042f..4620a6cc 100644 --- a/docs/source/apps/geod.rst +++ b/docs/source/apps/geod.rst @@ -13,7 +13,7 @@ back azimuth of a terminus point given a initial point latitude, longitude, azimuth and distance (direct) or the forward and back azimuths and distance between an initial and terminus point latitudes and longitudes (inverse). The results are -accurate to round off for |f| < 1/50, where f is flattening. +accurate to round off for :math:`|f| < 1/50`, where f is flattening. ``invgeod`` may not be available on all platforms; in this case diff --git a/docs/source/conf.py b/docs/source/conf.py index bbcc1d35..cbd02f10 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -207,6 +207,10 @@ htmlhelp_basename = 'proj4doc' # -- Options for LaTeX output --------------------------------------------- + +preamble = r""" +""" + latex_elements = { # The paper size ('letterpaper' or 'a4paper'). #'papersize': 'letterpaper', @@ -215,7 +219,8 @@ latex_elements = { #'pointsize': '10pt', # Additional stuff for the LaTeX preamble. -#'preamble': '', +'preamble': preamble, +'inputenc':'\usepackage[utf8x]{inputenc}' # Latex figure (float) alignment #'figure_align': 'htbp', diff --git a/docs/source/development/api.rst b/docs/source/development/api.rst index 745e2731..5b915edf 100644 --- a/docs/source/development/api.rst +++ b/docs/source/development/api.rst @@ -202,7 +202,7 @@ Returns a new coordinate system definition which is the geographic coordinate (lat/long) system underlying ``pj_in``. pj_set_finder -============ +============== :: diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst index 92b75ecd..3495d814 100644 --- a/docs/source/glossary.rst +++ b/docs/source/glossary.rst @@ -12,14 +12,10 @@ Glossary .. math:: - \begin {array} - x &= f(\lambda,\phi) y &= g(\phi) - \end {array} - where the parallels of latitude are straight lines, like cylindrical projections, but the meridians are curved toward the center as they depart from the equator. This is an effort to minimize the distortion diff --git a/docs/source/index.rst b/docs/source/index.rst index 0450efa1..b6f15cae 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -25,6 +25,8 @@ Coverage |coverals| .. |coverals| image:: https://coveralls.io/repos/OSGeo/proj.4/badge.svg?branch=master :target: https://coveralls.io/r/OSGeo/proj.4?branch=master +Full documentation is available as a single PDF at +https://raw.githubusercontent.com/OSGeo/proj.4/gh-pages/proj4.pdf Documentation ================= diff --git a/docs/source/projections/cass.rst b/docs/source/projections/cass.rst index 3fadd737..83f8c2ce 100644 --- a/docs/source/projections/cass.rst +++ b/docs/source/projections/cass.rst @@ -63,8 +63,7 @@ Forward projection .. math:: - \DeclareMathOperator{\arctantwo}{arctan2} - y = \arctantwo(\tan(\phi), \cos(\lambda)) - \phi_0 + y = \arctan2(\tan(\phi), \cos(\lambda)) - \phi_0 Inverse projection ------------------ @@ -75,8 +74,7 @@ Inverse projection .. math:: - \DeclareMathOperator{\arctantwo}{arctan2} - \lambda = \arctantwo(\tan(x), \cos(y+\phi_0)) + \lambda = \arctan2(\tan(x), \cos(y+\phi_0)) Elliptical form =============== diff --git a/docs/source/projections/eck1.rst b/docs/source/projections/eck1.rst index 54fc2f5c..841533ec 100644 --- a/docs/source/projections/eck1.rst +++ b/docs/source/projections/eck1.rst @@ -11,12 +11,8 @@ Eckert I .. math:: - \begin{array} - x &= 2 \sqrt{2/3\pi} \lambda (1- |\phi|/\pi) y &= 2 \sqrt{2/3\pi}\phi - \end {array} - diff --git a/docs/source/projections/fouc_s.rst b/docs/source/projections/fouc_s.rst index 4f914bcb..ac353adb 100644 --- a/docs/source/projections/fouc_s.rst +++ b/docs/source/projections/fouc_s.rst @@ -15,14 +15,10 @@ the sinusoidal projections. Parameter :math:`n=n` is the weighting factor where .. math:: - \begin{array} - x &= \lambda \cos \phi / (n + (1 - n) \ cos \phi) y &= n \phi + (1 - n) \sin \phi - \end {array} - For the inverse, the Newton-Raphson method can be used to determine :math:`\phi` from the equation for :math:`y` above. As :math:`n \rightarrow 0` and :math:`\phi \rightarrow \pi/2`, convergence is slow but for :math:`n = 0`, :math:`\phi = diff --git a/docs/source/projections/geos.rst b/docs/source/projections/geos.rst index 96884238..2e309241 100644 --- a/docs/source/projections/geos.rst +++ b/docs/source/projections/geos.rst @@ -55,7 +55,7 @@ projection have a two-axis gimbal viewing geometry. This means that the differen scanning positions are obtained by rotating the gimbal along a N/S axis (or ``y``) and a E/W axis (or ``x``). -.. image:: ../../images/geos_sweep.svg +.. image:: ../../images/geos_sweep.png :scale: 50% :alt: Gimbal geometry diff --git a/docs/source/projections/hatano.rst b/docs/source/projections/hatano.rst index a150b64b..5d0c63b7 100644 --- a/docs/source/projections/hatano.rst +++ b/docs/source/projections/hatano.rst @@ -40,8 +40,6 @@ Forward .. math:: - \begin{array} - x &= 0.85\lambda \cos \theta y &= C_y \sin \theta @@ -52,8 +50,6 @@ Forward \theta_0 &= 2\phi - \end{array} - ==================================== ================== =================== Condition :math:`C_p` :math:`C_p` diff --git a/docs/source/projections/wag2.rst b/docs/source/projections/wag2.rst index f9e71354..9c7b0edc 100644 --- a/docs/source/projections/wag2.rst +++ b/docs/source/projections/wag2.rst @@ -11,12 +11,8 @@ Wagner II .. math:: - \begin{array} - x &= 0.92483 \lambda \cos \theta y &= 1.38725\theta \sin \theta &= 0.88022 \sin(0.8855\phi) - - \end {array} diff --git a/docs/source/projections/wag3.rst b/docs/source/projections/wag3.rst index 5b043ef4..fb70a0a6 100644 --- a/docs/source/projections/wag3.rst +++ b/docs/source/projections/wag3.rst @@ -11,10 +11,6 @@ Wagner III .. math:: - \begin{array} - x &= [\cos\phi_{ts} / \cos ( 2\phi_{ts} / 3)] \lambda \cos (2\phi /3) y = \phi - - \end {array} |