Add celestial body name to EllipsoidDefinition

Requires proj 8.1+
qgis · May 10, 2021 · 7e1f9d7 · 7e1f9d7
1 parent 95ed5ec
commit 7e1f9d7
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 0 deletions.
diff --git a/python/core/auto_generated/proj/qgsellipsoidutils.sip.in b/python/core/auto_generated/proj/qgsellipsoidutils.sip.in
@@ -40,6 +40,8 @@ Contains utility functions for working with ellipsoids and querying the ellipsoi
       QString acronym;
       QString description;
       QgsEllipsoidUtils::EllipsoidParameters parameters;
+
+      QString celestialBodyName;
     };
 
     static EllipsoidParameters ellipsoidParameters( const QString &ellipsoid );

diff --git a/python/core/auto_generated/proj/qgsprojutils.sip.in b/python/core/auto_generated/proj/qgsprojutils.sip.in
@@ -27,6 +27,13 @@ Utility functions for working with the proj library.
     static int projVersionMajor();
 %Docstring
 Returns the proj library major version number.
+%End
+
+    static int projVersionMinor();
+%Docstring
+Returns the proj library minor version number.
+
+.. versionadded:: 3.20
 %End
 
     static QString epsgRegistryVersion();

diff --git a/src/core/proj/qgsellipsoidutils.cpp b/src/core/proj/qgsellipsoidutils.cpp
@@ -269,6 +269,10 @@ QList<QgsEllipsoidUtils::EllipsoidDefinition> QgsEllipsoidUtils::definitions()
             name.replace( '_', ' ' );
             def.description = QStringLiteral( "%1 (%2:%3)" ).arg( name, authority, code );
 
+#if PROJ_VERSION_MAJOR>8 || (PROJ_VERSION_MAJOR==8 && PROJ_VERSION_MINOR>=1)
+            def.celestialBodyName = proj_get_celestial_body_name( context, ellipsoid.get() );
+#endif
+
             double semiMajor, semiMinor, invFlattening;
             int semiMinorComputed = 0;
             if ( proj_ellipsoid_get_parameters( context, ellipsoid.get(), &semiMajor, &semiMinor, &semiMinorComputed, &invFlattening ) )

diff --git a/src/core/proj/qgsellipsoidutils.h b/src/core/proj/qgsellipsoidutils.h
@@ -68,6 +68,15 @@ class CORE_EXPORT QgsEllipsoidUtils
       QString description;
       //! Ellipsoid parameters
       QgsEllipsoidUtils::EllipsoidParameters parameters;
+
+      /**
+       * Name of the associated celestial body (e.g. "Earth").
+       *
+       * \warning This method requires PROJ 8.1 or later. On earlier PROJ builds the string will always be empty.
+       *
+       * \since QGIS 3.20
+       */
+      QString celestialBodyName;
     };
 
     /**

diff --git a/src/core/proj/qgsprojutils.cpp b/src/core/proj/qgsprojutils.cpp
@@ -359,6 +359,11 @@ int QgsProjUtils::projVersionMajor()
   return PROJ_VERSION_MAJOR;
 }
 
+int QgsProjUtils::projVersionMinor()
+{
+  return PROJ_VERSION_MINOR;
+}
+
 QString QgsProjUtils::epsgRegistryVersion()
 {
   PJ_CONTEXT *context = QgsProjContext::get();

diff --git a/src/core/proj/qgsprojutils.h b/src/core/proj/qgsprojutils.h
@@ -50,6 +50,13 @@ class CORE_EXPORT QgsProjUtils
      */
     static int projVersionMajor();
 
+    /**
+     * Returns the proj library minor version number.
+     *
+     * \since QGIS 3.20
+     */
+    static int projVersionMinor();
+
     /**
      * Returns the EPSG registry database version used by the proj library (e.g. "v9.8.6").
      *

diff --git a/tests/src/python/test_qgsellipsoidutils.py b/tests/src/python/test_qgsellipsoidutils.py
@@ -98,6 +98,10 @@ def testDefinitions(self):
         self.assertEqual(gany_defs.acronym, gany_id)
         self.assertEqual(gany_defs.description,
                          'Ganymede 2000 IAU IAG (ESRI:107916)')
+
+        if QgsProjUtils.projVersionMajor() > 8 or (QgsProjUtils.projVersionMajor() == 8 and QgsProjUtils.projVersionMinor() >= 1):
+            self.assertEqual(gany_defs.celestialBodyName, 'Ganymede')
+
         self.assertTrue(gany_defs.parameters.valid)
         self.assertEqual(gany_defs.parameters.semiMajor,
                          2632345.0)