Obtain the correct SRS even when on-the-fly projection is disabled.

g_j_m · g_j_m · commit 7c4085482650 · 2006-02-07T06:07:55.000Z
Fixes bug with areas and line measurements being wrong in some cases git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4808 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
@@ -55,12 +55,16 @@ void QgsDistanceArea::setSourceSRS(long srsid)
 
 void QgsDistanceArea::setProjectAsSourceSRS()
 {
-  int projEnabled = QgsProject::instance()->readNumEntry("SpatialRefSys","/ProjectionsEnabled",0);
-  long srsid = GEOSRS_ID;
-  if (projEnabled)
-  {
-    srsid = QgsProject::instance()->readNumEntry("SpatialRefSys","/ProjectSRSID",GEOSRS_ID);
-  }
+  // This function used to only get the /ProjectSRSID if on-the-fly
+  // projection was enabled (and used a default value in all other
+  // cases). However, even if it was not, a valid value for
+  // /ProjectSRSID is most likely available, and we now use it in all
+  // cases (as it gives correct distances and areas even when
+  // on-the-fly projection is turned off). The default of GEOSRS_ID
+  // is still applied if all else fails.
+
+  int srsid = QgsProject::instance()->readNumEntry("SpatialRefSys","/ProjectSRSID",GEOSRS_ID);
+0
   setSourceSRS(srsid);
 }
 
