sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Snapping utils optimization

Browse Source 
Avoid snapping to edges if vertex has already been found.
Also increase the maximum feature count to 1M before doing non-indexed queries
This commit is contained in:
Martin Dobias 2015-01-20 21:18:06 +07:00
parent 5361a6914e
commit 8177bbef1a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/qgssnappingutils.cpp
View File

@ -73,7 +73,7 @@ QgsPointLocator* QgsSnappingUtils::locatorForLayerUsingStrategy( QgsVectorLayer*
return temporaryLocatorForLayer( vl, pointMap, tolerance );
else // Hybrid
{
if ( vl->pendingFeatureCount() > 100000 )
if ( vl->pendingFeatureCount() > 1000000 )
return temporaryLocatorForLayer( vl, pointMap, tolerance );
else
return locatorForLayer( vl );
@ -95,6 +95,9 @@ QgsPointLocator* QgsSnappingUtils::temporaryLocatorForLayer( QgsVectorLayer* vl,
static QgsPointLocator::Match _findClosestSegmentIntersection( const QgsPoint& pt, const QgsPointLocator::MatchList& segments )
{
if ( segments.isEmpty() )
return QgsPointLocator::Match();
QSet<QgsPoint> endpoints;
// make a geometry
@ -180,7 +183,7 @@ static void _updateBestMatch( QgsPointLocator::Match& bestMatch, const QgsPoint&
{
_replaceIfBetter( bestMatch, loc->nearestVertex( pointMap, tolerance, filter ), tolerance );
}
if ( type & QgsPointLocator::Edge )
if ( bestMatch.type() != QgsPointLocator::Vertex && ( type & QgsPointLocator::Edge ) )
{
_replaceIfBetter( bestMatch, loc->nearestEdge( pointMap, tolerance, filter ), tolerance );
}