diff options
| author | Mike Taves <mwtoews@gmail.com> | 2022-02-23 21:54:56 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-23 21:54:56 +1300 |
| commit | e79984f5f17a8d0abd36e7e4884dd56b644df22f (patch) | |
| tree | 3203da34097a740b3c0488ed1d6593e2945b5604 | |
| parent | 5b7c4575e549d2765da39a9708a42fa6317926f1 (diff) | |
| download | PROJ-e79984f5f17a8d0abd36e7e4884dd56b644df22f.tar.gz PROJ-e79984f5f17a8d0abd36e7e4884dd56b644df22f.zip | |
Rename "Kavraisky" to transliteration "Kavrayskiy" used by Snyder1993 (#3071)
| -rw-r--r-- | docs/source/operations/projections/kav5.rst | 10 | ||||
| -rw-r--r-- | docs/source/operations/projections/kav7.rst | 10 | ||||
| -rw-r--r-- | docs/source/operations/projections/wag1.rst | 6 | ||||
| -rw-r--r-- | docs/source/spelling_wordlist.txt | 1 | ||||
| -rw-r--r-- | src/pj_list.h | 6 | ||||
| -rw-r--r-- | src/projections/eck3.cpp | 2 | ||||
| -rw-r--r-- | src/projections/sts.cpp | 2 | ||||
| -rw-r--r-- | src/projections/urmfps.cpp | 2 | ||||
| -rw-r--r-- | test/gie/builtins.gie | 6 |
9 files changed, 28 insertions, 17 deletions
diff --git a/docs/source/operations/projections/kav5.rst b/docs/source/operations/projections/kav5.rst index 1f80229d..0025260b 100644 --- a/docs/source/operations/projections/kav5.rst +++ b/docs/source/operations/projections/kav5.rst @@ -1,7 +1,7 @@ .. _kav5: ******************************************************************************** -Kavraisky V +Kavrayskiy V ******************************************************************************** +---------------------+----------------------------------------------------------+ @@ -24,14 +24,18 @@ Kavraisky V .. figure:: ./images/kav5.png :width: 500 px :align: center - :alt: Kavraisky V + :alt: Kavrayskiy V proj-string: ``+proj=kav5`` +.. note:: This projection name may also be transliterated as Kavraisky V. + +Created by Soviet cartographer Vladimir V. Kavrayskiy in 1933 :cite:`Snyder1993`. + Parameters ################################################################################ -.. note:: All parameters are optional for the Kavraisky V projection. +.. note:: All parameters are optional for the Kavrayskiy V projection. .. include:: ../options/lon_0.rst diff --git a/docs/source/operations/projections/kav7.rst b/docs/source/operations/projections/kav7.rst index d53ba992..1808f4ca 100644 --- a/docs/source/operations/projections/kav7.rst +++ b/docs/source/operations/projections/kav7.rst @@ -1,7 +1,7 @@ .. _kav7: ******************************************************************************** -Kavraisky VII +Kavrayskiy VII ******************************************************************************** +---------------------+----------------------------------------------------------+ @@ -24,14 +24,18 @@ Kavraisky VII .. figure:: ./images/kav7.png :width: 500 px :align: center - :alt: Kavraisky VII + :alt: Kavrayskiy VII proj-string: ``+proj=kav7`` +.. note:: This projection name may also be transliterated as Kavraisky VII. + +Created by Soviet cartographer Vladimir V. Kavrayskiy in 1939 :cite:`Snyder1993`. + Parameters ################################################################################ -.. note:: All parameters are optional for the Kavraisky VII projection. +.. note:: All parameters are optional for the Kavrayskiy VII projection. .. include:: ../options/lon_0.rst diff --git a/docs/source/operations/projections/wag1.rst b/docs/source/operations/projections/wag1.rst index 4c119773..72c65ab2 100644 --- a/docs/source/operations/projections/wag1.rst +++ b/docs/source/operations/projections/wag1.rst @@ -1,7 +1,7 @@ .. _wag1: ******************************************************************************** -Wagner I (Kavraisky VI) +Wagner I (Kavrayskiy VI) ******************************************************************************** +---------------------+----------------------------------------------------------+ @@ -24,10 +24,12 @@ Wagner I (Kavraisky VI) .. figure:: ./images/wag1.png :width: 500 px :align: center - :alt: Wagner I (Kavraisky VI) + :alt: Wagner I (Kavrayskiy VI) proj-string: ``+proj=wag1`` +.. note:: This projection name may also be transliterated as Kavraisky VI. + Parameters ################################################################################ diff --git a/docs/source/spelling_wordlist.txt b/docs/source/spelling_wordlist.txt index 9a3143d7..199600a0 100644 --- a/docs/source/spelling_wordlist.txt +++ b/docs/source/spelling_wordlist.txt @@ -178,6 +178,7 @@ horner Hotine Karney Kavraisky +Kavrayskiy Krovak krovak Krüger diff --git a/src/pj_list.h b/src/pj_list.h index e4b8ab67..dfa8a978 100644 --- a/src/pj_list.h +++ b/src/pj_list.h @@ -73,8 +73,8 @@ PROJ_HEAD(igh, "Interrupted Goode Homolosine") PROJ_HEAD(igh_o, "Interrupted Goode Homolosine Oceanic View") PROJ_HEAD(imw_p, "International Map of the World Polyconic") PROJ_HEAD(isea, "Icosahedral Snyder Equal Area") -PROJ_HEAD(kav5, "Kavraisky V") -PROJ_HEAD(kav7, "Kavraisky VII") +PROJ_HEAD(kav5, "Kavrayskiy V") +PROJ_HEAD(kav7, "Kavrayskiy VII") PROJ_HEAD(krovak, "Krovak") PROJ_HEAD(labrd, "Laborde") PROJ_HEAD(laea, "Lambert Azimuthal Equal Area") @@ -170,7 +170,7 @@ PROJ_HEAD(vandg3, "van der Grinten III") PROJ_HEAD(vandg4, "van der Grinten IV") PROJ_HEAD(vitk1, "Vitkovsky I") PROJ_HEAD(vgridshift, "Vertical grid shift") -PROJ_HEAD(wag1, "Wagner I (Kavraisky VI)") +PROJ_HEAD(wag1, "Wagner I (Kavrayskiy VI)") PROJ_HEAD(wag2, "Wagner II") PROJ_HEAD(wag3, "Wagner III") PROJ_HEAD(wag4, "Wagner IV") diff --git a/src/projections/eck3.cpp b/src/projections/eck3.cpp index ff1f4c5b..bb8eacd3 100644 --- a/src/projections/eck3.cpp +++ b/src/projections/eck3.cpp @@ -9,7 +9,7 @@ PROJ_HEAD(eck3, "Eckert III") "\n\tPCyl, Sph"; PROJ_HEAD(putp1, "Putnins P1") "\n\tPCyl, Sph"; PROJ_HEAD(wag6, "Wagner VI") "\n\tPCyl, Sph"; -PROJ_HEAD(kav7, "Kavraisky VII") "\n\tPCyl, Sph"; +PROJ_HEAD(kav7, "Kavrayskiy VII") "\n\tPCyl, Sph"; namespace { // anonymous namespace struct pj_opaque { diff --git a/src/projections/sts.cpp b/src/projections/sts.cpp index 1042e38b..8f8b4ceb 100644 --- a/src/projections/sts.cpp +++ b/src/projections/sts.cpp @@ -6,7 +6,7 @@ #include "proj.h" #include "proj_internal.h" -PROJ_HEAD(kav5, "Kavraisky V") "\n\tPCyl, Sph"; +PROJ_HEAD(kav5, "Kavrayskiy V") "\n\tPCyl, Sph"; PROJ_HEAD(qua_aut, "Quartic Authalic") "\n\tPCyl, Sph"; PROJ_HEAD(fouc, "Foucaut") "\n\tPCyl, Sph"; PROJ_HEAD(mbt_s, "McBryde-Thomas Flat-Polar Sine (No. 1)") "\n\tPCyl, Sph"; diff --git a/src/projections/urmfps.cpp b/src/projections/urmfps.cpp index 6df9ba57..b2af116b 100644 --- a/src/projections/urmfps.cpp +++ b/src/projections/urmfps.cpp @@ -7,7 +7,7 @@ #include "proj_internal.h" PROJ_HEAD(urmfps, "Urmaev Flat-Polar Sinusoidal") "\n\tPCyl, Sph\n\tn="; -PROJ_HEAD(wag1, "Wagner I (Kavraisky VI)") "\n\tPCyl, Sph"; +PROJ_HEAD(wag1, "Wagner I (Kavrayskiy VI)") "\n\tPCyl, Sph"; namespace { // anonymous namespace struct pj_opaque { diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 73a751c3..1a290294 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -2400,7 +2400,7 @@ accept 0 0 expect failure =============================================================================== -# Kavraisky V +# Kavrayskiy V # PCyl., Sph. =============================================================================== @@ -2452,7 +2452,7 @@ expect -0.001989440 -0.000805721 =============================================================================== -# Kavraisky VII +# Kavrayskiy VII # PCyl, Sph. =============================================================================== @@ -6852,7 +6852,7 @@ expect -0.001790066 -0.000895247 =============================================================================== -# Wagner I (Kavraisky VI) +# Wagner I (Kavrayskiy VI) # PCyl, Sph. =============================================================================== |
