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

Do not report duplicate errors in missing vertex check

Browse Source
This commit is contained in:
Matthias Kuhn 2018-09-26 14:22:37 +02:00
parent f78bdf0541
commit b05ea1a1dc
No known key found for this signature in database
GPG Key ID: 7A7F1A1C90C3E6A7
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/analysis/vector/geometry_checker/qgsgeometrymissingvertexcheck.cpp
View File

@ -75,7 +75,8 @@ QStringList QgsGeometryMissingVertexCheck::resolutionMethods() const
void QgsGeometryMissingVertexCheck::processPolygon( const QgsCurvePolygon *polygon, QgsFeaturePool *featurePool, QList<QgsGeometryCheckError *> &errors, const QgsGeometryCheckerUtils::LayerFeature &layerFeature ) const
{
std::unique_ptr<QgsGeometryCollection> boundaries = qgis::make_unique<QgsGeometryCollection>();
const QgsFeature &currentFeature = layerFeature.feature();
std::unique_ptr<QgsMultiPolygon> boundaries = qgis::make_unique<QgsMultiPolygon>();
std::unique_ptr< QgsGeometryEngine > geomEngine = QgsGeometryCheckerUtils::createGeomEngine( polygon->exteriorRing(), mContext->tolerance );
boundaries->addGeometry( geomEngine->buffer( mContext->tolerance, 5 ) );
@ -92,15 +93,15 @@ void QgsGeometryMissingVertexCheck::processPolygon( const QgsCurvePolygon *polyg
const QgsFeatureIds fids = featurePool->getIntersects( boundaries->boundingBox() );
QgsFeature feature;
QgsFeature compareFeature;
for ( QgsFeatureId fid : fids )
{
if ( fid == layerFeature.feature().id() )
if ( fid == currentFeature.id() )
continue;
if ( featurePool->getFeature( fid, feature ) )
if ( featurePool->getFeature( fid, compareFeature ) )
{
QgsVertexIterator vertexIterator = feature.geometry().vertices();
QgsVertexIterator vertexIterator = compareFeature.geometry().vertices();
while ( vertexIterator.hasNext() )
{
const QgsPoint &pt = vertexIterator.next();
@ -111,7 +112,18 @@ void QgsGeometryMissingVertexCheck::processPolygon( const QgsCurvePolygon *polyg
if ( closestVertex.distance( pt ) > mContext->tolerance )
{
errors.append( new QgsGeometryCheckError( this, layerFeature, QgsPointXY( pt ) ) );
bool alreadyReported = false;
for ( QgsGeometryCheckError *error : qgis::as_const( errors ) )
{
// Only list missing vertices once
if ( error->featureId() == currentFeature.id() && error->location() == QgsPointXY( pt ) )
{
alreadyReported = true;
break;
}
}
if ( !alreadyReported )
errors.append( new QgsGeometryCheckError( this, layerFeature, QgsPointXY( pt ) ) );
}
}
}