[processing] fixed management of SAGA versions

fixes #13429

Author: volaya

python/plugins/processing/algs/saga/SagaAlgorithmProvider.py

@@ -45,9 +45,9 @@ class SagaAlgorithmProvider(AlgorithmProvider):
 
     supportedVersions = {"2.1.2": ("2.1.2", SagaAlgorithm212),
                          "2.1.3": ("2.1.3", SagaAlgorithm213),
-                         "2.1.4": ("2.1.3", SagaAlgorithm214),
-                         # to allow testing upcoming release
-                         "2.2.0": ("2.1.3", SagaAlgorithm214)}
+                         "2.1.4": ("2.1.4", SagaAlgorithm214),
+                         "2.2.0": ("2.2.0", SagaAlgorithm214)}
+
 
     def __init__(self):
         AlgorithmProvider.__init__(self)
@@ -87,9 +87,12 @@ def _loadAlgorithms(self):
                                    self.tr('Problem with SAGA installation: SAGA was not found or is not correctly installed'))
             return
         if version not in self.supportedVersions:
-            ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
+            if version > self.supportedVersions.keys()[-1]:
+                version = self.supportedVersions.keys()[-1]
+            else:
+                ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
                                    self.tr('Problem with SAGA installation: installed SAGA version (%s) is not supported' % version))
-            return
+                return
 
         folder = SagaUtils.sagaDescriptionPath()
         folder = os.path.join(folder, self.supportedVersions[version][0])

python/plugins/processing/algs/saga/description/2.1.4/AccumulatedCost(Anisotropic).txt

@@ -0,0 +1,8 @@
+Accumulated Cost (Anisotropic)
+grid_analysis
+ParameterRaster|COST|Cost Grid|False
+ParameterRaster|DIRECTION|Direction of max cost|False
+ParameterRaster|POINTS|Destination Points|False
+ParameterNumber|K|k factor|None|None|1
+ParameterNumber|THRESHOLD|Threshold for different route|None|None|0
+OutputRaster|ACCCOST|Accumulated Cost

python/plugins/processing/algs/saga/description/2.1.4/AccumulatedCost(Isotropic).txt

@@ -0,0 +1,7 @@
+Accumulated Cost (Isotropic)
+grid_analysis
+ParameterRaster|COST|Cost Grid|False
+ParameterRaster|POINTS|Destination Points|False
+ParameterNumber|THRESHOLD|Threshold for different route|None|None|0.0
+OutputRaster|ACCCOST|Accumulated Cost
+OutputRaster|CLOSESTPT|Closest Point

python/plugins/processing/algs/saga/description/2.1.4/AddCoordinatestopoints.txt

@@ -0,0 +1,4 @@
+Add Coordinates to points
+shapes_points
+ParameterVector|INPUT|Points|0|False
+OutputVector|OUTPUT|Points with coordinates

python/plugins/processing/algs/saga/description/2.1.4/AddGridValuestoPoints.txt

@@ -0,0 +1,6 @@
+Add Grid Values to Points
+shapes_grid
+ParameterVector|SHAPES|Points|0|False
+ParameterMultipleInput|GRIDS|Grids|3|False
+ParameterSelection|INTERPOL|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
+OutputVector|RESULT|Result

python/plugins/processing/algs/saga/description/2.1.4/AddGridValuestoShapes.txt

@@ -0,0 +1,6 @@
+Add Grid Values to Shapes
+shapes_grid
+ParameterVector|SHAPES|Shapes|-1|False
+ParameterMultipleInput|GRIDS|Grids|3|False
+ParameterSelection|INTERPOL|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
+OutputVector|RESULT|Result

python/plugins/processing/algs/saga/description/2.1.4/AddPolygonAttributestoPoints.txt

@@ -0,0 +1,6 @@
+Add Polygon Attributes to Points
+shapes_points
+ParameterVector|INPUT|Points|0|False
+ParameterVector|POLYGONS|Polygons|2|False
+ParameterTableField|FIELDS|Attribute|POLYGONS|-1|False
+OutputVector|OUTPUT|Result

python/plugins/processing/algs/saga/description/2.1.4/Aggregate.txt

@@ -0,0 +1,5 @@
+Aggregate
+grid_tools
+ParameterRaster|INPUT|Grid|False
+ParameterNumber|SIZE|Aggregation Size|None|None|3
+ParameterSelection|METHOD|Method|[0] Sum;[1] Min;[2] Max

python/plugins/processing/algs/saga/description/2.1.4/AggregatePointObservations.txt

@@ -0,0 +1,14 @@
+Aggregate Point Observations
+shapes_points
+ParameterVector|REFERENCE|Reference Points|-1|False
+ParameterTableField|REFERENCE_ID|ID|REFERENCE|-1|False
+ParameterTable|OBSERVATIONS|Observations|False
+ParameterTableField|X|X|OBSERVATIONS|-1|False
+ParameterTableField|Y|Y|OBSERVATIONS|-1|False
+ParameterTableField|TRACK|Track|OBSERVATIONS|-1|False
+ParameterTableField|DATE|Date|OBSERVATIONS|-1|False
+ParameterTableField|TIME|Time|OBSERVATIONS|-1|False
+ParameterTableField|PARAMETER|Parameter|OBSERVATIONS|-1|False
+ParameterNumber|EPS_TIME|Maximum Time Span (Seconds)|None|None|60.0
+ParameterNumber|EPS_SPACE|Maximum Distance|None|None|0.002
+OutputTable|AGGREGATED|Aggregated

python/plugins/processing/algs/saga/description/2.1.4/AggregationIndex.txt

@@ -0,0 +1,5 @@
+Aggregation Index
+grid_analysis
+ParameterRaster|INPUT|Input Grid|False
+ParameterNumber|MAXNUMCLASS|Max. Number of Classes|None|None|5
+OutputTable|RESULT|Result