From 0f056c7fd99214bd3cfc9a5d9e30ee5bd76cc44f Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sun, 24 Feb 2019 20:29:52 +0100 Subject: Doc: fix plotdefs.json, and aea and lcc descriptions, to take into account removal of proj_def.dat --- docs/plot/plotdefs.json | 6 ++++-- docs/source/operations/projections/aea.rst | 8 ++++++-- docs/source/operations/projections/lcc.rst | 12 ++++++++---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/docs/plot/plotdefs.json b/docs/plot/plotdefs.json index 8d763f0c..bb0ebbe7 100644 --- a/docs/plot/plotdefs.json +++ b/docs/plot/plotdefs.json @@ -6,7 +6,8 @@ "lonmax": 180, "lonmin": -180, "name": "aea", - "projstring": "+proj=aea", + "#comment": "lat_1 and lat_2 values are previous defaults from now-removed proj_def.dat", + "projstring": "+proj=aea +lat_1=29.5 +lat_2=42.5", "res": "low", "type": "poly" }, @@ -623,7 +624,8 @@ "lonmax": -10, "lonmin": -160, "name": "lcc", - "projstring": "+proj=lcc +lon_0=-90", + "#comment": "lat_1 and lat_2 values are previous defaults from now-removed proj_def.dat", + "projstring": "+proj=lcc +lon_0=-90 +lat_1=33 +lat_2=45", "res": "med", "type": "poly" }, diff --git a/docs/source/operations/projections/aea.rst b/docs/source/operations/projections/aea.rst index 211ce83c..70b3e75e 100644 --- a/docs/source/operations/projections/aea.rst +++ b/docs/source/operations/projections/aea.rst @@ -25,17 +25,21 @@ Albers Equal Area :align: center :alt: Albers Equal Area - proj-string: ``+proj=aea`` + proj-string: ``+proj=aea +lat_1=29.5 +lat_2=42.5`` Options ################################################################################ -.. note:: All options are optional for the Albers Equal Area projection. +Required +-------------------------------------------------------------------------------- .. include:: ../options/lat_1.rst .. include:: ../options/lat_2.rst +Optional +-------------------------------------------------------------------------------- + .. include:: ../options/lon_0.rst .. include:: ../options/ellps.rst diff --git a/docs/source/operations/projections/lcc.rst b/docs/source/operations/projections/lcc.rst index 3b2032d6..d3ba026f 100644 --- a/docs/source/operations/projections/lcc.rst +++ b/docs/source/operations/projections/lcc.rst @@ -42,19 +42,23 @@ justifies adding this otherwise non-standard projection. :align: center :alt: Lambert Conformal Conic - proj-string: ``+proj=lcc +lon_0=-90`` + proj-string: ``+proj=lcc +lon_0=-90 +lat_1=33 +lat_2=45`` Parameters ################################################################################ -.. note:: All parameters are optional for the projection. +Required +-------------------------------------------------------------------------------- + +.. include:: ../options/lat_1.rst + +Optional +-------------------------------------------------------------------------------- .. include:: ../options/lon_0.rst .. include:: ../options/lat_0.rst -.. include:: ../options/lat_1.rst - .. include:: ../options/lat_2.rst .. include:: ../options/ellps.rst -- cgit v1.2.3