Skip to content

Commit 81cfc36

Browse files
committed
Make QgsGeometryCheck::CheckType available in factory
1 parent cf0b3e9 commit 81cfc36

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ class ANALYSIS_EXPORT QgsGeometryDuplicateCheck : public QgsGeometryCheck
7070
static QString factoryId();
7171
static QgsGeometryCheck::CheckType factoryCheckType();
7272

73+
static QList<QgsWkbTypes::GeometryType> factoryCompatibleGeometryTypes() {return {QgsWkbTypes::PointGeometry, QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}; }
74+
static bool factoryIsCompatible( QgsVectorLayer *layer ) SIP_SKIP { return factoryCompatibleGeometryTypes().contains( layer->geometryType() ); }
75+
static QString factoryDescription() { return tr( "Duplicate" ); }
76+
static QString factoryId();
77+
static QgsGeometryCheck::CheckType factoryCheckType();
78+
7379
enum ResolutionMethod { NoChange, RemoveDuplicates };
7480
};
7581

src/app/qgisapp.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
925925
functionProfile( &QgisApp::initLayouts, this, QStringLiteral( "Initialize layouts support" ) );
926926

927927
startProfile( QStringLiteral( "Geometry validation" ) );
928-
QgsAnalysis::instance()->geometryCheckRegistry()->initialize();
929928

930929
mGeometryValidationService = qgis::make_unique<QgsGeometryValidationService>( QgsProject::instance() );
931930
connect( mGeometryValidationService.get(), &QgsGeometryValidationService::warning, this, [this]( const QString & message )

src/app/qgsgeometryvalidationservice.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void QgsGeometryValidationService::enableLayerChecks( QgsVectorLayer *layer )
136136

137137
const QStringList activeChecks = layer->geometryOptions()->geometryChecks();
138138

139-
const QList<QgsGeometryCheckFactory *> singleCheckFactories = checkRegistry->geometryCheckFactories( layer, QgsGeometryCheck::SingleGeometryCheck );
139+
const QList<QgsGeometryCheckFactory *> singleCheckFactories = checkRegistry->geometryCheckFactories( layer, QgsGeometryCheck::FeatureNodeCheck, QgsGeometryCheck::AvailableInValidation );
140140

141141
for ( QgsGeometryCheckFactory *factory : singleCheckFactories )
142142
{
@@ -159,7 +159,7 @@ void QgsGeometryValidationService::enableLayerChecks( QgsVectorLayer *layer )
159159

160160
// Topology checks
161161
QList<QgsGeometryCheck *> topologyChecks;
162-
const QList<QgsGeometryCheckFactory *> topologyCheckFactories = checkRegistry->geometryCheckFactories( layer, QgsGeometryCheck::SingleLayerTopologyCheck );
162+
const QList<QgsGeometryCheckFactory *> topologyCheckFactories = checkRegistry->geometryCheckFactories( layer, QgsGeometryCheck::LayerCheck, QgsGeometryCheck::AvailableInValidation );
163163

164164
for ( QgsGeometryCheckFactory *factory : topologyCheckFactories )
165165
{

0 commit comments

Comments
 (0)