Merge pull request #1547 from marcel-dancak/bbox-bugfix

mhugent · mhugent · commit dcc7948934ed · 2014-08-29T16:38:08.000+02:00
Mapserver: fixed bounding box of points features collection returned in GetFeatureInfo request
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -1731,6 +1731,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
   }
   QgsFeatureIterator fit = layer->getFeatures( fReq );
 
+  bool featureBBoxInitialized = false;
   while ( fit.nextFeature( feature ) )
   {
     ++featureCounter;
@@ -1760,9 +1761,10 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
       box = mapRender->layerExtentToOutputExtent( layer, feature.geometry()->boundingBox() );
       if ( featureBBox ) //extend feature info bounding box if requested
       {
-        if ( featureBBox->isEmpty() )
+        if ( !featureBBoxInitialized && featureBBox->isEmpty())
         {
           *featureBBox = box;
+          featureBBoxInitialized = true;
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -1731,6 +1731,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,`
`1731`	`1731`	`}`
`1732`	`1732`	`QgsFeatureIterator fit = layer->getFeatures( fReq );`
`1733`	`1733`
	`1734`	`+ bool featureBBoxInitialized = false;`
`1734`	`1735`	`while ( fit.nextFeature( feature ) )`
`1735`	`1736`	`{`
`1736`	`1737`	`++featureCounter;`
`@@ -1760,9 +1761,10 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,`
`1760`	`1761`	`box = mapRender->layerExtentToOutputExtent( layer, feature.geometry()->boundingBox() );`
`1761`	`1762`	`if ( featureBBox ) //extend feature info bounding box if requested`
`1762`	`1763`	`{`
`1763`		`- if ( featureBBox->isEmpty() )`
	`1764`	`+ if ( !featureBBoxInitialized && featureBBox->isEmpty())`
`1764`	`1765`	`{`
`1765`	`1766`	`*featureBBox = box;`
	`1767`	`+ featureBBoxInitialized = true;`
`1766`	`1768`	`}`
`1767`	`1769`	`else`
`1768`	`1770`	`{`