Replaced some occurences of default srs id with epgs id

mhugent · mhugent · commit d6ec8ce61207 · 2008-06-23T11:50:12.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@8673 c8812cc2-4d05-0410-92ff-de0c093fc19c
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

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ QgsDistanceArea::QgsDistanceArea()`
`43`	`43`	`// init with default settings`
`44`	`44`	`mProjectionsEnabled = FALSE;`
`45`	`45`	`mCoordTransform = new QgsCoordinateTransform;`
`46`		`- setSourceSRS(GEOSRS_ID); // WGS 84`
	`46`	`+ setSourceSRS(EPSGID); // WGS 84`
`47`	`47`	`setEllipsoid("WGS84");`
`48`	`48`	`}`
`49`	`49`
`@@ -60,10 +60,10 @@ void QgsDistanceArea::setProjectionsEnabled(bool flag)`
`60`	`60`	`}`
`61`	`61`
`62`	`62`
`63`		`-void QgsDistanceArea::setSourceSRS(long srsid)`
	`63`	`+void QgsDistanceArea::setSourceSRS(long epsgId)`
`64`	`64`	`{`
`65`	`65`	`QgsSpatialRefSys srcSRS;`
`66`		`- srcSRS.createFromSrsId(srsid);`
	`66`	`+ srcSRS.createFromEpsg(epsgId);`
`67`	`67`	`mCoordTransform->setSourceSRS(srcSRS);`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@ QgsMapRender::QgsMapRender()`
`48`	`48`	`mSize = QSize(0,0);`
`49`	`49`
`50`	`50`	`mProjectionsEnabled = FALSE;`
`51`		`- mDestSRS = new QgsSpatialRefSys(GEOSRS_ID, QgsSpatialRefSys::QGIS_SRSID); // WGS 84`
`52`		`-`
	`51`	`+ mDestSRS = new QgsSpatialRefSys(EPSGID, QgsSpatialRefSys::EPSG); //WGS 84`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`QgsMapRender::~QgsMapRender()`
Original file line number	Diff line number	Diff line change
`@@ -954,7 +954,7 @@ bool QgsSpatialRefSys::readXML( QDomNode & theNode )`
`954`	`954`	`else`
`955`	`955`	`{`
`956`	`956`	`// Return default SRS if none was found in the XML.`
`957`		`- createFromSrsId(GEOSRS_ID);`
	`957`	`+ createFromEpsg(EPSGID);`
`958`	`958`	`}`
`959`	`959`	`return true;`
`960`	`960`	`}`