Processing: Add Check Geometry algorithm and test: Self intersection

lbartoletti · Jan 12, 2024 · 175b4dd · 175b4dd
1 parent c3bba78
commit 175b4dd
Show file tree

Hide file tree

Showing 5 changed files with 306 additions and 0 deletions.
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -65,6 +65,7 @@ set(QGIS_ANALYSIS_SRCS
   processing/qgsalgorithmcheckgeometrydangle.cpp
   processing/qgsalgorithmcheckgeometrymultipart.cpp
   processing/qgsalgorithmcheckgeometryangle.cpp
+  processing/qgsalgorithmcheckgeometryselfintersection.cpp
   processing/qgsalgorithmclip.cpp
   processing/qgsalgorithmconcavehull.cpp
   processing/qgsalgorithmconditionalbranch.cpp

diff --git a/src/analysis/processing/qgsalgorithmcheckgeometryselfintersection.cpp b/src/analysis/processing/qgsalgorithmcheckgeometryselfintersection.cpp
@@ -0,0 +1,203 @@
+/***************************************************************************
+                        qgsalgorithmcheckgeometryselfintersection.cpp
+                        ---------------------
+   begin                : January 2024
+   copyright            : (C) 2024 by Jacky Volpes
+   email                : jacky dot volpes at oslandia dot com
+***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsalgorithmcheckgeometryselfintersection.h"
+#include "qgsgeometrycheckcontext.h"
+#include "qgsgeometrycheckerror.h"
+#include "qgsgeometryselfintersectioncheck.h"
+#include "qgspoint.h"
+#include "qgsvectorlayer.h"
+#include "qgsvectordataproviderfeaturepool.h"
+
+///@cond PRIVATE
+
+auto QgsGeometryCheckSelfIntersectionAlgorithm::name() const -> QString
+{
+  return QStringLiteral( "checkgeometryselfintersection" );
+}
+
+auto QgsGeometryCheckSelfIntersectionAlgorithm::displayName() const -> QString
+{
+  return QObject::tr( "Check Geometry (Self intersection)" );
+}
+
+auto QgsGeometryCheckSelfIntersectionAlgorithm::tags() const -> QStringList
+{
+  return QObject::tr( "check,geometry,intersection" ).split( ',' );
+}
+
+auto QgsGeometryCheckSelfIntersectionAlgorithm::group() const -> QString
+{
+  return QObject::tr( "Check geometry" );
+}
+
+auto QgsGeometryCheckSelfIntersectionAlgorithm::groupId() const -> QString
+{
+  return QStringLiteral( "checkgeometry" );
+}
+
+auto QgsGeometryCheckSelfIntersectionAlgorithm::shortHelpString() const -> QString
+{
+  return QObject::tr( "This algorithm check the self intersections of geometry." );
+}
+
+auto QgsGeometryCheckSelfIntersectionAlgorithm::flags() const -> QgsProcessingAlgorithm::Flags
+{
+  return QgsProcessingAlgorithm::flags() | QgsProcessingAlgorithm::FlagNoThreading;
+}
+
+auto QgsGeometryCheckSelfIntersectionAlgorithm::createInstance() const -> QgsGeometryCheckSelfIntersectionAlgorithm *
+{
+  return new QgsGeometryCheckSelfIntersectionAlgorithm();
+}
+
+void QgsGeometryCheckSelfIntersectionAlgorithm::initAlgorithm( const QVariantMap &configuration )
+{
+  Q_UNUSED( configuration )
+
+  addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ), QList< int >() << QgsProcessing::TypeVectorPolygon << QgsProcessing::TypeVectorLine ) );
+  addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "ERRORS" ), QObject::tr( "Errors layer" ), QgsProcessing::TypeVectorPoint ) );
+  addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "OUTPUT" ), QObject::tr( "Output layer" ), QgsProcessing::TypeVectorAnyGeometry ) );
+
+  std::unique_ptr< QgsProcessingParameterNumber > tolerance = std::make_unique< QgsProcessingParameterNumber >( QStringLiteral( "TOLERANCE" ),
+      QObject::tr( "Tolerance" ), QgsProcessingParameterNumber::Integer, 8, false, 1, 13 );
+  tolerance->setFlags( tolerance->flags() | QgsProcessingParameterDefinition::FlagAdvanced );
+  addParameter( tolerance.release() );
+}
+
+auto QgsGeometryCheckSelfIntersectionAlgorithm::prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback * ) -> bool
+{
+  mTolerance = parameterAsInt( parameters, QStringLiteral( "TOLERANCE" ), context );
+
+  return true;
+}
+
+auto QgsGeometryCheckSelfIntersectionAlgorithm::createFeaturePool( QgsVectorLayer *layer, bool selectedOnly ) const -> QgsFeaturePool *
+{
+  return new QgsVectorDataProviderFeaturePool( layer, selectedOnly );
+}
+
+static auto outputFields( ) -> QgsFields
+{
+  QgsFields fields;
+  fields.append( QgsField( QStringLiteral( "gc_layerid" ), QVariant::String ) );
+  fields.append( QgsField( QStringLiteral( "gc_layername" ), QVariant::String ) );
+  fields.append( QgsField( QStringLiteral( "gc_featid" ), QVariant::Int ) );
+  fields.append( QgsField( QStringLiteral( "gc_partidx" ), QVariant::Int ) );
+  fields.append( QgsField( QStringLiteral( "gc_ringidx" ), QVariant::Int ) );
+  fields.append( QgsField( QStringLiteral( "gc_vertidx" ), QVariant::Int ) );
+  fields.append( QgsField( QStringLiteral( "gc_errorx" ), QVariant::Double ) );
+  fields.append( QgsField( QStringLiteral( "gc_errory" ), QVariant::Double ) );
+  fields.append( QgsField( QStringLiteral( "gc_error" ), QVariant::String ) );
+  return fields;
+}
+
+
+auto QgsGeometryCheckSelfIntersectionAlgorithm::processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) -> QVariantMap
+{
+  QString dest_output;
+  QString dest_errors;
+  std::unique_ptr< QgsProcessingFeatureSource > source( parameterAsSource( parameters, QStringLiteral( "INPUT" ), context ) );
+  if ( !source )
+    throw QgsProcessingException( invalidSourceError( parameters, QStringLiteral( "INPUT" ) ) );
+
+  mInputLayer.reset( source->materialize( QgsFeatureRequest() ) );
+
+  if ( !mInputLayer.get() )
+    throw QgsProcessingException( QObject::tr( "Could not load source layer for INPUT" ) );
+
+  QgsFields fields = outputFields();
+
+  std::unique_ptr< QgsFeatureSink > sink_output( parameterAsSink( parameters, QStringLiteral( "OUTPUT" ), context, dest_output, fields, mInputLayer->wkbType(), mInputLayer->sourceCrs() ) );
+  if ( !sink_output )
+  {
+    throw QgsProcessingException( invalidSinkError( parameters, QStringLiteral( "OUTPUT" ) ) );
+  }
+  std::unique_ptr< QgsFeatureSink > sink_errors( parameterAsSink( parameters, QStringLiteral( "ERRORS" ), context, dest_errors, fields, Qgis::WkbType::Point, mInputLayer->sourceCrs() ) );
+  if ( !sink_errors )
+  {
+    throw QgsProcessingException( invalidSinkError( parameters, QStringLiteral( "ERRORS" ) ) );
+  }
+
+  QgsProcessingMultiStepFeedback multiStepFeedback( 3, feedback );
+
+  QgsProject *project = mInputLayer->project() ? mInputLayer->project() : QgsProject::instance();
+
+  std::unique_ptr<QgsGeometryCheckContext> checkContext = std::make_unique<QgsGeometryCheckContext>( mTolerance, mInputLayer->sourceCrs(), project->transformContext(), project );
+
+  // Test detection
+  QList<QgsGeometryCheckError *> checkErrors;
+  QStringList messages;
+
+  const QgsGeometrySelfIntersectionCheck check( checkContext.get(), QVariantMap() );
+
+  multiStepFeedback.setCurrentStep( 1 );
+  feedback->setProgressText( QObject::tr( "Preparing features…" ) );
+  QMap<QString, QgsFeaturePool *> featurePools;
+  featurePools.insert( mInputLayer->id(), createFeaturePool( mInputLayer.get() ) );
+
+  multiStepFeedback.setCurrentStep( 2 );
+  feedback->setProgressText( QObject::tr( "Collecting errors…" ) );
+  check.collectErrors( featurePools, checkErrors, messages, feedback );
+
+  multiStepFeedback.setCurrentStep( 3 );
+  feedback->setProgressText( QObject::tr( "Exporting errors…" ) );
+  double step{checkErrors.size() > 0 ? 100.0 / checkErrors.size() : 1};
+  long i = 0;
+  feedback->setProgress( 0.0 );
+
+
+  for ( QgsGeometryCheckError *error : checkErrors )
+  {
+
+    if ( feedback->isCanceled() )
+      break;
+
+    QgsFeature f;
+    QgsAttributes attrs = f.attributes();
+
+    attrs << error->layerId()
+          << mInputLayer->name()
+          << error->featureId()
+          << error->vidx().part
+          << error->vidx().ring
+          << error->vidx().vertex
+          << error->location().x()
+          << error->location().y()
+          << error->value().toString();
+    f.setAttributes( attrs );
+
+    f.setGeometry( error->geometry() );
+    if ( !sink_output->addFeature( f, QgsFeatureSink::FastInsert ) )
+      throw QgsProcessingException( writeFeatureError( sink_output.get(), parameters, QStringLiteral( "OUTPUT" ) ) );
+
+    f.setGeometry( QgsGeometry::fromPoint( QgsPoint( error->location().x(), error->location().y() ) ) );
+    if ( !sink_errors->addFeature( f, QgsFeatureSink::FastInsert ) )
+      throw QgsProcessingException( writeFeatureError( sink_errors.get(), parameters, QStringLiteral( "ERRORS" ) ) );
+
+    i++;
+    feedback->setProgress( 100.0 * step * static_cast<double>( i ) );
+  }
+
+  QVariantMap outputs;
+  outputs.insert( QStringLiteral( "OUTPUT" ), dest_output );
+  outputs.insert( QStringLiteral( "ERRORS" ), dest_errors );
+
+  return outputs;
+}
+
+///@endcond
diff --git a/src/analysis/processing/qgsalgorithmcheckgeometryselfintersection.h b/src/analysis/processing/qgsalgorithmcheckgeometryselfintersection.h
@@ -0,0 +1,59 @@
+/***************************************************************************
+                        qgsalgorithmcheckgeometryselfintersection.h
+                        ---------------------
+   begin                : January 2024
+   copyright            : (C) 2024 by Jacky Volpes
+   email                : jacky dot volpes at oslandia dot com
+***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSALGORITHMCHECKGEOMETRYSELFINTERSECTION_H
+#define QGSALGORITHMCHECKGEOMETRYSELFINTERSECTION_H
+
+#define SIP_NO_FILE
+
+#include "qgis_sip.h"
+#include "qgsprocessingalgorithm.h"
+#include "qgsfeaturepool.h"
+
+///@cond PRIVATE
+
+class QgsGeometryCheckSelfIntersectionAlgorithm : public QgsProcessingAlgorithm
+{
+  public:
+
+    QgsGeometryCheckSelfIntersectionAlgorithm() = default;
+    void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
+    QString name() const override;
+    QString displayName() const override;
+    QStringList tags() const override;
+    QString group() const override;
+    QString groupId() const override;
+    QString shortHelpString() const override;
+    Flags flags() const override;
+    QgsGeometryCheckSelfIntersectionAlgorithm *createInstance() const override SIP_FACTORY;
+
+  protected:
+
+    bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
+    QVariantMap processAlgorithm( const QVariantMap &parameters,
+                                  QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
+
+  private:
+    QgsFeaturePool *createFeaturePool( QgsVectorLayer *layer, bool selectedOnly = false ) const;
+
+    std::unique_ptr< QgsVectorLayer > mInputLayer;
+    int mTolerance{8};
+};
+
+///@endcond PRIVATE
+
+#endif // QGSALGORITHMCHECKGEOMETRYSELFINTERSECTION_H
diff --git a/src/analysis/processing/qgsnativealgorithms.cpp b/src/analysis/processing/qgsnativealgorithms.cpp
@@ -46,6 +46,7 @@
 #include "qgsalgorithmcheckgeometrydangle.h"
 #include "qgsalgorithmcheckgeometrymultipart.h"
 #include "qgsalgorithmcheckgeometryangle.h"
+#include "qgsalgorithmcheckgeometryselfintersection.h"
 #include "qgsalgorithmclip.h"
 #include "qgsalgorithmconcavehull.h"
 #include "qgsalgorithmconditionalbranch.h"
@@ -318,6 +319,7 @@ void QgsNativeAlgorithms::loadAlgorithms()
   addAlgorithm( new QgsGeometryCheckDangleAlgorithm() );
   addAlgorithm( new QgsGeometryCheckMultipartAlgorithm() );
   addAlgorithm( new QgsGeometryCheckAngleAlgorithm() );
+  addAlgorithm( new QgsGeometryCheckSelfIntersectionAlgorithm() );
   addAlgorithm( new QgsClipAlgorithm() );
   addAlgorithm( new QgsCollectAlgorithm() );
   addAlgorithm( new QgsCombineStylesAlgorithm() );

diff --git a/tests/src/analysis/testqgsprocessingcheckgeometry.cpp b/tests/src/analysis/testqgsprocessingcheckgeometry.cpp
@@ -44,6 +44,9 @@ class TestQgsProcessingCheckGeometry: public QgsTest
     void multipartAlg_data();
     void multipartAlg();
 
+    void selfIntersectionAlg_data();
+    void selfIntersectionAlg();
+
   private:
 
     QgsVectorLayer *mLineLayer = nullptr;
@@ -259,5 +262,43 @@ void TestQgsProcessingCheckGeometry::multipartAlg()
   QCOMPARE( errorsLayer->featureCount(), expectedErrorCount );
 }
 
+void TestQgsProcessingCheckGeometry::selfIntersectionAlg_data()
+{
+  QTest::addColumn<QgsVectorLayer *>( "layerToTest" );
+  QTest::addColumn<int>( "expectedErrorCount" );
+  QTest::newRow( "Line layer" ) << mLineLayer << 3;
+  QTest::newRow( "Polygon layer" ) << mPolygonLayer << 2;
+}
+
+void TestQgsProcessingCheckGeometry::selfIntersectionAlg()
+{
+  QFETCH( QgsVectorLayer *, layerToTest );
+  QFETCH( int, expectedErrorCount );
+  std::unique_ptr< QgsProcessingAlgorithm > alg(
+    QgsApplication::processingRegistry()->createAlgorithmById( QStringLiteral( "native:checkgeometryselfintersection" ) )
+  );
+  QVERIFY( alg != nullptr );
+
+  QVariantMap parameters;
+  parameters.insert( QStringLiteral( "INPUT" ), QVariant::fromValue( layerToTest ) );
+  parameters.insert( QStringLiteral( "OUTPUT" ), QgsProcessing::TEMPORARY_OUTPUT );
+  parameters.insert( QStringLiteral( "ERRORS" ), QgsProcessing::TEMPORARY_OUTPUT );
+
+  bool ok = false;
+  QgsProcessingFeedback feedback;
+  std::unique_ptr< QgsProcessingContext > context = std::make_unique< QgsProcessingContext >();
+
+  QVariantMap results;
+  results = alg->run( parameters, *context, &feedback, &ok );
+  QVERIFY( ok );
+
+  std::unique_ptr<QgsVectorLayer> outputLayer( qobject_cast< QgsVectorLayer * >( context->getMapLayer( results.value( QStringLiteral( "OUTPUT" ) ).toString() ) ) );
+  std::unique_ptr<QgsVectorLayer> errorsLayer( qobject_cast< QgsVectorLayer * >( context->getMapLayer( results.value( QStringLiteral( "ERRORS" ) ).toString() ) ) );
+  QVERIFY( outputLayer->isValid() );
+  QVERIFY( errorsLayer->isValid() );
+  QCOMPARE( outputLayer->featureCount(), expectedErrorCount );
+  QCOMPARE( errorsLayer->featureCount(), expectedErrorCount );
+}
+
 QGSTEST_MAIN( TestQgsProcessingCheckGeometry )
 #include "testqgsprocessingcheckgeometry.moc"