Commit cc13f9d 1 parent d8b55a2 commit cc13f9d Copy full SHA for cc13f9d
File tree 2 files changed +4
-4
lines changed
2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -728,8 +728,8 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
728
728
double sourceHypothenuse = sqrt ( minimumSrcPoint.sqrDist ( maximumSrcPoint ) );
729
729
double targetHypothenuse = sqrt ( minimumDstPoint.sqrDist ( maximumDstPoint ) );
730
730
731
- if ( sourceHypothenuse != 0 )
732
- map2pixelTol *= targetHypothenuse / sourceHypothenuse ;
731
+ if ( targetHypothenuse != 0 )
732
+ map2pixelTol *= ( sourceHypothenuse / targetHypothenuse ) ;
733
733
}
734
734
735
735
QgsSimplifyMethod simplifyMethod;
@@ -1258,7 +1258,7 @@ bool QgsVectorLayer::setSubsetString( QString subset )
1258
1258
1259
1259
bool QgsVectorLayer::simplifyDrawingCanbeApplied ( int simplifyHint ) const
1260
1260
{
1261
- return mDataProvider && !mEditBuffer && ( mSimplifyMethod .simplifyHints () & simplifyHint ) && ( !mCurrentRendererContext || mCurrentRendererContext ->useRenderingOptimization () );
1261
+ return mDataProvider && !mEditBuffer && ( hasGeometryType () && geometryType () != QGis:: Point ) && ( mSimplifyMethod .simplifyHints () & simplifyHint ) && ( !mCurrentRendererContext || mCurrentRendererContext ->useRenderingOptimization () );
1262
1262
}
1263
1263
1264
1264
QgsFeatureIterator QgsVectorLayer::getFeatures ( const QgsFeatureRequest& request )
Original file line number Diff line number Diff line change @@ -455,7 +455,7 @@ bool QgsVectorLayerFeatureIterator::prepareSimplification( const QgsSimplifyMeth
455
455
mEditGeometrySimplifier = NULL ;
456
456
457
457
// setup simplification for edited geometries to fetch
458
- if ( !( mRequest .flags () & QgsFeatureRequest::NoGeometry ) && simplifyMethod.methodType () != QgsSimplifyMethod::NoSimplification )
458
+ if ( !( mRequest .flags () & QgsFeatureRequest::NoGeometry ) && simplifyMethod.methodType () != QgsSimplifyMethod::NoSimplification && L-> hasGeometryType () && L-> geometryType () != QGis:: Point )
459
459
{
460
460
mEditGeometrySimplifier = QgsSimplifyMethod::createGeometrySimplifier ( simplifyMethod );
461
461
return mEditGeometrySimplifier != NULL ;
You can’t perform that action at this time.
0 commit comments