Merge pull request #4367 from nyalldawson/distance_area_api

Cleanup QgsDistanceArea API and sipify, add cache for ellipsoid lookup
qgis · Apr 18, 2017 · 0c1f97c · 0c1f97c
2 parents 7b202ed + 05b737c
commit 0c1f97c
Show file tree

Hide file tree

Showing 46 changed files with 1,133 additions and 980 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -951,7 +951,14 @@ QgsDial        {#qgis_api_break_3_0_QgsDial}
 QgsDistanceArea        {#qgis_api_break_3_0_QgsDistanceArea}
 ---------------
 
+- setEllipsoidalMode() was removed. Ellipsoidal calculations are now enabled whenever a valid ellipsoid() has been set. Set the
+ellipsoid to 'NONE' to disable ellipsoidal calculations.
+- ellipsoidalEnabled() was removed. Ellipsoidal calculations are now enabled whenever a valid ellipsoid() is set. Check
+willUseEllipsoid() to determine whether ellipsoidal calculations will be performed.
 - sourceCrs() now returns a QgsCoordinateReferenceSystem instead of the crs ID.
+- setSourceCrs() now requires a QgsCoordinateReferenceSystem instead of crs ID.
+- setSourceAuthId() was removed. Use setSourceCrs() instead.
+- geographic() was removed. Check sourceCrs().isGeographic() instead.
 - measure() has been removed. Use measureArea() or measureLength() instead.
 - textUnit() was removed. Use formatDistance() or formatArea() instead.
 - convertMeasurement was removed. Use QgsUnitTypes for conversion instead.

diff --git a/python/auto_sip.blacklist b/python/auto_sip.blacklist
@@ -19,7 +19,6 @@ core/qgsdatasourceuri.sip
 core/qgsdatetimestatisticalsummary.sip
 core/qgsdatumtransformstore.sip
 core/qgsdbfilterproxymodel.sip
-core/qgsdistancearea.sip
 core/qgseditformconfig.sip
 core/qgseditorwidgetsetup.sip
 core/qgserror.sip

diff --git a/python/core/core.sip b/python/core/core.sip
@@ -47,6 +47,7 @@
 %Include qgsdistancearea.sip
 %Include qgseditformconfig.sip
 %Include qgseditorwidgetsetup.sip
+%Include qgsellipsoidutils.sip
 %Include qgserror.sip
 %Include qgsexpression.sip
 %Include qgsexpressioncontext.sip

diff --git a/python/core/qgscoordinatereferencesystem.sip b/python/core/qgscoordinatereferencesystem.sip
@@ -181,7 +181,7 @@ class QgsCoordinateReferenceSystem
      * @param type One of the types described in CrsType
      */
     // TODO QGIS 3: remove type and always use EPSG code
-    QgsCoordinateReferenceSystem( const long id, CrsType type = PostgisCrsId );
+    explicit QgsCoordinateReferenceSystem( const long id, CrsType type = PostgisCrsId );
 
     operator QVariant() const;
     static QList< long > validSrsIds();