[Geometry checker] Add a first series of fixError tests

qgis · Oct 23, 2017 · 4a6cdbe · 4a6cdbe
1 parent 8f343a9
commit 4a6cdbe
Show file tree

Hide file tree

Showing 12 changed files with 323 additions and 59 deletions.
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryanglecheck.h b/src/analysis/vector/geometry_checker/qgsgeometryanglecheck.h
@@ -32,8 +32,10 @@ class ANALYSIS_EXPORT QgsGeometryAngleCheck : public QgsGeometryCheck
     QStringList getResolutionMethods() const override;
     QString errorDescription() const override { return tr( "Minimal angle" ); }
     QString errorName() const override { return QStringLiteral( "QgsGeometryAngleCheck" ); }
-  private:
+
     enum ResolutionMethod { DeleteNode, NoChange };
+
+  private:
     double mMinAngle;
 };
 

diff --git a/src/analysis/vector/geometry_checker/qgsgeometryareacheck.h b/src/analysis/vector/geometry_checker/qgsgeometryareacheck.h
@@ -34,9 +34,10 @@ class ANALYSIS_EXPORT QgsGeometryAreaCheck : public QgsGeometryCheck
     QStringList getResolutionMethods() const override;
     QString errorDescription() const override { return tr( "Minimal area" ); }
     QString errorName() const override { return QStringLiteral( "QgsGeometryAreaCheck" ); }
-  private:
     enum ResolutionMethod { MergeLongestEdge, MergeLargestArea, MergeIdenticalAttribute, Delete, NoChange };
 
+  private:
+
     virtual bool checkThreshold( double layerToMapUnits, const QgsAbstractGeometry *geom, double &value ) const;
     bool mergeWithNeighbor( const QString &layerId, QgsFeature &feature, int partIdx, int method, int mergeAttributeIndex, Changes &changes, QString &errMsg ) const;
 

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheck.h b/src/analysis/vector/geometry_checker/qgsgeometrycheck.h
@@ -60,6 +60,10 @@ class ANALYSIS_EXPORT QgsGeometryCheck : public QObject
       ChangeWhat what;
       ChangeType type;
       QgsVertexId vidx;
+      bool operator==( const Change &other )
+      {
+        return what == other.what && type == other.type && vidx == other.vidx;
+      }
     };
 
     typedef QMap<QString, QMap<QgsFeatureId, QList<Change>>> Changes;

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.h b/src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.h
@@ -56,7 +56,7 @@ class ANALYSIS_EXPORT QgsGeometryContainedCheck : public QgsGeometryCheck
     QStringList getResolutionMethods() const override;
     QString errorDescription() const override { return tr( "Within" ); }
     QString errorName() const override { return QStringLiteral( "QgsGeometryContainedCheck" ); }
-  private:
+
     enum ResolutionMethod { Delete, NoChange };
 };
 

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrydanglecheck.h b/src/analysis/vector/geometry_checker/qgsgeometrydanglecheck.h
@@ -31,7 +31,7 @@ class ANALYSIS_EXPORT QgsGeometryDangleCheck : public QgsGeometryCheck
     QStringList getResolutionMethods() const override;
     QString errorDescription() const override { return tr( "Dangle" ); }
     QString errorName() const override { return QStringLiteral( "QgsGeometryDangleCheck" ); }
-  private:
+
     enum ResolutionMethod { NoChange };
 };
 

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.h b/src/analysis/vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.h
@@ -31,8 +31,8 @@ class ANALYSIS_EXPORT QgsGeometryDegeneratePolygonCheck : public QgsGeometryChec
     QString errorDescription() const override { return tr( "Polygon with less than three nodes" ); }
     QString errorName() const override { return QStringLiteral( "QgsGeometryDegeneratePolygonCheck" ); }
 
-  private:
     enum ResolutionMethod { DeleteRing, NoChange };
+  private:
 };
 
 #endif // QGS_GEOMETRY_DEGENERATEPOLYGON_CHECK_H
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.h b/src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.h
@@ -58,7 +58,6 @@ class ANALYSIS_EXPORT QgsGeometryDuplicateCheck : public QgsGeometryCheck
     QString errorDescription() const override { return tr( "Duplicate" ); }
     QString errorName() const override { return QStringLiteral( "QgsGeometryDuplicateCheck" ); }
 
-  private:
     enum ResolutionMethod { NoChange, RemoveDuplicates };
 };
 

diff --git a/src/analysis/vector/geometry_checker/qgsgeometryduplicatenodescheck.h b/src/analysis/vector/geometry_checker/qgsgeometryduplicatenodescheck.h
@@ -31,7 +31,6 @@ class ANALYSIS_EXPORT QgsGeometryDuplicateNodesCheck : public QgsGeometryCheck
     QString errorDescription() const override { return tr( "Duplicate node" ); }
     QString errorName() const override { return QStringLiteral( "QgsGeometryDuplicateNodesCheck" ); }
 
-  private:
     enum ResolutionMethod { RemoveDuplicates, NoChange };
 };
 

diff --git a/tests/src/geometry_checker/testqgsgeometrychecks.cpp b/tests/src/geometry_checker/testqgsgeometrychecks.cpp
diff --git a/tests/testdata/geometry_checker/polygon_layer.dbf b/tests/testdata/geometry_checker/polygon_layer.dbf
diff --git a/tests/testdata/geometry_checker/polygon_layer.shp b/tests/testdata/geometry_checker/polygon_layer.shp
diff --git a/tests/testdata/geometry_checker/polygon_layer.shx b/tests/testdata/geometry_checker/polygon_layer.shx