Skip to content

Commit 876418c

Browse files
manisandromanisandro
committedOct 23, 2017
[Geometry checker] Add more fixError tests
·
ltr-3_40final-3_0_0
1 parent 3b6a0e2 commit 876418c

18 files changed

+423
-161
lines changed
 

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,10 @@ class ANALYSIS_EXPORT QgsGeometryGapCheck : public QgsGeometryCheck
8686
QString errorDescription() const override { return tr( "Gap" ); }
8787
QString errorName() const override { return QStringLiteral( "QgsGeometryGapCheck" ); }
8888

89-
private:
9089
enum ResolutionMethod { MergeLongestEdge, NoChange };
9190

91+
private:
92+
9293
double mThresholdMapUnits;
9394

9495
bool mergeWithNeighbor( QgsGeometryGapCheckError *err, Changes &changes, QString &errMsg ) const;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ANALYSIS_EXPORT QgsGeometryHoleCheck : public QgsGeometryCheck
3030
QStringList getResolutionMethods() const override;
3131
QString errorDescription() const override { return tr( "Polygon with hole" ); }
3232
QString errorName() const override { return QStringLiteral( "QgsGeometryHoleCheck" ); }
33-
private:
33+
3434
enum ResolutionMethod { RemoveHoles, NoChange };
3535
};
3636

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ANALYSIS_EXPORT QgsGeometryLineIntersectionCheck : public QgsGeometryCheck
3131
QStringList getResolutionMethods() const override;
3232
QString errorDescription() const override { return tr( "Intersection" ); }
3333
QString errorName() const override { return QStringLiteral( "QgsGeometryLineIntersectionCheck" ); }
34-
private:
34+
3535
enum ResolutionMethod { NoChange };
3636
};
3737

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ class ANALYSIS_EXPORT QgsGeometryLineLayerIntersectionCheck : public QgsGeometry
3131
QStringList getResolutionMethods() const override;
3232
QString errorDescription() const override { return tr( "Intersection" ); }
3333
QString errorName() const override { return QStringLiteral( "QgsGeometryLineLayerIntersectionCheck" ); }
34-
private:
34+
3535
enum ResolutionMethod { NoChange };
36+
37+
private:
3638
QString mCheckLayer;
3739
};
3840

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ANALYSIS_EXPORT QgsGeometryMultipartCheck : public QgsGeometryCheck
3030
QStringList getResolutionMethods() const override;
3131
QString errorDescription() const override { return tr( "Multipart object with only one feature" ); }
3232
QString errorName() const override { return QStringLiteral( "QgsGeometryMultipartCheck" ); }
33-
private:
33+
3434
enum ResolutionMethod { ConvertToSingle, RemoveObject, NoChange };
3535
};
3636

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ class ANALYSIS_EXPORT QgsGeometryOverlapCheck : public QgsGeometryCheck
6969
QStringList getResolutionMethods() const override;
7070
QString errorDescription() const override { return tr( "Overlap" ); }
7171
QString errorName() const override { return QStringLiteral( "QgsGeometryOverlapCheck" ); }
72-
private:
72+
7373
enum ResolutionMethod { Subtract, NoChange };
74+
75+
private:
7476
double mThresholdMapUnits;
7577
};
7678

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ANALYSIS_EXPORT QgsGeometryPointCoveredByLineCheck : public QgsGeometryChe
3131
QStringList getResolutionMethods() const override;
3232
QString errorDescription() const override { return tr( "Point not covered by line" ); }
3333
QString errorName() const override { return QStringLiteral( "QgsGeometryPointCoveredByLineCheck" ); }
34-
private:
34+
3535
enum ResolutionMethod { NoChange };
3636
};
3737

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ANALYSIS_EXPORT QgsGeometryPointInPolygonCheck : public QgsGeometryCheck
3131
QStringList getResolutionMethods() const override;
3232
QString errorDescription() const override { return tr( "Point not in polygon" ); }
3333
QString errorName() const override { return QStringLiteral( "QgsGeometryPointInPolygonCheck" ); }
34-
private:
34+
3535
enum ResolutionMethod { NoChange };
3636
};
3737

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ class ANALYSIS_EXPORT QgsGeometrySegmentLengthCheck : public QgsGeometryCheck
3232
QStringList getResolutionMethods() const override;
3333
QString errorDescription() const override { return tr( "Minimal segment length" ); }
3434
QString errorName() const override { return QStringLiteral( "QgsGeometrySegmentLengthCheck" ); }
35-
private:
35+
3636
enum ResolutionMethod { NoChange };
37+
38+
private:
3739
double mMinLengthMapUnits;
3840
};
3941

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ANALYSIS_EXPORT QgsGeometrySelfContactCheck : public QgsGeometryCheck
2222
QStringList getResolutionMethods() const;
2323
QString errorDescription() const { return tr( "Self contact" ); }
2424
QString errorName() const { return QStringLiteral( "QgsGeometrySelfContactCheck" ); }
25-
private:
25+
2626
enum ResolutionMethod { NoChange };
2727
};
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ANALYSIS_EXPORT QgsGeometrySelfIntersectionCheck : public QgsGeometryCheck
5757
QStringList getResolutionMethods() const override;
5858
QString errorDescription() const override { return tr( "Self intersection" ); }
5959
QString errorName() const override { return QStringLiteral( "QgsGeometrySelfIntersectionCheck" ); }
60-
private:
60+
6161
enum ResolutionMethod { ToMultiObject, ToSingleObjects, NoChange };
6262
};
6363

‎tests/src/geometry_checker/testqgsgeometrychecks.cpp

Lines changed: 405 additions & 150 deletions
Large diffs are not rendered by default.

‎tests/testdata/geometry_checker/line_layer.dbf

12 Bytes
Binary file not shown.

‎tests/testdata/geometry_checker/line_layer.shp

152 Bytes
Binary file not shown.

‎tests/testdata/geometry_checker/line_layer.shx

8 Bytes
Binary file not shown.

‎tests/testdata/geometry_checker/polygon_layer.dbf

0 Bytes
Binary file not shown.

‎tests/testdata/geometry_checker/polygon_layer.shp

16 Bytes
Binary file not shown.

‎tests/testdata/geometry_checker/polygon_layer.shx

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.