Skip to content

Commit 40b5b1e

Browse files
committedOct 23, 2013
Feature #8725: check QgsFeatureRequest::NoGeometry
1 parent daa72c2 commit 40b5b1e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed
 

‎src/core/qgsfeaturerequest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ bool QgsFeatureRequest::simplifyGeometry( QgsGeometry* geometry, const QgsCoordi
564564
unsigned char* targetWkb = (unsigned char*)malloc( targetWkbSize );
565565
memcpy( targetWkb, wkb, targetWkbSize );
566566
geometry->fromWkb( targetWkb, targetWkbSize );
567-
return true;
567+
return true;
568568
}
569569
return false;
570570
}

‎src/core/qgsvectorlayer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
694694
.setSubsetOfAttributes( attributes );
695695

696696
// Enable the simplification of the geometries before fetch the features using the current map2pixel context.
697-
if ( mSimplifyDrawing )
697+
if ( mSimplifyDrawing && !(featureRequest.flags() & QgsFeatureRequest::NoGeometry) )
698698
{
699699
featureRequest.setFlags( featureRequest.flags() | QgsFeatureRequest::SimplifyGeometries );
700700
featureRequest.setCoordinateTransform( rendererContext.coordinateTransform() );
@@ -1221,7 +1221,7 @@ QgsFeatureIterator QgsVectorLayer::getFeatures( const QgsFeatureRequest& request
12211221
if ( !mDataProvider )
12221222
return QgsFeatureIterator();
12231223

1224-
if ( mSimplifyDrawing && request.flags() & QgsFeatureRequest::SimplifyGeometries )
1224+
if ( mSimplifyDrawing && (request.flags() & QgsFeatureRequest::SimplifyGeometries) && !(request.flags() & QgsFeatureRequest::NoGeometry) )
12251225
return QgsFeatureIterator( new QgsSimplifiedVectorLayerFeatureIterator( this, request ) );
12261226

12271227
return QgsFeatureIterator( new QgsVectorLayerFeatureIterator( this, request ) );

0 commit comments

Comments
 (0)
Please sign in to comment.