Fix QgsDistanceArea returning an uninitialized and never set

manisandro · mhugent · commit 35516fd344ef · 2014-05-07T08:42:44.000+02:00
member variable instead of the actual source crs srsid
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
@@ -82,7 +82,6 @@ void QgsDistanceArea::_copy( const QgsDistanceArea & origDA )
   // Some calculations and trig. Should not be TOO time consuming.
   // Alternatively we could copy the temp vars?
   computeAreaInit();
-  mSourceRefSys = origDA.mSourceRefSys;
   mCoordTransform = new QgsCoordinateTransform( origDA.mCoordTransform->sourceCrs(), origDA.mCoordTransform->destCRS() );
 }
 
@@ -1008,3 +1007,4 @@ void QgsDistanceArea::convertMeasurement( double &measure, QGis::UnitType &measu
   QgsDebugMsg( QString( "to %1 %2" ).arg( QString::number( measure ), QGis::toLiteral( displayUnits ) ) );
   measureUnits = displayUnits;
 }
+
diff --git a/src/core/qgsdistancearea.h b/src/core/qgsdistancearea.h
@@ -65,7 +65,7 @@ class CORE_EXPORT QgsDistanceArea
     void setSourceAuthId( QString authid );
 
     //! returns source spatial reference system
-    long sourceCrs() const { return mSourceRefSys; }
+    long sourceCrs() const { return mCoordTransform->sourceCrs().srsid(); }
     //! What sort of coordinate system is being used?
     bool geographic() const { return mCoordTransform->sourceCrs().geographicFlag(); }
 
@@ -154,9 +154,6 @@ class CORE_EXPORT QgsDistanceArea
     //! indicates whether we will transform coordinates
     bool mEllipsoidalMode;
 
-    //! id of the source spatial reference system
-    long mSourceRefSys;
-
     //! ellipsoid acronym (from table tbl_ellipsoids)
     QString mEllipsoid;
 
@@ -180,3 +177,4 @@ class CORE_EXPORT QgsDistanceArea
 };
 
 #endif
+

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,6 @@ void QgsDistanceArea::_copy( const QgsDistanceArea & origDA )`
`82`	`82`	`// Some calculations and trig. Should not be TOO time consuming.`
`83`	`83`	`// Alternatively we could copy the temp vars?`
`84`	`84`	`computeAreaInit();`
`85`		`- mSourceRefSys = origDA.mSourceRefSys;`
`86`	`85`	`mCoordTransform = new QgsCoordinateTransform( origDA.mCoordTransform->sourceCrs(), origDA.mCoordTransform->destCRS() );`
`87`	`86`	`}`
`88`	`87`
`@@ -1008,3 +1007,4 @@ void QgsDistanceArea::convertMeasurement( double &measure, QGis::UnitType &measu`
`1008`	`1007`	`QgsDebugMsg( QString( "to %1 %2" ).arg( QString::number( measure ), QGis::toLiteral( displayUnits ) ) );`
`1009`	`1008`	`measureUnits = displayUnits;`
`1010`	`1009`	`}`
	`1010`	`+`