Skip to content

Commit

Permalink
Rename "Kavraisky" to transliteration "Kavrayskiy" used by Snyder1993 (
Browse files Browse the repository at this point in the history
  • Loading branch information
mwtoews authored Feb 23, 2022
1 parent 5b7c457 commit e79984f
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 17 deletions.
10 changes: 7 additions & 3 deletions docs/source/operations/projections/kav5.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _kav5:

********************************************************************************
Kavraisky V
Kavrayskiy V
********************************************************************************

+---------------------+----------------------------------------------------------+
Expand All @@ -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

Expand Down
10 changes: 7 additions & 3 deletions docs/source/operations/projections/kav7.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _kav7:

********************************************************************************
Kavraisky VII
Kavrayskiy VII
********************************************************************************

+---------------------+----------------------------------------------------------+
Expand All @@ -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

Expand Down
6 changes: 4 additions & 2 deletions docs/source/operations/projections/wag1.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _wag1:

********************************************************************************
Wagner I (Kavraisky VI)
Wagner I (Kavrayskiy VI)
********************************************************************************

+---------------------+----------------------------------------------------------+
Expand All @@ -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
################################################################################

Expand Down
1 change: 1 addition & 0 deletions docs/source/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ horner
Hotine
Karney
Kavraisky
Kavrayskiy
Krovak
krovak
Krüger
Expand Down
6 changes: 3 additions & 3 deletions src/pj_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion src/projections/eck3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/projections/sts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/projections/urmfps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions test/gie/builtins.gie
Original file line number Diff line number Diff line change
Expand Up @@ -2400,7 +2400,7 @@ accept 0 0
expect failure

===============================================================================
# Kavraisky V
# Kavrayskiy V
# PCyl., Sph.
===============================================================================

Expand Down Expand Up @@ -2452,7 +2452,7 @@ expect -0.001989440 -0.000805721


===============================================================================
# Kavraisky VII
# Kavrayskiy VII
# PCyl, Sph.
===============================================================================

Expand Down Expand Up @@ -6852,7 +6852,7 @@ expect -0.001790066 -0.000895247


===============================================================================
# Wagner I (Kavraisky VI)
# Wagner I (Kavrayskiy VI)
# PCyl, Sph.
===============================================================================

Expand Down

0 comments on commit e79984f

Please sign in to comment.