Improved recognition of crs for wfs provider

mhugent · mhugent · commit 0d32bcc3f0a2 · 2007-06-29T10:35:04.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7055 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -60,7 +60,6 @@ QgsWFSProvider::QgsWFSProvider(const QString& uri)
 QgsWFSProvider::~QgsWFSProvider()
 {
   delete mSelectedFeatures;
-  delete mSourceSRS;
   for(std::list<std::pair<GEOS_GEOM::Envelope*, QgsFeature*> >::iterator it = mEnvelopesAndFeatures.begin();\
       it != mEnvelopesAndFeatures.end(); ++it)
     {
@@ -146,10 +145,7 @@ void QgsWFSProvider::reset()
 
 QgsSpatialRefSys QgsWFSProvider::getSRS()
 {
-  if (mSourceSRS)
-    return *mSourceSRS;
-  else
-    return QgsSpatialRefSys();
+  return mSourceSRS;
 }
 
 QgsRect QgsWFSProvider::extent()
@@ -291,7 +287,7 @@ int QgsWFSProvider::getFeatureGET(const QString& uri, const QString& geometryAtt
       thematicAttributes.insert(it->name());
     }
   
-  QgsWFSData dataReader(uri, &mExtent, mSourceSRS, &dataFeatures, geometryAttribute, thematicAttributes, &mWKBType);
+  QgsWFSData dataReader(uri, &mExtent, &mSourceSRS, &dataFeatures, geometryAttribute, thematicAttributes, &mWKBType);
   if(dataReader.getWFSData() != 0)
     {
       qWarning("getWFSData returned with error");
@@ -723,12 +719,9 @@ int QgsWFSProvider::setSRSFromGML2(const QDomElement& wfsCollectionElement)
 	}
     }
 
-  mSourceSRS = new QgsSpatialRefSys();
-  if(!mSourceSRS->createFromEpsg(epsgId))
+  if(!mSourceSRS.createFromEpsg(epsgId))
     {
       QgsDebugMsg("Error, creation of QgsSpatialRefSys failed");
-      delete mSourceSRS;
-      mSourceSRS = 0;
       return 6;
     }
   return 0;
diff --git a/src/providers/wfs/qgswfsprovider.h b/src/providers/wfs/qgswfsprovider.h
@@ -119,7 +119,7 @@ class QgsWFSProvider: public QgsVectorDataProvider
   /**Geometry type of the features in this layer*/
   mutable QGis::WKBTYPE mWKBType;
   /**Source SRS*/
-  QgsSpatialRefSys* mSourceSRS;
+  QgsSpatialRefSys mSourceSRS;
   int mFeatureCount;
   /**Flag if provider is valid*/
   bool mValid;

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ QgsWFSProvider::QgsWFSProvider(const QString& uri)`
`60`	`60`	`QgsWFSProvider::~QgsWFSProvider()`
`61`	`61`	`{`
`62`	`62`	`delete mSelectedFeatures;`
`63`		`- delete mSourceSRS;`
`64`	`63`	`for(std::list<std::pair<GEOS_GEOM::Envelope, QgsFeature> >::iterator it = mEnvelopesAndFeatures.begin();\`
`65`	`64`	`it != mEnvelopesAndFeatures.end(); ++it)`
`66`	`65`	`{`
`@@ -146,10 +145,7 @@ void QgsWFSProvider::reset()`
`146`	`145`
`147`	`146`	`QgsSpatialRefSys QgsWFSProvider::getSRS()`
`148`	`147`	`{`
`149`		`- if (mSourceSRS)`
`150`		`- return *mSourceSRS;`
`151`		`- else`
`152`		`- return QgsSpatialRefSys();`
	`148`	`+ return mSourceSRS;`
`153`	`149`	`}`
`154`	`150`
`155`	`151`	`QgsRect QgsWFSProvider::extent()`
`@@ -291,7 +287,7 @@ int QgsWFSProvider::getFeatureGET(const QString& uri, const QString& geometryAtt`
`291`	`287`	`thematicAttributes.insert(it->name());`
`292`	`288`	`}`
`293`	`289`
`294`		`- QgsWFSData dataReader(uri, &mExtent, mSourceSRS, &dataFeatures, geometryAttribute, thematicAttributes, &mWKBType);`
	`290`	`+ QgsWFSData dataReader(uri, &mExtent, &mSourceSRS, &dataFeatures, geometryAttribute, thematicAttributes, &mWKBType);`
`295`	`291`	`if(dataReader.getWFSData() != 0)`
`296`	`292`	`{`
`297`	`293`	`qWarning("getWFSData returned with error");`
`@@ -723,12 +719,9 @@ int QgsWFSProvider::setSRSFromGML2(const QDomElement& wfsCollectionElement)`
`723`	`719`	`}`
`724`	`720`	`}`
`725`	`721`
`726`		`- mSourceSRS = new QgsSpatialRefSys();`
`727`		`- if(!mSourceSRS->createFromEpsg(epsgId))`
	`722`	`+ if(!mSourceSRS.createFromEpsg(epsgId))`
`728`	`723`	`{`
`729`	`724`	`QgsDebugMsg("Error, creation of QgsSpatialRefSys failed");`
`730`		`- delete mSourceSRS;`
`731`		`- mSourceSRS = 0;`
`732`	`725`	`return 6;`
`733`	`726`	`}`
`734`	`727`	`return 0;`