Skip to content

Commit b6251d2

Browse files
m-kuhnm-kuhn
authored
Merge pull request #7647 from m-kuhn/geomCheckerCodingConventions
Geometry checker code adjustments
2 parents bc6ea8c + 50acde0 commit b6251d2

File tree

49 files changed

+123
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+123
-142
lines changed

‎src/analysis/CMakeLists.txt

+24-23
Original file line numberDiff line numberDiff line change
@@ -170,29 +170,6 @@ SET(QGIS_ANALYSIS_MOC_HDRS
170170
processing/qgsalgorithmfiledownloader.h
171171

172172
vector/geometry_checker/qgsgeometrychecker.h
173-
vector/geometry_checker/qgsgeometryanglecheck.h
174-
vector/geometry_checker/qgsgeometryareacheck.h
175-
vector/geometry_checker/qgsgeometrychecker.h
176-
vector/geometry_checker/qgsgeometrycheck.h
177-
vector/geometry_checker/qgsgeometrycontainedcheck.h
178-
vector/geometry_checker/qgsgeometrydanglecheck.h
179-
vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.h
180-
vector/geometry_checker/qgsgeometryduplicatecheck.h
181-
vector/geometry_checker/qgsgeometryduplicatenodescheck.h
182-
vector/geometry_checker/qgsgeometryfollowboundariescheck.h
183-
vector/geometry_checker/qgsgeometrygapcheck.h
184-
vector/geometry_checker/qgsgeometryholecheck.h
185-
vector/geometry_checker/qgsgeometrylineintersectioncheck.h
186-
vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.h
187-
vector/geometry_checker/qgsgeometrymultipartcheck.h
188-
vector/geometry_checker/qgsgeometryoverlapcheck.h
189-
vector/geometry_checker/qgsgeometrypointcoveredbylinecheck.h
190-
vector/geometry_checker/qgsgeometrypointinpolygoncheck.h
191-
vector/geometry_checker/qgsgeometrysegmentlengthcheck.h
192-
vector/geometry_checker/qgsgeometryselfcontactcheck.h
193-
vector/geometry_checker/qgsgeometryselfintersectioncheck.h
194-
vector/geometry_checker/qgsgeometrysliverpolygoncheck.h
195-
vector/geometry_checker/qgsgeometrytypecheck.h
196173
)
197174

198175
INCLUDE_DIRECTORIES(SYSTEM ${SPATIALITE_INCLUDE_DIR})
@@ -281,6 +258,30 @@ SET(QGIS_ANALYSIS_HDRS
281258
network/qgsnetworkdistancestrategy.h
282259
network/qgsgraphanalyzer.h
283260
network/qgsvectorlayerdirector.h
261+
262+
vector/geometry_checker/qgsgeometryanglecheck.h
263+
vector/geometry_checker/qgsgeometryareacheck.h
264+
vector/geometry_checker/qgsgeometrychecker.h
265+
vector/geometry_checker/qgsgeometrycheck.h
266+
vector/geometry_checker/qgsgeometrycontainedcheck.h
267+
vector/geometry_checker/qgsgeometrydanglecheck.h
268+
vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.h
269+
vector/geometry_checker/qgsgeometryduplicatecheck.h
270+
vector/geometry_checker/qgsgeometryduplicatenodescheck.h
271+
vector/geometry_checker/qgsgeometryfollowboundariescheck.h
272+
vector/geometry_checker/qgsgeometrygapcheck.h
273+
vector/geometry_checker/qgsgeometryholecheck.h
274+
vector/geometry_checker/qgsgeometrylineintersectioncheck.h
275+
vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.h
276+
vector/geometry_checker/qgsgeometrymultipartcheck.h
277+
vector/geometry_checker/qgsgeometryoverlapcheck.h
278+
vector/geometry_checker/qgsgeometrypointcoveredbylinecheck.h
279+
vector/geometry_checker/qgsgeometrypointinpolygoncheck.h
280+
vector/geometry_checker/qgsgeometrysegmentlengthcheck.h
281+
vector/geometry_checker/qgsgeometryselfcontactcheck.h
282+
vector/geometry_checker/qgsgeometryselfintersectioncheck.h
283+
vector/geometry_checker/qgsgeometrysliverpolygoncheck.h
284+
vector/geometry_checker/qgsgeometrytypecheck.h
284285
)
285286

286287
INCLUDE_DIRECTORIES(

‎src/analysis/vector/geometry_checker/qgsgeometryanglecheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void QgsGeometryAngleCheck::fixError( QgsGeometryCheckError *error, int method,
147147
}
148148
}
149149

150-
QStringList QgsGeometryAngleCheck::getResolutionMethods() const
150+
QStringList QgsGeometryAngleCheck::resolutionMethods() const
151151
{
152152
static QStringList methods = QStringList() << tr( "Delete node with small angle" ) << tr( "No action" );
153153
return methods;

‎src/analysis/vector/geometry_checker/qgsgeometryanglecheck.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,14 @@
2222

2323
class ANALYSIS_EXPORT QgsGeometryAngleCheck : public QgsGeometryCheck
2424
{
25-
Q_OBJECT
26-
2725
public:
2826
QgsGeometryAngleCheck( QgsGeometryCheckerContext *context, double minAngle )
2927
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}, context )
3028
, mMinAngle( minAngle )
3129
{}
3230
void collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter = nullptr, const QMap<QString, QgsFeatureIds> &ids = QMap<QString, QgsFeatureIds>() ) const override;
3331
void fixError( QgsGeometryCheckError *error, int method, const QMap<QString, int> &mergeAttributeIndices, Changes &changes ) const override;
34-
QStringList getResolutionMethods() const override;
32+
QStringList resolutionMethods() const override;
3533
QString errorDescription() const override { return tr( "Minimal angle" ); }
3634
QString errorName() const override { return QStringLiteral( "QgsGeometryAngleCheck" ); }
3735

‎src/analysis/vector/geometry_checker/qgsgeometryareacheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( const QString &layerId, QgsFeature
199199
return true;
200200
}
201201

202-
QStringList QgsGeometryAreaCheck::getResolutionMethods() const
202+
QStringList QgsGeometryAreaCheck::resolutionMethods() const
203203
{
204204
static QStringList methods = QStringList()
205205
<< tr( "Merge with neighboring polygon with longest shared edge" )

‎src/analysis/vector/geometry_checker/qgsgeometryareacheck.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,14 @@ class QgsSurface;
2424

2525
class ANALYSIS_EXPORT QgsGeometryAreaCheck : public QgsGeometryCheck
2626
{
27-
Q_OBJECT
28-
2927
public:
3028
QgsGeometryAreaCheck( QgsGeometryCheckerContext *context, double thresholdMapUnits )
3129
: QgsGeometryCheck( FeatureCheck, {QgsWkbTypes::PolygonGeometry}, context )
3230
, mThresholdMapUnits( thresholdMapUnits )
3331
{}
3432
void collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter = nullptr, const QMap<QString, QgsFeatureIds> &ids = QMap<QString, QgsFeatureIds>() ) const override;
3533
void fixError( QgsGeometryCheckError *error, int method, const QMap<QString, int> &mergeAttributeIndices, Changes &changes ) const override;
36-
QStringList getResolutionMethods() const override;
34+
QStringList resolutionMethods() const override;
3735
QString errorDescription() const override { return tr( "Minimal area" ); }
3836
QString errorName() const override { return QStringLiteral( "QgsGeometryAreaCheck" ); }
3937
enum ResolutionMethod { MergeLongestEdge, MergeLargestArea, MergeIdenticalAttribute, Delete, NoChange };

‎src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ bool QgsGeometryCheckError::handleChanges( const QgsGeometryCheck::Changes &chan
9797
// If the check is checking the feature at geometry nodes level, the
9898
// error almost certainly invalid after a geometry change. In the other
9999
// cases, it might likely still be valid.
100-
return mCheck->getCheckType() != QgsGeometryCheck::FeatureNodeCheck;
100+
return mCheck->checkType() != QgsGeometryCheck::FeatureNodeCheck;
101101
}
102102
}
103103
else if ( change.what == QgsGeometryCheck::ChangePart )

‎src/analysis/vector/geometry_checker/qgsgeometrycheck.h

+29-10
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,32 @@ struct ANALYSIS_EXPORT QgsGeometryCheckerContext
4141
const QMap<QString, QgsFeaturePool *> featurePools;
4242
};
4343

44-
class ANALYSIS_EXPORT QgsGeometryCheck : public QObject
44+
class ANALYSIS_EXPORT QgsGeometryCheck
4545
{
46-
Q_OBJECT
46+
Q_DECLARE_TR_FUNCTIONS()
4747

4848
public:
49-
enum ChangeWhat { ChangeFeature, ChangePart, ChangeRing, ChangeNode };
50-
enum ChangeType { ChangeAdded, ChangeRemoved, ChangeChanged };
51-
enum CheckType { FeatureNodeCheck, FeatureCheck, LayerCheck };
49+
enum ChangeWhat
50+
{
51+
ChangeFeature,
52+
ChangePart,
53+
ChangeRing,
54+
ChangeNode
55+
};
56+
57+
enum ChangeType
58+
{
59+
ChangeAdded,
60+
ChangeRemoved,
61+
ChangeChanged
62+
};
63+
64+
enum CheckType
65+
{
66+
FeatureNodeCheck,
67+
FeatureCheck,
68+
LayerCheck
69+
};
5270

5371
struct Change
5472
{
@@ -74,14 +92,15 @@ class ANALYSIS_EXPORT QgsGeometryCheck : public QObject
7492
, mCompatibleGeometryTypes( compatibleGeometryTypes )
7593
, mContext( context )
7694
{}
95+
virtual ~QgsGeometryCheck() = default;
7796
virtual void collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter = nullptr, const QMap<QString, QgsFeatureIds> &ids = QMap<QString, QgsFeatureIds>() ) const = 0;
7897
virtual void fixError( QgsGeometryCheckError *error, int method, const QMap<QString, int> &mergeAttributeIndices, Changes &changes ) const = 0;
79-
virtual QStringList getResolutionMethods() const = 0;
98+
virtual QStringList resolutionMethods() const = 0;
8099
virtual QString errorDescription() const = 0;
81100
virtual QString errorName() const = 0;
82-
CheckType getCheckType() const { return mCheckType; }
83-
bool getCompatibility( QgsWkbTypes::GeometryType type ) const { return mCompatibleGeometryTypes.contains( type ); }
84-
QgsGeometryCheckerContext *getContext() const { return mContext; }
101+
CheckType checkType() const { return mCheckType; }
102+
bool isCompatible( QgsWkbTypes::GeometryType type ) const { return mCompatibleGeometryTypes.contains( type ); }
103+
QgsGeometryCheckerContext *context() const { return mContext; }
85104

86105
protected:
87106
QMap<QString, QgsFeatureIds> allLayerFeatureIds() const;
@@ -133,7 +152,7 @@ class ANALYSIS_EXPORT QgsGeometryCheckError
133152
void setFixed( int method )
134153
{
135154
mStatus = StatusFixed;
136-
const QStringList methods = mCheck->getResolutionMethods();
155+
const QStringList methods = mCheck->resolutionMethods();
137156
mResolutionMessage = methods[method];
138157
}
139158
void setFixFailed( const QString &reason )

‎src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ QFuture<void> QgsGeometryChecker::execute( int *totalSteps )
6565
{
6666
for ( auto it = mContext->featurePools.constBegin(); it != mContext->featurePools.constEnd(); ++it )
6767
{
68-
if ( check->getCheckType() <= QgsGeometryCheck::FeatureCheck )
68+
if ( check->checkType() <= QgsGeometryCheck::FeatureCheck )
6969
{
70-
*totalSteps += check->getCompatibility( it.value()->getLayer()->geometryType() ) ? it.value()->getFeatureIds().size() : 0;
70+
*totalSteps += check->isCompatible( it.value()->getLayer()->geometryType() ) ? it.value()->getFeatureIds().size() : 0;
7171
}
7272
else
7373
{
@@ -170,7 +170,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
170170
// - Determine extent to recheck for gaps
171171
for ( QgsGeometryCheckError *err : qgis::as_const( mCheckErrors ) )
172172
{
173-
if ( err->check()->getCheckType() == QgsGeometryCheck::LayerCheck )
173+
if ( err->check()->checkType() == QgsGeometryCheck::LayerCheck )
174174
{
175175
if ( err->affectedAreaBBox().intersects( recheckArea ) )
176176
{
@@ -191,7 +191,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
191191
QList<QgsGeometryCheckError *> recheckErrors;
192192
for ( const QgsGeometryCheck *check : qgis::as_const( mChecks ) )
193193
{
194-
if ( check->getCheckType() == QgsGeometryCheck::LayerCheck )
194+
if ( check->checkType() == QgsGeometryCheck::LayerCheck )
195195
{
196196
if ( !recheckAreaFeatures.isEmpty() )
197197
{
@@ -246,9 +246,9 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
246246
// changes weren't handled
247247
!handled ||
248248
// or if it is a FeatureNodeCheck or FeatureCheck error whose feature was rechecked
249-
( err->check()->getCheckType() <= QgsGeometryCheck::FeatureCheck && recheckFeatures[err->layerId()].contains( err->featureId() ) ) ||
249+
( err->check()->checkType() <= QgsGeometryCheck::FeatureCheck && recheckFeatures[err->layerId()].contains( err->featureId() ) ) ||
250250
// or if it is a LayerCheck error within the rechecked area
251-
( err->check()->getCheckType() == QgsGeometryCheck::LayerCheck && recheckArea.contains( err->affectedAreaBBox() ) )
251+
( err->check()->checkType() == QgsGeometryCheck::LayerCheck && recheckArea.contains( err->affectedAreaBBox() ) )
252252
)
253253
)
254254
{

‎src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace QgsGeometryCheckerUtils
4747

4848
/////////////////////////////////////////////////////////////////////////////
4949

50-
LayerFeatures::iterator::iterator( const QList<QString>::iterator &layerIt, LayerFeatures *parent )
50+
LayerFeatures::iterator::iterator( const QStringList::const_iterator &layerIt, const LayerFeatures *parent )
5151
: mLayerIt( layerIt )
5252
, mFeatureIt( QgsFeatureIds::const_iterator() )
5353
, mParent( parent )

‎src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ namespace QgsGeometryCheckerUtils
6666
class iterator
6767
{
6868
public:
69-
iterator( const QList<QString>::iterator &layerIt, LayerFeatures *parent );
69+
iterator( const QList<QString>::const_iterator &layerIt, const LayerFeatures *parent );
7070
~iterator();
7171
const iterator &operator++();
7272
iterator operator++( int ) { iterator tmp( *this ); ++*this; return tmp; }
@@ -77,14 +77,14 @@ namespace QgsGeometryCheckerUtils
7777
bool nextLayerFeature( bool begin );
7878
bool nextLayer( bool begin );
7979
bool nextFeature( bool begin );
80-
QList<QString>::iterator mLayerIt;
80+
QList<QString>::const_iterator mLayerIt;
8181
QgsFeatureIds::const_iterator mFeatureIt;
82-
LayerFeatures *mParent;
83-
LayerFeature *mCurrentFeature = nullptr;
82+
const LayerFeatures *mParent;
83+
const LayerFeature *mCurrentFeature = nullptr;
8484
};
8585

86-
iterator begin() { return iterator( mLayerIds.begin(), this ); }
87-
iterator end() { return iterator( mLayerIds.end(), this ); }
86+
iterator begin() const { return iterator( mLayerIds.constBegin(), this ); }
87+
iterator end() const { return iterator( mLayerIds.end(), this ); }
8888
private:
8989
QMap<QString, QgsFeaturePool *> mFeaturePools;
9090
QMap<QString, QgsFeatureIds> mFeatureIds;

‎src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void QgsGeometryContainedCheck::fixError( QgsGeometryCheckError *error, int meth
103103
}
104104
}
105105

106-
QStringList QgsGeometryContainedCheck::getResolutionMethods() const
106+
QStringList QgsGeometryContainedCheck::resolutionMethods() const
107107
{
108108
static QStringList methods = QStringList()
109109
<< tr( "Delete feature" )

‎src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,12 @@ class ANALYSIS_EXPORT QgsGeometryContainedCheckError : public QgsGeometryCheckEr
4848

4949
class ANALYSIS_EXPORT QgsGeometryContainedCheck : public QgsGeometryCheck
5050
{
51-
Q_OBJECT
52-
5351
public:
5452
explicit QgsGeometryContainedCheck( QgsGeometryCheckerContext *context )
5553
: QgsGeometryCheck( FeatureCheck, {QgsWkbTypes::PointGeometry, QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}, context ) {}
5654
void collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter = nullptr, const QMap<QString, QgsFeatureIds> &ids = QMap<QString, QgsFeatureIds>() ) const override;
5755
void fixError( QgsGeometryCheckError *error, int method, const QMap<QString, int> &mergeAttributeIndices, Changes &changes ) const override;
58-
QStringList getResolutionMethods() const override;
56+
QStringList resolutionMethods() const override;
5957
QString errorDescription() const override { return tr( "Within" ); }
6058
QString errorName() const override { return QStringLiteral( "QgsGeometryContainedCheck" ); }
6159

‎src/analysis/vector/geometry_checker/qgsgeometrydanglecheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ void QgsGeometryDangleCheck::fixError( QgsGeometryCheckError *error, int method,
102102
}
103103
}
104104

105-
QStringList QgsGeometryDangleCheck::getResolutionMethods() const
105+
QStringList QgsGeometryDangleCheck::resolutionMethods() const
106106
{
107107
static QStringList methods = QStringList() << tr( "No action" );
108108
return methods;

‎src/analysis/vector/geometry_checker/qgsgeometrydanglecheck.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,13 @@
2222

2323
class ANALYSIS_EXPORT QgsGeometryDangleCheck : public QgsGeometryCheck
2424
{
25-
Q_OBJECT
26-
2725
public:
2826
QgsGeometryDangleCheck( QgsGeometryCheckerContext *context )
2927
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::LineGeometry}, context )
3028
{}
3129
void collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter = nullptr, const QMap<QString, QgsFeatureIds> &ids = QMap<QString, QgsFeatureIds>() ) const override;
3230
void fixError( QgsGeometryCheckError *error, int method, const QMap<QString, int> &mergeAttributeIndices, Changes &changes ) const override;
33-
QStringList getResolutionMethods() const override;
31+
QStringList resolutionMethods() const override;
3432
QString errorDescription() const override { return tr( "Dangle" ); }
3533
QString errorName() const override { return QStringLiteral( "QgsGeometryDangleCheck" ); }
3634

‎src/analysis/vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void QgsGeometryDegeneratePolygonCheck::fixError( QgsGeometryCheckError *error,
8080
}
8181
}
8282

83-
QStringList QgsGeometryDegeneratePolygonCheck::getResolutionMethods() const
83+
QStringList QgsGeometryDegeneratePolygonCheck::resolutionMethods() const
8484
{
8585
static QStringList methods = QStringList() << tr( "Delete feature" ) << tr( "No action" );
8686
return methods;

‎src/analysis/vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@
2222

2323
class ANALYSIS_EXPORT QgsGeometryDegeneratePolygonCheck : public QgsGeometryCheck
2424
{
25-
Q_OBJECT
26-
2725
public:
2826
explicit QgsGeometryDegeneratePolygonCheck( QgsGeometryCheckerContext *context )
2927
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::PolygonGeometry}, context ) {}
3028
void collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter = nullptr, const QMap<QString, QgsFeatureIds> &ids = QMap<QString, QgsFeatureIds>() ) const override;
3129
void fixError( QgsGeometryCheckError *error, int method, const QMap<QString, int> &mergeAttributeIndices, Changes &changes ) const override;
32-
QStringList getResolutionMethods() const override;
30+
QStringList resolutionMethods() const override;
3331
QString errorDescription() const override { return tr( "Polygon with less than three nodes" ); }
3432
QString errorName() const override { return QStringLiteral( "QgsGeometryDegeneratePolygonCheck" ); }
3533

‎src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void QgsGeometryDuplicateCheck::fixError( QgsGeometryCheckError *error, int meth
132132
}
133133
}
134134

135-
QStringList QgsGeometryDuplicateCheck::getResolutionMethods() const
135+
QStringList QgsGeometryDuplicateCheck::resolutionMethods() const
136136
{
137137
static QStringList methods = QStringList()
138138
<< tr( "No action" )

‎src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ANALYSIS_EXPORT QgsGeometryDuplicateCheckError : public QgsGeometryCheckEr
2727
const QgsGeometryCheckerUtils::LayerFeature &layerFeature,
2828
const QgsPointXY &errorLocation,
2929
const QMap<QString, QList<QgsFeatureId>> &duplicates )
30-
: QgsGeometryCheckError( check, layerFeature, errorLocation, QgsVertexId(), duplicatesString( check->getContext()->featurePools, duplicates ) )
30+
: QgsGeometryCheckError( check, layerFeature, errorLocation, QgsVertexId(), duplicatesString( check->context()->featurePools, duplicates ) )
3131
, mDuplicates( duplicates )
3232
{ }
3333
QMap<QString, QList<QgsFeatureId>> duplicates() const { return mDuplicates; }
@@ -49,14 +49,12 @@ class ANALYSIS_EXPORT QgsGeometryDuplicateCheckError : public QgsGeometryCheckEr
4949

5050
class ANALYSIS_EXPORT QgsGeometryDuplicateCheck : public QgsGeometryCheck
5151
{
52-
Q_OBJECT
53-
5452
public:
5553
explicit QgsGeometryDuplicateCheck( QgsGeometryCheckerContext *context )
5654
: QgsGeometryCheck( FeatureCheck, {QgsWkbTypes::PointGeometry, QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}, context ) {}
5755
void collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter = nullptr, const QMap<QString, QgsFeatureIds> &ids = QMap<QString, QgsFeatureIds>() ) const override;
5856
void fixError( QgsGeometryCheckError *error, int method, const QMap<QString, int> &mergeAttributeIndices, Changes &changes ) const override;
59-
QStringList getResolutionMethods() const override;
57+
QStringList resolutionMethods() const override;
6058
QString errorDescription() const override { return tr( "Duplicate" ); }
6159
QString errorName() const override { return QStringLiteral( "QgsGeometryDuplicateCheck" ); }
6260

‎src/analysis/vector/geometry_checker/qgsgeometryduplicatenodescheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void QgsGeometryDuplicateNodesCheck::fixError( QgsGeometryCheckError *error, int
104104
}
105105
}
106106

107-
QStringList QgsGeometryDuplicateNodesCheck::getResolutionMethods() const
107+
QStringList QgsGeometryDuplicateNodesCheck::resolutionMethods() const
108108
{
109109
static QStringList methods = QStringList() << tr( "Delete duplicate node" ) << tr( "No action" );
110110
return methods;

0 commit comments

Comments
 (0)