- Drop the name dymaxion in favor of airocean. Adjust the doc accordi…

…ngly.
OSGeo · Nov 1, 2024 · 61a5cdf · 61a5cdf
1 parent f7ab809
commit 61a5cdf
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 31 deletions.
diff --git a/docs/plot/plotdefs.json b/docs/plot/plotdefs.json
@@ -270,13 +270,13 @@
         "type": "poly"
     },
     {
-        "filename": "dymaxion.png",
+        "filename": "airocean.png",
         "latmax": 90,
         "latmin": -90,
         "lonmax": 180,
         "lonmin": -180,
-        "name": "dymaxion",
-        "projstring": "+proj=dymaxion",
+        "name": "airocean",
+        "projstring": "+proj=airocean",
         "res": "low",
         "type": "line",
         "delta_cut": 1e6

diff --git a/...ource/operations/projections/dymaxion.rst → ...ource/operations/projections/airocean.rst b/...ource/operations/projections/dymaxion.rst → ...ource/operations/projections/airocean.rst
@@ -1,12 +1,12 @@
-.. _dymaxion:
+.. _airocean:
 
 ********************************************************************************
-Dymaxion Fuller
+Airocean
 ********************************************************************************
 
-The Dymaxion Fuller map projection is a icosahedron polyhedral projection that intends
+The Airocean map projection is based on the Dymaxion Fuller projection, which is a icosahedron polyhedral projection that intends
 to lay down continental landmasses into a contiguous map with minimal scale and angular
-distorsion while having as few land interruptions as possible.
+distorsion while preserving land surfaces from (most) interruptions.
 In comparison to the Snyder's Icosahedral Equal Area, this projection relies on a specific way 
 to orient and cut the icosahedron so that most interruptions lie within the ocean. The projection
 was first invented by Buckminster Fuller in 1943 using a cubostahedron as basis.
@@ -20,7 +20,7 @@ was formally mathematically defined :cite:`Gray1995`.
 +---------------------+----------------------------------------------------------+
 | **Defined area**    | Global                                                   |
 +---------------------+----------------------------------------------------------+
-| **Alias**           | dymaxion                                                 |
+| **Alias**           | airocean                                                 |
 +---------------------+----------------------------------------------------------+
 | **Domain**          | 2D                                                       |
 +---------------------+----------------------------------------------------------+
@@ -30,16 +30,16 @@ was formally mathematically defined :cite:`Gray1995`.
 +---------------------+----------------------------------------------------------+
 
 
-.. figure:: ./images/dymaxion.png
+.. figure:: ./images/airocean.png
    :width: 500 px
    :align: center
-   :alt:   Dymaxion Fuller
+   :alt:   Airocean
 
-   proj-string: ``+proj=dymaxion``
+   proj-string: ``+proj=airocean``
 
 .. note::
-   The output dymaxion map applied to the whole globe has an extent of roughly
-   :math:`[0, 0, 17404000, 36844000]` in meters. Although the dymaxion map has no
+   The airocean map of the whole globe has an extent of approximatelly
+   :math:`[0, 0, 17404000, 36844000]` in meters. Although the airocean map has no
    true up or down, the choice was made to lay it out vertically, from Antartica to Australia.
 
 

diff --git a/...perations/projections/images/dymaxion.png → ...perations/projections/images/airocean.png b/...perations/projections/images/dymaxion.png → ...perations/projections/images/airocean.png
diff --git a/docs/source/operations/projections/index.rst b/docs/source/operations/projections/index.rst
@@ -17,6 +17,7 @@ Projections map the spherical 3D space to a flat 2D space.
    adams_ws2
    aea
    aeqd
+   airocean
    airy
    aitoff
    alsk
@@ -38,7 +39,6 @@ Projections map the spherical 3D space to a flat 2D space.
    comill
    crast
    denoy
-   dymaxion
    eck1
    eck2
    eck3

diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
@@ -28,7 +28,7 @@ print_variable(ENABLE_IPO)
 ##############################################
 
 set(SRC_LIBPROJ_PROJECTIONS
-  projections/dymaxion.cpp
+  projections/airocean.cpp
   projections/aeqd.cpp
   projections/adams.cpp
   projections/gnom.cpp

diff --git a/src/pj_list.h b/src/pj_list.h
@@ -37,7 +37,7 @@ PROJ_HEAD(crast, "Craster Parabolic (Putnins P4)")
 PROJ_HEAD(defmodel, "Deformation model")
 PROJ_HEAD(deformation, "Kinematic grid shift")
 PROJ_HEAD(denoy, "Denoyer Semi-Elliptical")
-PROJ_HEAD(dymaxion, "Dymaxion Fuller")
+PROJ_HEAD(airocean, "Airocean Fuller")
 PROJ_HEAD(eck1, "Eckert I")
 PROJ_HEAD(eck2, "Eckert II")
 PROJ_HEAD(eck3, "Eckert III")

diff --git a/src/projections/dymaxion.cpp → src/projections/airocean.cpp b/src/projections/dymaxion.cpp → src/projections/airocean.cpp
diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
@@ -1163,13 +1163,13 @@ expect  -223377.422876954 -111701.072127637
 
 
 ===============================================================================
-# Dymaxion
+# Airocean
 # 	Sph., Ellps.
 # (Each of the 23 faces tested separately around their center, inverse included)
 ===============================================================================
 
 -------------------------------------------------------------------------------
-operation +proj=dymaxion   +ellps=GRS80
+operation +proj=airocean   +ellps=GRS80
 -------------------------------------------------------------------------------
 tolerance 0.1 mm
 accept 23 28