[processing] Port "Aggregate" algorithm to c++

No more silly breakages! Refs #36843
qgis · Jun 3, 2020 · 48c465e · 48c465e
1 parent d5a340f
commit 48c465e
Show file tree

Hide file tree

Showing 7 changed files with 358 additions and 248 deletions.
diff --git a/python/plugins/processing/algs/help/qgis.yaml b/python/plugins/processing/algs/help/qgis.yaml
@@ -1,17 +1,6 @@
 qgis:advancedpythonfieldcalculator: >
   This algorithm adds a new attribute to a vector layer, with values resulting from applying an expression to each feature. The expression is defined as a Python function.
 
-qgis:aggregate: >
-  This algorithm take a vector or table layer and aggregate features based on a group by expression. Features for which group by expression return the same value are grouped together.
-
-  It is possible to group all source features together using constant value in group by parameter, example: NULL.
-
-  It is also possible to group features using multiple fields using Array function, example: Array("Field1", "Field2").
-
-  Geometries (if present) are combined into one multipart geometry for each group.
-
-  Output attributes are computed depending on each given aggregate definition.
-
 qgis:barplot: >
   This algorithm creates a bar plot from a category and a layer field.
 

diff --git a/python/plugins/processing/algs/qgis/Aggregate.py b/python/plugins/processing/algs/qgis/Aggregate.py
diff --git a/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py b/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py
@@ -29,7 +29,6 @@
 
 from PyQt5.QtCore import QCoreApplication
 
-from .Aggregate import Aggregate
 from .BarPlot import BarPlot
 from .BasicStatistics import BasicStatisticsForField
 from .BoxPlot import BoxPlot
@@ -102,8 +101,7 @@ def __init__(self):
         QgsApplication.processingRegistry().addAlgorithmAlias('qgis:rectanglesovalsdiamondsfixed', 'native:rectanglesovalsdiamonds')
 
     def getAlgs(self):
-        algs = [Aggregate(),
-                BarPlot(),
+        algs = [BarPlot(),
                 BasicStatisticsForField(),
                 BoxPlot(),
                 CheckValidity(),

diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -25,6 +25,7 @@ SET(QGIS_ANALYSIS_SRCS
   processing/qgsalgorithmaddtablefield.cpp
   processing/qgsalgorithmaddxyfields.cpp
   processing/qgsalgorithmaffinetransform.cpp
+  processing/qgsalgorithmaggregate.cpp
   processing/qgsalgorithmapplylayerstyle.cpp
   processing/qgsalgorithmarraytranslatedfeatures.cpp
   processing/qgsalgorithmaspect.cpp