Feature #8725: check QgsFeatureRequest::NoGeometry

ahuarte47 · ahuarte47 · commit 40b5b1e3c7e6 · 2013-10-23T11:06:18.000+02:00
diff --git a/src/core/qgsfeaturerequest.cpp b/src/core/qgsfeaturerequest.cpp
@@ -564,7 +564,7 @@ bool QgsFeatureRequest::simplifyGeometry( QgsGeometry* geometry, const QgsCoordi
     unsigned char* targetWkb = (unsigned char*)malloc( targetWkbSize );
     memcpy( targetWkb, wkb, targetWkbSize );
     geometry->fromWkb( targetWkb, targetWkbSize );
-	return true;
+    return true;
   }
   return false;
 }
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -694,7 +694,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
                                      .setSubsetOfAttributes( attributes );
 
   // Enable the simplification of the geometries before fetch the features using the current map2pixel context.
-  if ( mSimplifyDrawing )
+  if ( mSimplifyDrawing && !(featureRequest.flags() & QgsFeatureRequest::NoGeometry) )
   {
     featureRequest.setFlags( featureRequest.flags() | QgsFeatureRequest::SimplifyGeometries );
     featureRequest.setCoordinateTransform( rendererContext.coordinateTransform() );
@@ -1221,7 +1221,7 @@ QgsFeatureIterator QgsVectorLayer::getFeatures( const QgsFeatureRequest& request
   if ( !mDataProvider )
     return QgsFeatureIterator();
 
-  if ( mSimplifyDrawing && request.flags() & QgsFeatureRequest::SimplifyGeometries )
+  if ( mSimplifyDrawing && (request.flags() & QgsFeatureRequest::SimplifyGeometries) && !(request.flags() & QgsFeatureRequest::NoGeometry) )
     return QgsFeatureIterator( new QgsSimplifiedVectorLayerFeatureIterator( this, request ) );
 
   return QgsFeatureIterator( new QgsVectorLayerFeatureIterator( this, request ) );

Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ bool QgsFeatureRequest::simplifyGeometry( QgsGeometry* geometry, const QgsCoordi`
`564`	`564`	`unsigned char* targetWkb = (unsigned char*)malloc( targetWkbSize );`
`565`	`565`	`memcpy( targetWkb, wkb, targetWkbSize );`
`566`	`566`	`geometry->fromWkb( targetWkb, targetWkbSize );`
`567`		`- return true;`
	`567`	`+ return true;`
`568`	`568`	`}`
`569`	`569`	`return false;`
`570`	`570`	`}`