add boundary algorithm

alexbruy · wonder-sk · commit a068f9d51e47 · 2023-03-22T16:04:01.000+01:00
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -423,6 +423,7 @@ if (WITH_PDAL)
 
     processing/pdal/qgspdalalgorithmbase.cpp
 
+    processing/pdal/qgsalgorithmpdalboundary.cpp
     processing/pdal/qgsalgorithmpdalconvertformat.cpp
     processing/pdal/qgsalgorithmpdalfixprojection.cpp
     processing/pdal/qgsalgorithmpdalinformation.cpp
diff --git a/src/analysis/processing/pdal/qgsalgorithmpdalboundary.cpp b/src/analysis/processing/pdal/qgsalgorithmpdalboundary.cpp
@@ -0,0 +1,87 @@
+/***************************************************************************
+                         qgsalgorithmpdalboundary.cpp
+                         ---------------------
+    begin                : February 2023
+    copyright            : (C) 2023 by Alexander Bruy
+    email                : alexander dot bruy at gmail 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 "qgsalgorithmpdalboundary.h"
+
+#include "qgsrunprocess.h"
+#include "qgspointcloudlayer.h"
+
+///@cond PRIVATE
+
+QString QgsPdalBoundaryAlgorithm::name() const
+{
+  return QStringLiteral( "boundary" );
+}
+
+QString QgsPdalBoundaryAlgorithm::displayName() const
+{
+  return QObject::tr( "Boundary" );
+}
+
+QString QgsPdalBoundaryAlgorithm::group() const
+{
+  return QObject::tr( "Point cloud extraction" );
+}
+
+QString QgsPdalBoundaryAlgorithm::groupId() const
+{
+  return QStringLiteral( "pointcloudextraction" );
+}
+
+QStringList QgsPdalBoundaryAlgorithm::tags() const
+{
+  return QObject::tr( "extent,envelope,bounds,bounding,boundary,vector" ).split( ',' );
+}
+
+QString QgsPdalBoundaryAlgorithm::shortHelpString() const
+{
+  return QObject::tr( "This algorithm exports a polygon file containing point cloud layer boundary. It may contain holes and it may be a multi-part polygon." );
+}
+
+QgsPdalBoundaryAlgorithm *QgsPdalBoundaryAlgorithm::createInstance() const
+{
+  return new QgsPdalBoundaryAlgorithm();
+}
+
+void QgsPdalBoundaryAlgorithm::initAlgorithm( const QVariantMap & )
+{
+  addParameter( new QgsProcessingParameterPointCloudLayer( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ) ) );
+  addParameter( new QgsProcessingParameterVectorDestination( QStringLiteral( "OUTPUT" ), QObject::tr( "Boundary" ), QgsProcessing::TypeVectorPolygon ) );
+}
+
+QStringList QgsPdalBoundaryAlgorithm::createArgumentLists( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
+{
+  Q_UNUSED( feedback );
+
+  QgsPointCloudLayer *layer = parameterAsPointCloudLayer( parameters, QStringLiteral( "INPUT" ), context );
+  if ( !layer )
+    throw QgsProcessingException( invalidPointCloudError( parameters, QStringLiteral( "INPUT" ) ) );
+
+  const QString outputFile = parameterAsOutputLayer( parameters, QStringLiteral( "OUTPUT" ), context );
+  setOutputValue( QStringLiteral( "OUTPUT" ), outputFile );
+
+
+  QStringList args = { QStringLiteral( "boundary" ),
+                       QStringLiteral( "--input=%1" ).arg( layer->source() ),
+                       QStringLiteral( "--output=%1" ).arg( outputFile )
+                     };
+
+  addThreadsParameter( args );
+  return args;
+}
+
+///@endcond
diff --git a/src/analysis/processing/pdal/qgsalgorithmpdalboundary.h b/src/analysis/processing/pdal/qgsalgorithmpdalboundary.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+                         qgsalgorithmpdalboundary.h
+                         ---------------------
+    begin                : February 2023
+    copyright            : (C) 2023 by Alexander Bruy
+    email                : alexander dot bruy at gmail 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 QGSALGORITHMPDALBOUNDARY_H
+#define QGSALGORITHMPDALBOUNDARY_H
+
+#define SIP_NO_FILE
+
+#include "qgis_sip.h"
+#include "qgspdalalgorithmbase.h"
+
+///@cond PRIVATE
+
+/**
+ * Native point cloud boundary algorithm.
+ */
+class QgsPdalBoundaryAlgorithm : public QgsPdalAlgorithmBase
+{
+
+  public:
+
+    QgsPdalBoundaryAlgorithm() = default;
+    void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
+    QString name() const override;
+    QString displayName() const override;
+    QString group() const override;
+    QString groupId() const override;
+    QStringList tags() const override;
+    QString shortHelpString() const override;
+    QgsPdalBoundaryAlgorithm *createInstance() const override SIP_FACTORY;
+
+    QStringList createArgumentLists( const QVariantMap &parameters,
+                                     QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
+
+    friend class TestQgsProcessingPdalAlgs;
+};
+
+///@endcond PRIVATE
+
+#endif // QGSALGORITHMPDALBOUNDARY_H
diff --git a/src/analysis/processing/pdal/qgspdalalgorithms.cpp b/src/analysis/processing/pdal/qgspdalalgorithms.cpp
@@ -19,6 +19,7 @@
 #include "qgsruntimeprofiler.h"
 #include "qgsapplication.h"
 
+#include "qgsalgorithmpdalboundary.h"
 #include "qgsalgorithmpdalconvertformat.h"
 #include "qgsalgorithmpdalfixprojection.h"
 #include "qgsalgorithmpdalinformation.h"
@@ -80,6 +81,7 @@ void QgsPdalAlgorithms::loadAlgorithms()
 {
   const QgsScopedRuntimeProfile profile( QObject::tr( "QGIS PDAL provider" ) );
 
+  addAlgorithm( new QgsPdalBoundaryAlgorithm() );
   addAlgorithm( new QgsPdalConvertFormatAlgorithm() );
   addAlgorithm( new QgsPdalFixProjectionAlgorithm() );
   addAlgorithm( new QgsPdalInformationAlgorithm() );
diff --git a/tests/src/analysis/testqgsprocessingpdalalgs.cpp b/tests/src/analysis/testqgsprocessingpdalalgs.cpp
@@ -34,6 +34,7 @@ class TestQgsProcessingPdalAlgs: public QObject
     void init(); // will be called before each testfunction is executed.
     void cleanup() {} // will be called after every testfunction.
 
+    void boundary();
     void convertFormat();
     void fixProjection();
     void info();
@@ -248,5 +249,36 @@ void TestQgsProcessingPdalAlgs::thin()
           );
 }
 
+void TestQgsProcessingPdalAlgs::boundary()
+{
+  QgsPdalAlgorithmBase *alg = const_cast<QgsPdalAlgorithmBase *>( static_cast< const QgsPdalAlgorithmBase * >( QgsApplication::processingRegistry()->algorithmById( QStringLiteral( "pdal:boundary" ) ) ) );
+
+  std::unique_ptr< QgsProcessingContext > context = std::make_unique< QgsProcessingContext >();
+  context->setProject( QgsProject::instance() );
+
+  QgsProcessingFeedback feedback;
+
+  const QString outputGpkg = QDir::tempPath() + "/boundary.gpkg";
+
+  QVariantMap parameters;
+  parameters.insert( QStringLiteral( "INPUT" ), mPointCloudLayerPath );
+  parameters.insert( QStringLiteral( "OUTPUT" ), outputGpkg );
+
+  QStringList args = alg->createArgumentLists( parameters, *context, &feedback );
+  QCOMPARE( args, QStringList() << QStringLiteral( "boundary" )
+            << QStringLiteral( "--input=%1" ).arg( mPointCloudLayerPath )
+            << QStringLiteral( "--output=%1" ).arg( outputGpkg )
+          );
+
+  // set max threads to 2, a --threads argument should be added
+  QgsSettings().setValue( QStringLiteral( "/Processing/Configuration/MAX_THREADS" ), 2 );
+  args = alg->createArgumentLists( parameters, *context, &feedback );
+  QCOMPARE( args, QStringList() << QStringLiteral( "boundary" )
+            << QStringLiteral( "--input=%1" ).arg( mPointCloudLayerPath )
+            << QStringLiteral( "--output=%1" ).arg( outputGpkg )
+            << QStringLiteral( "--threads=2" )
+          );
+}
+
 QGSTEST_MAIN( TestQgsProcessingPdalAlgs )
 #include "testqgsprocessingpdalalgs.moc"
