Replaced some occurences of default srs id with epgs id

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8673 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jun 23, 2008 · bb9f724 · bb9f724
1 parent 13d7f00
commit bb9f724
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
@@ -43,7 +43,7 @@ QgsDistanceArea::QgsDistanceArea()
   // init with default settings
   mProjectionsEnabled = FALSE;
   mCoordTransform = new QgsCoordinateTransform;
-  setSourceSRS(GEOSRS_ID); // WGS 84
+  setSourceSRS(EPSGID); // WGS 84
   setEllipsoid("WGS84");
 }
 
@@ -60,10 +60,10 @@ void QgsDistanceArea::setProjectionsEnabled(bool flag)
 }
 
 
-void QgsDistanceArea::setSourceSRS(long srsid)
+void QgsDistanceArea::setSourceSRS(long epsgId)
 {
   QgsSpatialRefSys srcSRS;
-  srcSRS.createFromSrsId(srsid);
+  srcSRS.createFromEpsg(epsgId);
   mCoordTransform->setSourceSRS(srcSRS);
 }
 

diff --git a/src/core/qgsdistancearea.h b/src/core/qgsdistancearea.h
@@ -50,7 +50,7 @@ class CORE_EXPORT QgsDistanceArea
     bool projectionsEnabled() { return mProjectionsEnabled; }
 
     //! sets source spatial reference system (by QGIS SRS)
-    void setSourceSRS(long srsid);
+    void setSourceSRS(long epsgId);
 
     //! returns source spatial reference system
     long sourceSRS() { return mSourceRefSys; }

diff --git a/src/core/qgsmaprender.cpp b/src/core/qgsmaprender.cpp
@@ -48,8 +48,7 @@ QgsMapRender::QgsMapRender()
   mSize = QSize(0,0);
 
   mProjectionsEnabled = FALSE;
-  mDestSRS = new QgsSpatialRefSys(GEOSRS_ID, QgsSpatialRefSys::QGIS_SRSID); // WGS 84
-
+  mDestSRS = new QgsSpatialRefSys(EPSGID, QgsSpatialRefSys::EPSG); //WGS 84
 }
 
 QgsMapRender::~QgsMapRender()

diff --git a/src/core/qgsspatialrefsys.cpp b/src/core/qgsspatialrefsys.cpp
@@ -954,7 +954,7 @@ bool QgsSpatialRefSys::readXML( QDomNode & theNode )
   else
   {
     // Return default SRS if none was found in the XML.
-    createFromSrsId(GEOSRS_ID);
+    createFromEpsg(EPSGID);
   }
   return true;
 }

diff --git a/src/gui/qgsprojectionselector.h b/src/gui/qgsprojectionselector.h
@@ -75,6 +75,8 @@ class GUI_EXPORT QgsProjectionSelector: public QWidget, private Ui::QgsProjectio
 
       void setSelectedSRSID(long theSRSID);
 
+      //void setSelectedEPSG(long epsg);
+
       QString getCurrentProj4String();
 
       //! Gets the current PostGIS-style projection identifier