add threshold and resolution parameters to boudary algorithm

alexbruy · wonder-sk · commit 27210ced9b81 · 2023-03-22T16:04:01.000+01:00
diff --git a/src/analysis/processing/pdal/qgsalgorithmpdalboundary.cpp b/src/analysis/processing/pdal/qgsalgorithmpdalboundary.cpp
@@ -61,6 +61,8 @@ void QgsPdalBoundaryAlgorithm::initAlgorithm( const QVariantMap & )
 {
   addParameter( new QgsProcessingParameterPointCloudLayer( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ) ) );
   addParameter( new QgsProcessingParameterVectorDestination( QStringLiteral( "OUTPUT" ), QObject::tr( "Boundary" ), QgsProcessing::TypeVectorPolygon ) );
+  addParameter( new QgsProcessingParameterNumber( QStringLiteral( "RESOLUTION" ), QObject::tr( "Resolution of cells used to calculate boundary" ), QgsProcessingParameterNumber::Integer, QVariant(), true, 1 ) );
+  addParameter( new QgsProcessingParameterNumber( QStringLiteral( "THRESHOLD" ), QObject::tr( "Minimal number of points in a cell to consider cell occupied" ), QgsProcessingParameterNumber::Integer, QVariant(), true, 1 ) );
 }
 
 QStringList QgsPdalBoundaryAlgorithm::createArgumentLists( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
@@ -74,12 +76,29 @@ QStringList QgsPdalBoundaryAlgorithm::createArgumentLists( const QVariantMap &pa
   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 )
                      };
 
+  bool hasResolution = parameters.value( QStringLiteral( "RESOLUTION" ) ).isValid();
+  bool hasThreshold = parameters.value( QStringLiteral( "THRESHOLD" ) ).isValid();
+
+  if ( hasThreshold && !hasResolution )
+  {
+    throw QgsProcessingException( QObject::tr( "Resolution parameter must be set when points threshold is set." ) );
+  }
+
+  if ( hasResolution )
+  {
+    args << QStringLiteral( "--resolution=%1" ).arg( parameterAsInt( parameters, QStringLiteral( "RESOLUTION" ), context ) );
+  }
+
+  if ( hasThreshold )
+  {
+    args << QStringLiteral( "--threshold=%1" ).arg( parameterAsInt( parameters, QStringLiteral( "THRESHOLD" ), context ) );
+  }
+
   addThreadsParameter( args );
   return args;
 }
diff --git a/tests/src/analysis/testqgsprocessingpdalalgs.cpp b/tests/src/analysis/testqgsprocessingpdalalgs.cpp
@@ -279,12 +279,27 @@ void TestQgsProcessingPdalAlgs::boundary()
             << QStringLiteral( "--output=%1" ).arg( outputGpkg )
           );
 
+  // threshold requires resolution parameter
+  parameters.insert( QStringLiteral( "THRESHOLD" ), 10 );
+  QVERIFY_EXCEPTION_THROWN( alg->createArgumentLists( parameters, *context, &feedback ), QgsProcessingException );
+
+  parameters.insert( QStringLiteral( "RESOLUTION" ), 3000 );
+  args = alg->createArgumentLists( parameters, *context, &feedback );
+  QCOMPARE( args, QStringList() << QStringLiteral( "boundary" )
+            << QStringLiteral( "--input=%1" ).arg( mPointCloudLayerPath )
+            << QStringLiteral( "--output=%1" ).arg( outputGpkg )
+            << QStringLiteral( "--resolution=%1" ).arg( 3000 )
+            << QStringLiteral( "--threshold=%1" ).arg( 10 )
+          );
+
   // 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( "--resolution=%1" ).arg( 3000 )
+            << QStringLiteral( "--threshold=%1" ).arg( 10 )
             << QStringLiteral( "--threads=2" )
           );
 }
