Fix for bug with wfs point layers that don't provide bbox information

mhugent · mhugent · commit 61a292fe0723 · 2009-05-22T06:34:32.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@10834 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/wfs/qgswfsdata.cpp b/src/providers/wfs/qgswfsdata.cpp
@@ -824,6 +824,8 @@ void QgsWFSData::calculateExtentFromFeatures() const
 
     QgsFeature* currentFeature = 0;
     QgsGeometry* currentGeometry = 0;
+    bool bboxInitialised = false; //gets true once bbox has been set to the first geometry
+
     for(int i = 0; i < mFeatures.size(); ++i)
     {
         currentFeature = mFeatures[i];
@@ -834,9 +836,10 @@ void QgsWFSData::calculateExtentFromFeatures() const
         currentGeometry = currentFeature->geometry();
         if(currentGeometry)
         {
-            if(bbox.isEmpty())
+            if(!bboxInitialised)
             {
                 bbox = currentGeometry->boundingBox();
+                bboxInitialised = true;
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -824,6 +824,8 @@ void QgsWFSData::calculateExtentFromFeatures() const`
`824`	`824`
`825`	`825`	`QgsFeature* currentFeature = 0;`
`826`	`826`	`QgsGeometry* currentGeometry = 0;`
	`827`	`+ bool bboxInitialised = false; //gets true once bbox has been set to the first geometry`
	`828`	`+`
`827`	`829`	`for(int i = 0; i < mFeatures.size(); ++i)`
`828`	`830`	`{`
`829`	`831`	`currentFeature = mFeatures[i];`
`@@ -834,9 +836,10 @@ void QgsWFSData::calculateExtentFromFeatures() const`
`834`	`836`	`currentGeometry = currentFeature->geometry();`
`835`	`837`	`if(currentGeometry)`
`836`	`838`	`{`
`837`		`- if(bbox.isEmpty())`
	`839`	`+ if(!bboxInitialised)`
`838`	`840`	`{`
`839`	`841`	`bbox = currentGeometry->boundingBox();`
	`842`	`+ bboxInitialised = true;`
`840`	`843`	`}`
`841`	`844`	`else`
`842`	`845`	`{`