Add method to retrieve destination CRS from QgsDistanceArea

qgis · Jan 8, 2019 · ebd1044 · ebd1044
1 parent dbf8fe6
commit ebd1044
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/python/core/auto_generated/qgsdistancearea.sip.in b/python/core/auto_generated/qgsdistancearea.sip.in
@@ -64,6 +64,19 @@ Sets source spatial reference system ``crs``.
 Returns the source spatial reference system.
 
 .. seealso:: :py:func:`setSourceCrs`
+
+.. seealso:: :py:func:`ellipsoidCrs`
+%End
+
+    QgsCoordinateReferenceSystem ellipsoidCrs() const;
+%Docstring
+Returns the ellipsoid (destination) spatial reference system.
+
+.. seealso:: :py:func:`sourceCrs`
+
+.. seealso:: :py:func:`ellipsoid`
+
+.. versionadded:: 3.6
 %End
 
     bool setEllipsoid( const QString &ellipsoid );
@@ -99,6 +112,8 @@ ellipsoid if a valid ellipsoid has been set.
 .. seealso:: :py:func:`setEllipsoid`
 
 .. seealso:: :py:func:`willUseEllipsoid`
+
+.. seealso:: :py:func:`ellipsoidCrs`
 %End
 
     double ellipsoidSemiMajor() const;

diff --git a/src/core/qgsdistancearea.h b/src/core/qgsdistancearea.h
@@ -71,9 +71,18 @@ class CORE_EXPORT QgsDistanceArea
     /**
      * Returns the source spatial reference system.
      * \see setSourceCrs()
+     * \see ellipsoidCrs()
      */
     QgsCoordinateReferenceSystem sourceCrs() const { return mCoordTransform.sourceCrs(); }
 
+    /**
+     * Returns the ellipsoid (destination) spatial reference system.
+     * \see sourceCrs()
+     * \see ellipsoid()
+     * \since QGIS 3.6
+     */
+    QgsCoordinateReferenceSystem ellipsoidCrs() const { return mCoordTransform.destinationCrs(); }
+
     /**
      * Sets the \a ellipsoid by its acronym. Known ellipsoid acronyms can be
      * retrieved using QgsEllipsoidUtils::acronyms().
@@ -98,6 +107,7 @@ class CORE_EXPORT QgsDistanceArea
      * ellipsoid if a valid ellipsoid has been set.
      * \see setEllipsoid()
      * \see willUseEllipsoid()
+     * \see ellipsoidCrs()
      */
     QString ellipsoid() const { return mEllipsoid; }
 

diff --git a/tests/src/python/test_qgsdistancearea.py b/tests/src/python/test_qgsdistancearea.py
@@ -43,6 +43,12 @@ def testCrs(self):
         da.setSourceCrs(crs, QgsProject.instance().transformContext())
         self.assertEqual(da.sourceCrs().srsid(), crs.srsid())
 
+        self.assertFalse(da.ellipsoidCrs().isValid())
+        da.setEllipsoid("GRS80")
+        self.assertEqual(da.ellipsoidCrs().authid(), 'EPSG:4019')
+        da.setEllipsoid("WGS84")
+        self.assertEqual(da.ellipsoidCrs().authid(), 'EPSG:4030')
+
     def testMeasureLine(self):
         #   +-+
         #   | |