From 3a325042865cbace6619aa88be93863fedb21025 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Wed, 21 Aug 2024 15:51:02 +0200 Subject: [PATCH 01/17] Make projection names consistent --- doc/rst/source/proj-codes.rst_ | 18 ++-- doc/rst/source/reference/map-projections.rst | 90 ++++++++++---------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/doc/rst/source/proj-codes.rst_ b/doc/rst/source/proj-codes.rst_ index cceb300a370..9cb6098dc96 100644 --- a/doc/rst/source/proj-codes.rst_ +++ b/doc/rst/source/proj-codes.rst_ @@ -17,10 +17,10 @@ * - - **-J** (*scale*\|\ *WIDTH*) - - * - :ref:`Lambert azimuthal equal area <-Ja>` + * - :ref:`Lambert azimuthal equal-area <-Ja>` - **-Ja**\|\ **A** - |lon0|/|lat0|\ [/\ *horizon*]/\ *scale*\|\ *width* - * - :ref:`Albers conic equal area <-Jb>` + * - :ref:`Albers conic equal-area <-Jb>` - **-Jb**\|\ **B** - |lon0|/|lat0|/|lat1|/|lat2|/\ *scale*\|\ *width* * - :ref:`Cassini cylindrical <-Jc>` @@ -44,19 +44,19 @@ * - :ref:`General perspective <-Jg_pers>` - **-Jg**\|\ **G** - |lon0|/|lat0|\ */*\ *scale*\|\ *width*\ [**+a**\ *azimuth*][**+t**\ *tilt*][**+v**\ *vwidth/vheight*][**+w**\ *twist*][**+z**\ *altitude*\ [**r**\|\ **R**]\|\ **g**] - * - :ref:`Hammer equal area <-Jh>` + * - :ref:`Hammer equal-area <-Jh>` - **-Jh**\|\ **H** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Sinusoidal equal area <-Ji>` + * - :ref:`Sinusoidal equal-area <-Ji>` - **-Ji**\|\ **I** - [|lon0|/]\ *scale*\|\ *width* * - :ref:`Miller cylindrical <-Jj>` - **-Jj**\|\ **J** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Eckert IV equal area <-Jk>` + * - :ref:`Eckert IV equal-area <-Jk>` - **-Jkf**\|\ **Kf** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Eckert VI equal area <-Jk>` + * - :ref:`Eckert VI equal-area <-Jk>` - **-Jks**\|\ **Ks** - [|lon0|/]\ *scale*\|\ *width* * - :ref:`Lambert conic conformal <-Jl>` @@ -68,7 +68,7 @@ * - :ref:`Robinson <-Jn>` - **-Jn**\|\ **N** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Oblique Mercator, 1: origin and azim <-Jo>` + * - :ref:`Oblique Mercator, 1: origin and azimuth <-Jo>` - **-Jo**\|\ **O**\ **a**\|\ **A** - |lon0|/|lat0|/\ *azim*/*scale*\|\ *width*\ [**+v**] * - :ref:`Oblique Mercator, 2: two points <-Jo>` @@ -81,7 +81,7 @@ - **-Jp**\|\ **P** - *scale*\|\ *width*\ [**+a**]\ [**+f**\ [**e**\|\ **p**\|\ *radius*]]\ [**+k**\ *kind*]\ [**+r**\ *offset*][**+t**\ *origin*][**+z**\ [**p**\|\ *radius*]] - * - :ref:`(American) polyconic <-Jpoly>` + * - :ref:`(American) polyconic <-Jpoly>` - **-Jpoly**\|\ **Poly** - [|lon0|/\ [|lat0|/]]\ *scale*\|\ *width* * - :ref:`Equidistant cylindrical <-Jq>` @@ -110,6 +110,6 @@ - **-Jx**\|\ **X** - *xscale*\|\ *width*\ [**l**\|\ **p**\ *power*\|\ **T**\|\ **t**]\ [/\ *yscale*\|\ *height*\ [**l**\|\ **p**\ *power*\|\ **T**\|\ **t**]][**d**] - * - :ref:`Cylindrical equal area <-Jy>` + * - :ref:`Cylindrical equal-area <-Jy>` - **-Jy**\|\ **Y** - |lon0|/|lat0|/\ *scale*\|\ *width* diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index 1eaa29bafc3..59160108644 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -218,7 +218,7 @@ Azimuthal projections .. _-Ja: -Lambert Azimuthal Equal-Area (**-Ja** **-JA**) +Lambert azimuthal equal-area (**-Ja** **-JA**) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -308,8 +308,8 @@ stereonet can be obtained by using the stereographic projection .. _-Js: -Stereographic Equal-Angle (**-Js** **-JS**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Stereographic equal-angle (**-Js** **-JS**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -340,8 +340,8 @@ We will look at two different types of maps. Multiple types of maps can be made with this projection depending on how the region is specified. We will give examples in the next three subsections. -Polar Stereographic Map -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Polar stereographic map +^^^^^^^^^^^^^^^^^^^^^^^ In our first example we will let the projection center be at the north pole. This means we have a polar stereographic projection and the map @@ -400,8 +400,8 @@ next to its equal-area cousin in the Section `Lambert Azimuthal Equal-Area (-Ja .. _-Jg_pers: -Perspective projection (**-Jg** **-JG**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +General perspective (**-Jg** **-JG**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -450,8 +450,8 @@ following :doc:`/coast` command (*lon0*\ =4; *lat0*\ =52; *altitude*\ =230 km; * .. _-Jg: -Orthographic projection (**-Jg** **-JG**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Azimuthal orthographic (**-Jg** **-JG**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -489,8 +489,8 @@ command: .. _-Je: -Azimuthal Equidistant projection (**-Je** **-JE**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Azimuthal equidistant (**-Je** **-JE**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -528,8 +528,8 @@ perimeter: .. _-Jf: -Gnomonic projection (**-Jf** **-JF**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Azimuthal gnomonic (**-Jf** **-JF**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -577,8 +577,8 @@ Each have a different way of spacing the meridians and parallels to obtain certa .. _-Jm: -Mercator projection (**-Jm** **-JM**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Mercator cylindrical (**-Jm** **-JM**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -627,8 +627,8 @@ example, specify the region with **-R**-180/180/-70/70 to obtain a map centered .. _-Jt: -Transverse Mercator projection (**-Jt** **-JT**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Transverse Mercator (**-Jt** **-JT**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -685,8 +685,8 @@ latitudes in the regular Mercator projection and must therefore be less than 90 .. _-Ju: -Universal Transverse Mercator (UTM) projection (**-Ju** **-JU**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Universal Transverse Mercator (UTM) (**-Ju** **-JU**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -730,8 +730,8 @@ formulae instead. .. _-Jo: -Oblique Mercator projection (**-Jo** **-JO**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Oblique Mercator (**-Jo** **-JO**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Option 1 Syntax** @@ -846,8 +846,8 @@ to align the oblique Equator with the vertical, positive *y*-axis instead. This .. _-Jc: -Cassini cylindrical projection (**-Jc** **-JC**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Cassini cylindrical (**-Jc** **-JC**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -887,8 +887,8 @@ As with the previous projections, the user can choose between a rectangular boun .. _-Jq: -Cylindrical equidistant projection (**-Jq** **-JQ**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Equidistant cylindrical (**-Jq** **-JQ**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -941,8 +941,8 @@ A world map centered on the dateline using this projection can be obtained as fo .. _-Jy: -Cylindrical equal-area projections (**-Jy** **-JY**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Cylindrical equal-area (**-Jy** **-JY**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1002,8 +1002,8 @@ As one can see there is considerable distortion at high latitudes since the pole .. _-Jj: -Miller Cylindrical projection (**-Jj** **-JJ**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Miller cylindrical (**-Jj** **-JJ**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1041,8 +1041,8 @@ can be obtained as follows: .. _-Jcyl_stere: -Cylindrical stereographic projections (**-Jcyl_stere** **-JCyl_stere**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Cylindrical stereographic (**-Jcyl_stere** **-JCyl_stere**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1110,8 +1110,8 @@ range of the plot, specified by the (**-R**) option. .. _-Jh: -Hammer projection (**-Jh** **-JH**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Hammer equal-area (**-Jh** **-JH**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1143,8 +1143,8 @@ A view of the Pacific ocean using the Dateline as central meridian can be genera .. _-Jw: -Mollweide projection (**-Jw** **-JW**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Mollweide (**-Jw** **-JW**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1177,8 +1177,8 @@ An example centered on Greenwich can be generated thus: .. _-Jr: -Winkel Tripel projection (**-Jr** **-JR**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Winkel Tripel (**-Jr** **-JR**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1219,8 +1219,8 @@ Centered on Greenwich, the example in Figure :ref:`Winkel Tripel projection Date: Wed, 21 Aug 2024 16:14:16 +0200 Subject: [PATCH 02/17] Fix --- doc/rst/source/proj-codes.rst_ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/rst/source/proj-codes.rst_ b/doc/rst/source/proj-codes.rst_ index 9cb6098dc96..26e9dfb5363 100644 --- a/doc/rst/source/proj-codes.rst_ +++ b/doc/rst/source/proj-codes.rst_ @@ -68,7 +68,7 @@ * - :ref:`Robinson <-Jn>` - **-Jn**\|\ **N** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Oblique Mercator, 1: origin and azimuth <-Jo>` + * - :ref:`Oblique Mercator, 1: origin and azim <-Jo>` - **-Jo**\|\ **O**\ **a**\|\ **A** - |lon0|/|lat0|/\ *azim*/*scale*\|\ *width*\ [**+v**] * - :ref:`Oblique Mercator, 2: two points <-Jo>` From 6017e9a2165208d91570edf1bdbfdfa9a9693c04 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Thu, 22 Aug 2024 11:42:02 +0200 Subject: [PATCH 03/17] Use offical projection names --- doc/rst/source/proj-codes.rst_ | 22 ++++----- doc/rst/source/reference/map-projections.rst | 50 ++++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/doc/rst/source/proj-codes.rst_ b/doc/rst/source/proj-codes.rst_ index 26e9dfb5363..1f6a525a5b9 100644 --- a/doc/rst/source/proj-codes.rst_ +++ b/doc/rst/source/proj-codes.rst_ @@ -17,13 +17,13 @@ * - - **-J** (*scale*\|\ *WIDTH*) - - * - :ref:`Lambert azimuthal equal-area <-Ja>` + * - :ref:`Lambert azimuthal <-Ja>` - **-Ja**\|\ **A** - |lon0|/|lat0|\ [/\ *horizon*]/\ *scale*\|\ *width* - * - :ref:`Albers conic equal-area <-Jb>` + * - :ref:`Albers conic <-Jb>` - **-Jb**\|\ **B** - |lon0|/|lat0|/|lat1|/|lat2|/\ *scale*\|\ *width* - * - :ref:`Cassini cylindrical <-Jc>` + * - :ref:`Cassini <-Jc>` - **-Jc**\|\ **C** - |lon0|/|lat0|/\ *scale*\|\ *width* * - :ref:`Cylindrical stereographic <-Jcyl_stere>` @@ -44,25 +44,25 @@ * - :ref:`General perspective <-Jg_pers>` - **-Jg**\|\ **G** - |lon0|/|lat0|\ */*\ *scale*\|\ *width*\ [**+a**\ *azimuth*][**+t**\ *tilt*][**+v**\ *vwidth/vheight*][**+w**\ *twist*][**+z**\ *altitude*\ [**r**\|\ **R**]\|\ **g**] - * - :ref:`Hammer equal-area <-Jh>` + * - :ref:`Hammer <-Jh>` - **-Jh**\|\ **H** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Sinusoidal equal-area <-Ji>` + * - :ref:`Sinusoidal <-Ji>` - **-Ji**\|\ **I** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Miller cylindrical <-Jj>` + * - :ref:`Miller <-Jj>` - **-Jj**\|\ **J** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Eckert IV equal-area <-Jk>` + * - :ref:`Eckert IV <-Jk>` - **-Jkf**\|\ **Kf** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Eckert VI equal-area <-Jk>` + * - :ref:`Eckert VI <-Jk>` - **-Jks**\|\ **Ks** - [|lon0|/]\ *scale*\|\ *width* * - :ref:`Lambert conic conformal <-Jl>` - **-Jl**\|\ **L** - |lon0|/|lat0|/|lat1|/|lat2|/\ *scale*\|\ *width* - * - :ref:`Mercator cylindrical <-Jm>` + * - :ref:`Mercator <-Jm>` - **-Jm**\|\ **M** - [|lon0|/\ [|lat0|/]]\ *scale*\|\ *width* * - :ref:`Robinson <-Jn>` @@ -90,7 +90,7 @@ * - :ref:`Winkel Tripel <-Jr>` - **-Jr**\|\ **R** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`General stereographic <-Js>` + * - :ref:`Stereographic <-Js>` - **-Js**\|\ **S** - |lon0|/|lat0|\ [/\ *horizon*]/\ *scale*\|\ *width* * - :ref:`Transverse Mercator <-Jt>` @@ -110,6 +110,6 @@ - **-Jx**\|\ **X** - *xscale*\|\ *width*\ [**l**\|\ **p**\ *power*\|\ **T**\|\ **t**]\ [/\ *yscale*\|\ *height*\ [**l**\|\ **p**\ *power*\|\ **T**\|\ **t**]][**d**] - * - :ref:`Cylindrical equal-area <-Jy>` + * - :ref:`Cylindrical <-Jy>` - **-Jy**\|\ **Y** - |lon0|/|lat0|/\ *scale*\|\ *width* diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index 59160108644..c060426cc75 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -49,8 +49,8 @@ Conic projections .. _-Jb: -Albers conic equal-area projection (**-Jb** **-JB**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Albers conic (**-Jb** **-JB**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -92,8 +92,8 @@ generate the map below is therefore given by: .. _-Jd: -Equidistant conic projection (**-Jd** **-JD**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Equidistant conic (**-Jd** **-JD**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -127,8 +127,8 @@ map of Cuba: .. _-Jl: -Lambert conic conformal projection (**-Jl** **-JL**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Lambert conic conformal (**-Jl** **-JL**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -172,8 +172,8 @@ latitudes 30.5°N and 47.5°N of 0.5–1%. Some areas, like Florida, experience .. _-Jpoly: -(American) polyconic projection (**-Jpoly** **-JPoly**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +(American) polyconic (**-Jpoly** **-JPoly**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -218,8 +218,8 @@ Azimuthal projections .. _-Ja: -Lambert azimuthal equal-area (**-Ja** **-JA**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Lambert azimuthal (**-Ja** **-JA**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -308,7 +308,7 @@ stereonet can be obtained by using the stereographic projection .. _-Js: -Stereographic equal-angle (**-Js** **-JS**) +Stereographic (**-Js** **-JS**) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -396,7 +396,7 @@ hemispheric maps. Our example shows Australia using a projection pole at By choosing 0/0 as the pole, we obtain the conformal stereonet presented -next to its equal-area cousin in the Section `Lambert Azimuthal Equal-Area (-Ja -JA)`_ on the Lambert azimuthal equal-area projection (Figure :ref:`Stereonets `). +next to its equal-area cousin in the Section `Lambert azimuthal (-Ja -JA)`_ on the Lambert azimuthal projection (Figure :ref:`Stereonets `). .. _-Jg_pers: @@ -846,8 +846,8 @@ to align the oblique Equator with the vertical, positive *y*-axis instead. This .. _-Jc: -Cassini cylindrical (**-Jc** **-JC**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Cassini (**-Jc** **-JC**) +~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -941,8 +941,8 @@ A world map centered on the dateline using this projection can be obtained as fo .. _-Jy: -Cylindrical equal-area (**-Jy** **-JY**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Cylindrical (**-Jy** **-JY**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -959,7 +959,7 @@ Cylindrical equal-area (**-Jy** **-JY**) **Description** This cylindrical projection is actually several projections, depending on what latitude is selected as the standard -parallel. However, they are all equal area and hence non-conformal. All meridians and parallels are straight lines. +parallel. However, they are all equal-area and hence non-conformal. All meridians and parallels are straight lines. While you may choose any value for the standard parallel and obtain your own personal projection, there are seven choices of standard parallels that result in known (or named) projections. These are listed in Table :ref:`JY `. @@ -1002,8 +1002,8 @@ As one can see there is considerable distortion at high latitudes since the pole .. _-Jj: -Miller cylindrical (**-Jj** **-JJ**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Miller (**-Jj** **-JJ**) +~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1110,8 +1110,8 @@ range of the plot, specified by the (**-R**) option. .. _-Jh: -Hammer equal-area (**-Jh** **-JH**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Hammer (**-Jh** **-JH**) +~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1254,8 +1254,8 @@ Again centered on Greenwich, the example below was created by this command: .. _-Jk: -Eckert IV and VI equal-area (**-Jk** **-JK**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Eckert IV and VI (**-Jk** **-JK**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1305,8 +1305,8 @@ The same script, with **s** instead of **f**, yields the Eckert VI map: .. _-Ji: -Sinusoidal equal-area (**-Ji** **-JI**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Sinusoidal (**-Ji** **-JI**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** From 344953e4f5f77594d1b1719308b5668e27c8af06 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Thu, 22 Aug 2024 11:45:53 +0200 Subject: [PATCH 04/17] Use offical projection names --- doc/rst/source/reference/map-projections.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index c060426cc75..b0c4aed0371 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -577,8 +577,8 @@ Each have a different way of spacing the meridians and parallels to obtain certa .. _-Jm: -Mercator cylindrical (**-Jm** **-JM**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Mercator (**-Jm** **-JM**) +~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** From 6abe32c472abd87fda6dd166b9ec327dada877d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yvonne=20Fr=C3=B6hlich?= <94163266+yvonnefroehlich@users.noreply.github.com> Date: Fri, 6 Sep 2024 23:42:29 +0200 Subject: [PATCH 05/17] Add term "projection" back Co-authored-by: Dongdong Tian --- doc/rst/source/reference/map-projections.rst | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index b0c4aed0371..031f51eb74a 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -577,8 +577,8 @@ Each have a different way of spacing the meridians and parallels to obtain certa .. _-Jm: -Mercator (**-Jm** **-JM**) -~~~~~~~~~~~~~~~~~~~~~~~~~~ +Mercator projection (**-Jm** **-JM**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -627,8 +627,8 @@ example, specify the region with **-R**-180/180/-70/70 to obtain a map centered .. _-Jt: -Transverse Mercator (**-Jt** **-JT**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Transverse Mercator projection (**-Jt** **-JT**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -685,8 +685,8 @@ latitudes in the regular Mercator projection and must therefore be less than 90 .. _-Ju: -Universal Transverse Mercator (UTM) (**-Ju** **-JU**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Universal Transverse Mercator (UTM) projection (**-Ju** **-JU**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -730,8 +730,8 @@ formulae instead. .. _-Jo: -Oblique Mercator (**-Jo** **-JO**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Oblique Mercator projection (**-Jo** **-JO**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Option 1 Syntax** @@ -1110,8 +1110,8 @@ range of the plot, specified by the (**-R**) option. .. _-Jh: -Hammer (**-Jh** **-JH**) -~~~~~~~~~~~~~~~~~~~~~~~~ +Hammer projection (**-Jh** **-JH**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1143,8 +1143,8 @@ A view of the Pacific ocean using the Dateline as central meridian can be genera .. _-Jw: -Mollweide (**-Jw** **-JW**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Mollweide projection (**-Jw** **-JW**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1177,8 +1177,8 @@ An example centered on Greenwich can be generated thus: .. _-Jr: -Winkel Tripel (**-Jr** **-JR**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Winkel Tripel projection (**-Jr** **-JR**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1219,8 +1219,8 @@ Centered on Greenwich, the example in Figure :ref:`Winkel Tripel projection Date: Fri, 6 Sep 2024 23:55:18 +0200 Subject: [PATCH 06/17] Add term 'projection' back --- doc/rst/source/proj-codes.rst_ | 28 ++++++++++---------- doc/rst/source/reference/map-projections.rst | 4 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/rst/source/proj-codes.rst_ b/doc/rst/source/proj-codes.rst_ index 1f6a525a5b9..44d085fb5de 100644 --- a/doc/rst/source/proj-codes.rst_ +++ b/doc/rst/source/proj-codes.rst_ @@ -23,7 +23,7 @@ * - :ref:`Albers conic <-Jb>` - **-Jb**\|\ **B** - |lon0|/|lat0|/|lat1|/|lat2|/\ *scale*\|\ *width* - * - :ref:`Cassini <-Jc>` + * - :ref:`Cassini projection <-Jc>` - **-Jc**\|\ **C** - |lon0|/|lat0|/\ *scale*\|\ *width* * - :ref:`Cylindrical stereographic <-Jcyl_stere>` @@ -44,37 +44,37 @@ * - :ref:`General perspective <-Jg_pers>` - **-Jg**\|\ **G** - |lon0|/|lat0|\ */*\ *scale*\|\ *width*\ [**+a**\ *azimuth*][**+t**\ *tilt*][**+v**\ *vwidth/vheight*][**+w**\ *twist*][**+z**\ *altitude*\ [**r**\|\ **R**]\|\ **g**] - * - :ref:`Hammer <-Jh>` + * - :ref:`Hammer projection <-Jh>` - **-Jh**\|\ **H** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Sinusoidal <-Ji>` + * - :ref:`Sinusoidal projection <-Ji>` - **-Ji**\|\ **I** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Miller <-Jj>` + * - :ref:`Miller projection <-Jj>` - **-Jj**\|\ **J** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Eckert IV <-Jk>` + * - :ref:`Eckert IV projection <-Jk>` - **-Jkf**\|\ **Kf** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Eckert VI <-Jk>` + * - :ref:`Eckert VI projection <-Jk>` - **-Jks**\|\ **Ks** - [|lon0|/]\ *scale*\|\ *width* * - :ref:`Lambert conic conformal <-Jl>` - **-Jl**\|\ **L** - |lon0|/|lat0|/|lat1|/|lat2|/\ *scale*\|\ *width* - * - :ref:`Mercator <-Jm>` + * - :ref:`Mercator projection <-Jm>` - **-Jm**\|\ **M** - [|lon0|/\ [|lat0|/]]\ *scale*\|\ *width* - * - :ref:`Robinson <-Jn>` + * - :ref:`Robinson projection <-Jn>` - **-Jn**\|\ **N** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Oblique Mercator, 1: origin and azim <-Jo>` + * - :ref:`Oblique Mercator projection, 1: origin and azim <-Jo>` - **-Jo**\|\ **O**\ **a**\|\ **A** - |lon0|/|lat0|/\ *azim*/*scale*\|\ *width*\ [**+v**] - * - :ref:`Oblique Mercator, 2: two points <-Jo>` + * - :ref:`Oblique Mercator projection, 2: two points <-Jo>` - **-Jo**\|\ **O**\ **b**\|\ **B** - |lon0|/|lat0|/|lon1|/|lat1|/\ *scale*\|\ *width*\ [**+v**] - * - :ref:`Oblique Mercator, 3: origin and pole <-Jo>` + * - :ref:`Oblique Mercator projection, 3: origin and pole <-Jo>` - **-Jo**\|\ **O**\ **c**\|\ **C** - |lon0|/|lat0|/|lonp|/|latp|/\ *scale*\|\ *width*\ [**+v**] * - :ref:`Polar [azimuthal] <-Jp>` (:math:`\theta, r`) (or cylindrical) @@ -93,16 +93,16 @@ * - :ref:`Stereographic <-Js>` - **-Js**\|\ **S** - |lon0|/|lat0|\ [/\ *horizon*]/\ *scale*\|\ *width* - * - :ref:`Transverse Mercator <-Jt>` + * - :ref:`Transverse Mercator projection <-Jt>` - **-Jt**\|\ **T** - |lon0|/\ [|lat0|/]\ *scale*\|\ *width* - * - :ref:`Universal Transverse Mercator (UTM) <-Ju>` + * - :ref:`Universal Transverse Mercator (UTM) projection <-Ju>` - **-Ju**\|\ **U** - *zone*/*scale*\|\ *width* * - :ref:`Van der Grinten <-Jv>` - **-Jv**\|\ **V** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Mollweide <-Jw>` + * - :ref:`Mollweide projection <-Jw>` - **-Jw**\|\ **W** - [|lon0|/]\ *scale*\|\ *width* * - :ref:`Linear <-Jx_linear>`, :ref:`logarithmic <-Jx_log>`, diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index 031f51eb74a..a74327bf0a5 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -1002,8 +1002,8 @@ As one can see there is considerable distortion at high latitudes since the pole .. _-Jj: -Miller (**-Jj** **-JJ**) -~~~~~~~~~~~~~~~~~~~~~~~~ +Miller projection (**-Jj** **-JJ**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** From ce8666af33ea35f3ebae18528c276acb15b22feb Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Fri, 6 Sep 2024 23:58:45 +0200 Subject: [PATCH 07/17] Add term 'projection' back --- doc/rst/source/proj-codes.rst_ | 2 +- doc/rst/source/reference/map-projections.rst | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/rst/source/proj-codes.rst_ b/doc/rst/source/proj-codes.rst_ index 44d085fb5de..1d8cf6ec259 100644 --- a/doc/rst/source/proj-codes.rst_ +++ b/doc/rst/source/proj-codes.rst_ @@ -99,7 +99,7 @@ * - :ref:`Universal Transverse Mercator (UTM) projection <-Ju>` - **-Ju**\|\ **U** - *zone*/*scale*\|\ *width* - * - :ref:`Van der Grinten <-Jv>` + * - :ref:`Van der Grinten projection <-Jv>` - **-Jv**\|\ **V** - [|lon0|/]\ *scale*\|\ *width* * - :ref:`Mollweide projection <-Jw>` diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index a74327bf0a5..e68b2cab266 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -846,8 +846,8 @@ to align the oblique Equator with the vertical, positive *y*-axis instead. This .. _-Jc: -Cassini (**-Jc** **-JC**) -~~~~~~~~~~~~~~~~~~~~~~~~~ +Cassini projection (**-Jc** **-JC**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1254,8 +1254,8 @@ Again centered on Greenwich, the example below was created by this command: .. _-Jk: -Eckert IV and VI projection (**-Jk** **-JK**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Eckert IV and VI projections (**-Jk** **-JK**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** From 8e9d524059b1c49b94839552c8c45bd42f8f1c36 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Thu, 12 Sep 2024 21:09:37 +0200 Subject: [PATCH 08/17] Add term 'projection' for all projection in the headings --- doc/rst/source/reference/map-projections.rst | 54 ++++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index e68b2cab266..46532913f61 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -49,8 +49,8 @@ Conic projections .. _-Jb: -Albers conic (**-Jb** **-JB**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Albers conic projection (**-Jb** **-JB**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -92,8 +92,8 @@ generate the map below is therefore given by: .. _-Jd: -Equidistant conic (**-Jd** **-JD**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Equidistant conic projection (**-Jd** **-JD**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -127,8 +127,8 @@ map of Cuba: .. _-Jl: -Lambert conic conformal (**-Jl** **-JL**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Lambert conic conformal projection (**-Jl** **-JL**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -172,8 +172,8 @@ latitudes 30.5°N and 47.5°N of 0.5–1%. Some areas, like Florida, experience .. _-Jpoly: -(American) polyconic (**-Jpoly** **-JPoly**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +(American) polyconic projection (**-Jpoly** **-JPoly**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -218,8 +218,8 @@ Azimuthal projections .. _-Ja: -Lambert azimuthal (**-Ja** **-JA**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Lambert azimuthal projection (**-Ja** **-JA**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -308,8 +308,8 @@ stereonet can be obtained by using the stereographic projection .. _-Js: -Stereographic (**-Js** **-JS**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Stereographic projection (**-Js** **-JS**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -400,8 +400,8 @@ next to its equal-area cousin in the Section `Lambert azimuthal (-Ja -JA)`_ on t .. _-Jg_pers: -General perspective (**-Jg** **-JG**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +General perspective projection (**-Jg** **-JG**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -450,8 +450,8 @@ following :doc:`/coast` command (*lon0*\ =4; *lat0*\ =52; *altitude*\ =230 km; * .. _-Jg: -Azimuthal orthographic (**-Jg** **-JG**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Azimuthal orthographic projection (**-Jg** **-JG**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -489,8 +489,8 @@ command: .. _-Je: -Azimuthal equidistant (**-Je** **-JE**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Azimuthal equidistant projection (**-Je** **-JE**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -528,8 +528,8 @@ perimeter: .. _-Jf: -Azimuthal gnomonic (**-Jf** **-JF**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Azimuthal gnomonic projection (**-Jf** **-JF**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -686,7 +686,7 @@ latitudes in the regular Mercator projection and must therefore be less than 90 .. _-Ju: Universal Transverse Mercator (UTM) projection (**-Ju** **-JU**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -887,8 +887,8 @@ As with the previous projections, the user can choose between a rectangular boun .. _-Jq: -Equidistant cylindrical (**-Jq** **-JQ**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Equidistant cylindrical projection (**-Jq** **-JQ**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -941,8 +941,8 @@ A world map centered on the dateline using this projection can be obtained as fo .. _-Jy: -Cylindrical (**-Jy** **-JY**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Cylindrical projection (**-Jy** **-JY**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1041,8 +1041,8 @@ can be obtained as follows: .. _-Jcyl_stere: -Cylindrical stereographic (**-Jcyl_stere** **-JCyl_stere**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Cylindrical stereographic projection (**-Jcyl_stere** **-JCyl_stere**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** From fd04088154a3c70cfb2ff482f58e4e560f87aa41 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Thu, 12 Sep 2024 21:13:00 +0200 Subject: [PATCH 09/17] Add term 'projection' for all projection in the headings --- doc/rst/source/proj-codes.rst_ | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/rst/source/proj-codes.rst_ b/doc/rst/source/proj-codes.rst_ index 1d8cf6ec259..39c6489e7b0 100644 --- a/doc/rst/source/proj-codes.rst_ +++ b/doc/rst/source/proj-codes.rst_ @@ -17,31 +17,31 @@ * - - **-J** (*scale*\|\ *WIDTH*) - - * - :ref:`Lambert azimuthal <-Ja>` + * - :ref:`Lambert azimuthal projection <-Ja>` - **-Ja**\|\ **A** - |lon0|/|lat0|\ [/\ *horizon*]/\ *scale*\|\ *width* - * - :ref:`Albers conic <-Jb>` + * - :ref:`Albers conic projection <-Jb>` - **-Jb**\|\ **B** - |lon0|/|lat0|/|lat1|/|lat2|/\ *scale*\|\ *width* * - :ref:`Cassini projection <-Jc>` - **-Jc**\|\ **C** - |lon0|/|lat0|/\ *scale*\|\ *width* - * - :ref:`Cylindrical stereographic <-Jcyl_stere>` + * - :ref:`Cylindrical stereographic projection <-Jcyl_stere>` - **-Jcyl_stere**\|\ **Cyc_stere** - [|lon0|\ [/|lat0|]/]\ *scale*\|\ *width* - * - :ref:`Equidistant conic <-Jd>` + * - :ref:`Equidistant conic projection <-Jd>` - **-Jd**\|\ **D** - |lon0|/|lat0|/|lat1|/|lat2|/\ *scale*\|\ *width* - * - :ref:`Azimuthal equidistant <-Je>` + * - :ref:`Azimuthal equidistant projection <-Je>` - **-Je**\|\ **E** - |lon0|/|lat0|\ [/\ *horizon*]/\ *scale*\|\ *width* - * - :ref:`Azimuthal gnomonic <-Jf>` + * - :ref:`Azimuthal gnomonic projection <-Jf>` - **-Jf**\|\ **F** - |lon0|/|lat0|\ [/\ *horizon*]/\ *scale*\|\ *width* - * - :ref:`Azimuthal orthographic <-Jg>` + * - :ref:`Azimuthal orthographic projection <-Jg>` - **-Jg**\|\ **G** - |lon0|/|lat0|\ [/\ *horizon*]/\ *scale*\|\ *width* - * - :ref:`General perspective <-Jg_pers>` + * - :ref:`General perspective projection <-Jg_pers>` - **-Jg**\|\ **G** - |lon0|/|lat0|\ */*\ *scale*\|\ *width*\ [**+a**\ *azimuth*][**+t**\ *tilt*][**+v**\ *vwidth/vheight*][**+w**\ *twist*][**+z**\ *altitude*\ [**r**\|\ **R**]\|\ **g**] * - :ref:`Hammer projection <-Jh>` @@ -59,7 +59,7 @@ * - :ref:`Eckert VI projection <-Jk>` - **-Jks**\|\ **Ks** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Lambert conic conformal <-Jl>` + * - :ref:`Lambert conic conformal projection <-Jl>` - **-Jl**\|\ **L** - |lon0|/|lat0|/|lat1|/|lat2|/\ *scale*\|\ *width* * - :ref:`Mercator projection <-Jm>` @@ -81,16 +81,16 @@ - **-Jp**\|\ **P** - *scale*\|\ *width*\ [**+a**]\ [**+f**\ [**e**\|\ **p**\|\ *radius*]]\ [**+k**\ *kind*]\ [**+r**\ *offset*][**+t**\ *origin*][**+z**\ [**p**\|\ *radius*]] - * - :ref:`(American) polyconic <-Jpoly>` + * - :ref:`(American) polyconic projection <-Jpoly>` - **-Jpoly**\|\ **Poly** - [|lon0|/\ [|lat0|/]]\ *scale*\|\ *width* - * - :ref:`Equidistant cylindrical <-Jq>` + * - :ref:`Equidistant cylindrical projection <-Jq>` - **-Jq**\|\ **Q** - [|lon0|/\ [|lat0|/]]\ *scale*\|\ *width* - * - :ref:`Winkel Tripel <-Jr>` + * - :ref:`Winkel Tripel projection <-Jr>` - **-Jr**\|\ **R** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Stereographic <-Js>` + * - :ref:`Stereographic projection <-Js>` - **-Js**\|\ **S** - |lon0|/|lat0|\ [/\ *horizon*]/\ *scale*\|\ *width* * - :ref:`Transverse Mercator projection <-Jt>` @@ -110,6 +110,6 @@ - **-Jx**\|\ **X** - *xscale*\|\ *width*\ [**l**\|\ **p**\ *power*\|\ **T**\|\ **t**]\ [/\ *yscale*\|\ *height*\ [**l**\|\ **p**\ *power*\|\ **T**\|\ **t**]][**d**] - * - :ref:`Cylindrical <-Jy>` + * - :ref:`Cylindrical projection <-Jy>` - **-Jy**\|\ **Y** - |lon0|/|lat0|/\ *scale*\|\ *width* From 83fb5c8bf800064a0a52ea9a64c395e340aaf139 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Sun, 15 Sep 2024 12:36:45 +0200 Subject: [PATCH 10/17] Reduce heading underlines --- doc/rst/source/proj-codes.rst_ | 2 +- .../source/reference/coordinate-transformations.rst | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/rst/source/proj-codes.rst_ b/doc/rst/source/proj-codes.rst_ index 39c6489e7b0..ac7850672ab 100644 --- a/doc/rst/source/proj-codes.rst_ +++ b/doc/rst/source/proj-codes.rst_ @@ -77,7 +77,7 @@ * - :ref:`Oblique Mercator projection, 3: origin and pole <-Jo>` - **-Jo**\|\ **O**\ **c**\|\ **C** - |lon0|/|lat0|/|lonp|/|latp|/\ *scale*\|\ *width*\ [**+v**] - * - :ref:`Polar [azimuthal] <-Jp>` (:math:`\theta, r`) (or cylindrical) + * - :ref:`Polar [azimuthal] <-Jp>` (:math:`\theta, r`) (or cylindrical) - **-Jp**\|\ **P** - *scale*\|\ *width*\ [**+a**]\ [**+f**\ [**e**\|\ **p**\|\ *radius*]]\ [**+k**\ *kind*]\ [**+r**\ *offset*][**+t**\ *origin*][**+z**\ [**p**\|\ *radius*]] diff --git a/doc/rst/source/reference/coordinate-transformations.rst b/doc/rst/source/reference/coordinate-transformations.rst index 92c492e0375..f54e12988cd 100644 --- a/doc/rst/source/reference/coordinate-transformations.rst +++ b/doc/rst/source/reference/coordinate-transformations.rst @@ -20,7 +20,7 @@ Finally, note that while we will specify dimensions in inches (by appending **i* points (**p**) as :ref:`unit ` instead. Cartesian coordinate transformations --------------------------------------------------------------------------------- +------------------------------------ GMT Cartesian coordinate transformations come in three flavors: @@ -50,7 +50,7 @@ operates on or creates table data: .. _-Jx_linear: Linear coordinate transformation -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ There are in fact three different uses of the Cartesian linear transformation, each associated with specific command line options. The different manifestations result from specific properties of three kinds of data: @@ -190,7 +190,7 @@ A simple plot of a school week calendar can be made as follows: .. _-Jx_log: Logarithmic coordinate transformation -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -229,7 +229,7 @@ A plot in which the *x*-axis is logarithmic (the *y*-axis remains linear, i.e., .. _-Jx_power: Power (exponential) coordinate transformation -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -267,7 +267,7 @@ Since :math:`q = 1` we do not need to specify **p**\ 1 since it is identical to .. _-Jp: Polar coordinate transformations --------------------------------------------------------------------------------- +-------------------------------- **Syntax** From 40930b40f1a233846e11ad4001c4059720b290a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yvonne=20Fr=C3=B6hlich?= <94163266+yvonnefroehlich@users.noreply.github.com> Date: Sun, 15 Sep 2024 22:17:06 +0200 Subject: [PATCH 11/17] Add term 'equal-area' back --- doc/rst/source/proj-codes.rst_ | 14 +++++++------- doc/rst/source/reference/map-projections.rst | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/rst/source/proj-codes.rst_ b/doc/rst/source/proj-codes.rst_ index ac7850672ab..353e3254397 100644 --- a/doc/rst/source/proj-codes.rst_ +++ b/doc/rst/source/proj-codes.rst_ @@ -17,10 +17,10 @@ * - - **-J** (*scale*\|\ *WIDTH*) - - * - :ref:`Lambert azimuthal projection <-Ja>` + * - :ref:`Lambert azimuthal equal-area projection <-Ja>` - **-Ja**\|\ **A** - |lon0|/|lat0|\ [/\ *horizon*]/\ *scale*\|\ *width* - * - :ref:`Albers conic projection <-Jb>` + * - :ref:`Albers conic equal-area projection <-Jb>` - **-Jb**\|\ **B** - |lon0|/|lat0|/|lat1|/|lat2|/\ *scale*\|\ *width* * - :ref:`Cassini projection <-Jc>` @@ -44,19 +44,19 @@ * - :ref:`General perspective projection <-Jg_pers>` - **-Jg**\|\ **G** - |lon0|/|lat0|\ */*\ *scale*\|\ *width*\ [**+a**\ *azimuth*][**+t**\ *tilt*][**+v**\ *vwidth/vheight*][**+w**\ *twist*][**+z**\ *altitude*\ [**r**\|\ **R**]\|\ **g**] - * - :ref:`Hammer projection <-Jh>` + * - :ref:`Hammer equal-area projection <-Jh>` - **-Jh**\|\ **H** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Sinusoidal projection <-Ji>` + * - :ref:`Sinusoidal equal-area projection <-Ji>` - **-Ji**\|\ **I** - [|lon0|/]\ *scale*\|\ *width* * - :ref:`Miller projection <-Jj>` - **-Jj**\|\ **J** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Eckert IV projection <-Jk>` + * - :ref:`Eckert IV equal-area projection <-Jk>` - **-Jkf**\|\ **Kf** - [|lon0|/]\ *scale*\|\ *width* - * - :ref:`Eckert VI projection <-Jk>` + * - :ref:`Eckert VI equal-area projection <-Jk>` - **-Jks**\|\ **Ks** - [|lon0|/]\ *scale*\|\ *width* * - :ref:`Lambert conic conformal projection <-Jl>` @@ -110,6 +110,6 @@ - **-Jx**\|\ **X** - *xscale*\|\ *width*\ [**l**\|\ **p**\ *power*\|\ **T**\|\ **t**]\ [/\ *yscale*\|\ *height*\ [**l**\|\ **p**\ *power*\|\ **T**\|\ **t**]][**d**] - * - :ref:`Cylindrical projection <-Jy>` + * - :ref:`Cylindrical equal-area projection <-Jy>` - **-Jy**\|\ **Y** - |lon0|/|lat0|/\ *scale*\|\ *width* diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index 46532913f61..7a74eadb2ef 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -49,7 +49,7 @@ Conic projections .. _-Jb: -Albers conic projection (**-Jb** **-JB**) +Albers conic equal-area projection (**-Jb** **-JB**) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -218,7 +218,7 @@ Azimuthal projections .. _-Ja: -Lambert azimuthal projection (**-Ja** **-JA**) +Lambert azimuthal equal-area projection (**-Ja** **-JA**) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -308,7 +308,7 @@ stereonet can be obtained by using the stereographic projection .. _-Js: -Stereographic projection (**-Js** **-JS**) +Stereographic equal-angle projection (**-Js** **-JS**) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -941,7 +941,7 @@ A world map centered on the dateline using this projection can be obtained as fo .. _-Jy: -Cylindrical projection (**-Jy** **-JY**) +Cylindrical equal-area projection (**-Jy** **-JY**) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1110,7 +1110,7 @@ range of the plot, specified by the (**-R**) option. .. _-Jh: -Hammer projection (**-Jh** **-JH**) +Hammer equal-area projection (**-Jh** **-JH**) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** From 2a26c0a431bda505bc1ce1e97096ae0ac86ad5cf Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Fri, 20 Sep 2024 00:10:26 +0200 Subject: [PATCH 12/17] Adjust length of underlines --- doc/rst/source/reference/map-projections.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index 7a74eadb2ef..4f4871abea5 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -50,7 +50,7 @@ Conic projections .. _-Jb: Albers conic equal-area projection (**-Jb** **-JB**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -219,7 +219,7 @@ Azimuthal projections .. _-Ja: Lambert azimuthal equal-area projection (**-Ja** **-JA**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -309,7 +309,7 @@ stereonet can be obtained by using the stereographic projection .. _-Js: Stereographic equal-angle projection (**-Js** **-JS**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -942,7 +942,7 @@ A world map centered on the dateline using this projection can be obtained as fo .. _-Jy: Cylindrical equal-area projection (**-Jy** **-JY**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1111,7 +1111,7 @@ range of the plot, specified by the (**-R**) option. .. _-Jh: Hammer equal-area projection (**-Jh** **-JH**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** From fe57ed32d852caaf52580b3a07d95049c7e28c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yvonne=20Fr=C3=B6hlich?= <94163266+yvonnefroehlich@users.noreply.github.com> Date: Fri, 20 Sep 2024 00:14:47 +0200 Subject: [PATCH 13/17] Update projection names Co-authored-by: Dongdong Tian --- doc/rst/source/reference/map-projections.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index 4f4871abea5..e8a75bdc51f 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -396,7 +396,7 @@ hemispheric maps. Our example shows Australia using a projection pole at By choosing 0/0 as the pole, we obtain the conformal stereonet presented -next to its equal-area cousin in the Section `Lambert azimuthal (-Ja -JA)`_ on the Lambert azimuthal projection (Figure :ref:`Stereonets `). +next to its equal-area cousin in the Section `Lambert azimuthal equal-area projection (-Ja -JA)`_ on the Lambert azimuthal projection (Figure :ref:`Stereonets `). .. _-Jg_pers: @@ -846,8 +846,8 @@ to align the oblique Equator with the vertical, positive *y*-axis instead. This .. _-Jc: -Cassini projection (**-Jc** **-JC**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Cassini cylindrical projection (**-Jc** **-JC**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -1002,8 +1002,8 @@ As one can see there is considerable distortion at high latitudes since the pole .. _-Jj: -Miller projection (**-Jj** **-JJ**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Miller cylindrical projection (**-Jj** **-JJ**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** From fc458e351c75792f8d77ca942601af6b7d7a7117 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Fri, 20 Sep 2024 00:17:43 +0200 Subject: [PATCH 14/17] Add 'equal-area' --- doc/rst/source/reference/map-projections.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index e8a75bdc51f..957fcc45770 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -1254,8 +1254,8 @@ Again centered on Greenwich, the example below was created by this command: .. _-Jk: -Eckert IV and VI projections (**-Jk** **-JK**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Eckert IV and VI equal-area projections (**-Jk** **-JK**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** From cf52df637fa1a7667e3d4b05b39c8d49aed2372b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yvonne=20Fr=C3=B6hlich?= <94163266+yvonnefroehlich@users.noreply.github.com> Date: Fri, 20 Sep 2024 00:20:18 +0200 Subject: [PATCH 15/17] Revert projection name changes Co-authored-by: Dongdong Tian --- doc/rst/source/reference/map-projections.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index 957fcc45770..42e2413ed8b 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -400,8 +400,8 @@ next to its equal-area cousin in the Section `Lambert azimuthal equal-area proje .. _-Jg_pers: -General perspective projection (**-Jg** **-JG**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Perspective projection (**-Jg** **-JG**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -450,8 +450,8 @@ following :doc:`/coast` command (*lon0*\ =4; *lat0*\ =52; *altitude*\ =230 km; * .. _-Jg: -Azimuthal orthographic projection (**-Jg** **-JG**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Orthographic projection (**-Jg** **-JG**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -528,8 +528,8 @@ perimeter: .. _-Jf: -Azimuthal gnomonic projection (**-Jf** **-JF**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Gnomonic projection (**-Jf** **-JF**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** @@ -887,7 +887,7 @@ As with the previous projections, the user can choose between a rectangular boun .. _-Jq: -Equidistant cylindrical projection (**-Jq** **-JQ**) +Cylindrical equidistant projection (**-Jq** **-JQ**) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax** From 495eafbb630861412c515c12a7b6fc0289434400 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Fri, 20 Sep 2024 00:23:11 +0200 Subject: [PATCH 16/17] Update name to 'Cylindrical equidistant --- doc/rst/source/proj-codes.rst_ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/rst/source/proj-codes.rst_ b/doc/rst/source/proj-codes.rst_ index 353e3254397..6db94499de1 100644 --- a/doc/rst/source/proj-codes.rst_ +++ b/doc/rst/source/proj-codes.rst_ @@ -84,7 +84,7 @@ * - :ref:`(American) polyconic projection <-Jpoly>` - **-Jpoly**\|\ **Poly** - [|lon0|/\ [|lat0|/]]\ *scale*\|\ *width* - * - :ref:`Equidistant cylindrical projection <-Jq>` + * - :ref:`Cylindrical equidistant projection <-Jq>` - **-Jq**\|\ **Q** - [|lon0|/\ [|lat0|/]]\ *scale*\|\ *width* * - :ref:`Winkel Tripel projection <-Jr>` From dcc4be23c7df26b645927bdc70a928ac03e7f153 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Fri, 20 Sep 2024 00:28:16 +0200 Subject: [PATCH 17/17] Remove 'equal-area' --- doc/rst/source/reference/map-projections.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/rst/source/reference/map-projections.rst b/doc/rst/source/reference/map-projections.rst index 42e2413ed8b..a54b9c1eb66 100644 --- a/doc/rst/source/reference/map-projections.rst +++ b/doc/rst/source/reference/map-projections.rst @@ -1110,8 +1110,8 @@ range of the plot, specified by the (**-R**) option. .. _-Jh: -Hammer equal-area projection (**-Jh** **-JH**) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Hammer projection (**-Jh** **-JH**) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Syntax**