[processing] port terrain analysis algoithms to C++

qgis · Nov 25, 2019 · 06a7140 · 06a7140
1 parent 23ae038
commit 06a7140
Show file tree

Hide file tree

Showing 17 changed files with 610 additions and 368 deletions.
diff --git a/python/plugins/processing/algs/help/qgis.yaml b/python/plugins/processing/algs/help/qgis.yaml
@@ -24,10 +24,6 @@ qgis:aggregate: >
 
   Output attributes are computed depending on each given aggregate definition.
 
-qgis:aspect: >
-  This algorithm calculates the aspect of the Digital Terrain Model in input.
-  The final aspect raster layer contains values from 0 to 360 that express the slope direction: starting from North (0°) and continuing clockwise.
-
 qgis:barplot: >
   This algorithm creates a bar plot from a category and a layer field.
 
@@ -216,10 +212,6 @@ qgis:generatepointspixelcentroidsinsidepolygons: >
   This algorithm generates a point vector layer from an input raster and polygon layer.
   The points correspond to the pixel centroids that intersect the polygon layer.
 
-qgis:hillshade: >
-  This algorithm calculates the hillshade raster layer given a Digital Terrain Model in input.
-  The shading of the layer is calculated according to the sun position (azimuth and elevation).
-
 qgis:hypsometriccurves: >
   This algorithm computes hypsometric curves  for an input Digital Elevation Model. Curves are produced as table files in an output folder specified by the user.
 
@@ -459,15 +451,6 @@ qgis:regularpoints: >
 qgis:relief: >
   This algorithm creates a shaded relief layer from digital elevation data.
 
-qgis:ruggednessindex: >
-  This algorithm calculates the quantitative measurement of terrain heterogeneity described by Riley et al. (1999).
-  It is calculated for every location, by summarizing the change in elevation within the 3x3 pixel grid.
-
-  Each pixel contains the difference in elevation from a center cell and the 8 cells surrounding it.
-
-qgis:slope: >
-  This algorithm calculates the angle of inclination of the terrain from an input raster layer. The slope is expressed in degrees.
-
 qgis:removenullgeometries: >
   This algorithm removes any features which do not have a geometry from a vector layer. All other features will be copied unchanged.
 

diff --git a/python/plugins/processing/algs/qgis/Aspect.py b/python/plugins/processing/algs/qgis/Aspect.py
diff --git a/python/plugins/processing/algs/qgis/Hillshade.py b/python/plugins/processing/algs/qgis/Hillshade.py
diff --git a/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py b/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py
@@ -30,7 +30,6 @@
 
 from .AddTableField import AddTableField
 from .Aggregate import Aggregate
-from .Aspect import Aspect
 from .BarPlot import BarPlot
 from .BasicStatistics import BasicStatisticsForField
 from .BoxPlot import BoxPlot
@@ -56,7 +55,6 @@
 from .GeometryConvert import GeometryConvert
 from .GeometryByExpression import GeometryByExpression
 from .Heatmap import Heatmap
-from .Hillshade import Hillshade
 from .HubDistanceLines import HubDistanceLines
 from .HubDistancePoints import HubDistancePoints
 from .HypsometricCurves import HypsometricCurves
@@ -98,15 +96,13 @@
 from .RectanglesOvalsDiamondsVariable import RectanglesOvalsDiamondsVariable
 from .RegularPoints import RegularPoints
 from .Relief import Relief
-from .Ruggedness import Ruggedness
 from .SelectByAttribute import SelectByAttribute
 from .SelectByExpression import SelectByExpression
 from .SetMValue import SetMValue
 from .SetRasterStyle import SetRasterStyle
 from .SetVectorStyle import SetVectorStyle
 from .SetZValue import SetZValue
 from .SingleSidedBuffer import SingleSidedBuffer
-from .Slope import Slope
 from .SnapGeometries import SnapGeometriesToLayer
 from .SpatialiteExecuteSQL import SpatialiteExecuteSQL
 from .SpatialIndex import SpatialIndex
@@ -140,7 +136,6 @@ def __init__(self):
     def getAlgs(self):
         algs = [AddTableField(),
                 Aggregate(),
-                Aspect(),
                 BarPlot(),
                 BasicStatisticsForField(),
                 BoxPlot(),
@@ -166,7 +161,6 @@ def getAlgs(self):
                 GeometryByExpression(),
                 GeometryConvert(),
                 Heatmap(),
-                Hillshade(),
                 HubDistanceLines(),
                 HubDistancePoints(),
                 HypsometricCurves(),
@@ -208,15 +202,13 @@ def getAlgs(self):
                 RectanglesOvalsDiamondsVariable(),
                 RegularPoints(),
                 Relief(),
-                Ruggedness(),
                 SelectByAttribute(),
                 SelectByExpression(),
                 SetMValue(),
                 SetRasterStyle(),
                 SetVectorStyle(),
                 SetZValue(),
                 SingleSidedBuffer(),
-                Slope(),
                 SnapGeometriesToLayer(),
                 SpatialiteExecuteSQL(),
                 SpatialIndex(),

diff --git a/python/plugins/processing/algs/qgis/Ruggedness.py b/python/plugins/processing/algs/qgis/Ruggedness.py