Better error reporting from is valid check

qgis · Oct 15, 2018 · baf1e52 · baf1e52
1 parent ed27442
commit baf1e52
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryisvalidcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryisvalidcheck.cpp
@@ -49,7 +49,11 @@ QList<QgsSingleGeometryCheckError *> QgsGeometryIsValidCheck::processGeometry( c
   QList<QgsSingleGeometryCheckError *> result;
   for ( const auto &error : qgis::as_const( errors ) )
   {
-    result << new QgsSingleGeometryCheckError( this, geometry, QgsGeometry( qgis::make_unique<QgsPoint>( error.where() ) ) );
+    QgsGeometry errorGeometry;
+    if ( error.hasWhere() )
+      errorGeometry = QgsGeometry( qgis::make_unique<QgsPoint>( error.where() ) );
+
+    result << new QgsGeometryIsValidCheckError( this, geometry, errorGeometry, error.what() );
   }
   return result;
 }
@@ -89,3 +93,15 @@ QgsGeometryCheck::CheckType QgsGeometryIsValidCheck::factoryCheckType()
   return QgsGeometryCheck::FeatureNodeCheck;
 }
 ///@endcond
+
+QgsGeometryIsValidCheckError::QgsGeometryIsValidCheckError( const QgsSingleGeometryCheck *check, const QgsGeometry &geometry, const QgsGeometry &errorLocation, const QString &errorDescription )
+  : QgsSingleGeometryCheckError( check, geometry, errorLocation )
+  , mDescription( errorDescription )
+{
+
+}
+
+QString QgsGeometryIsValidCheckError::description() const
+{
+  return mDescription;
+}
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryisvalidcheck.h b/src/analysis/vector/geometry_checker/qgsgeometryisvalidcheck.h
@@ -20,6 +20,17 @@ email                : matthias@opengis.ch
 
 #include "qgssinglegeometrycheck.h"
 
+class ANALYSIS_EXPORT QgsGeometryIsValidCheckError : public QgsSingleGeometryCheckError
+{
+  public:
+    QgsGeometryIsValidCheckError( const QgsSingleGeometryCheck *check, const QgsGeometry &geometry, const QgsGeometry &errorLocation, const QString &errorDescription );
+
+    QString description() const override;
+
+  private:
+    QString mDescription;
+};
+
 /**
  * Checks if geometries are valid using the backend configured in the QGIS settings.
  * This does not offer any fixes but makes sure that all geometries are valid.