sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing][grass] Fix definition of r.watershed, resurrect test

Browse Source
This commit is contained in:
Nyall Dawson 2018-08-09 11:45:22 +10:00
parent 0c24fdb883
commit e893aae190
2 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
python/plugins/processing/algs/grass7/description/r.watershed.txt
View File

@ -15,12 +15,12 @@ QgsProcessingParameterBoolean|-m|Enable disk swap memory option (-m): Operation
QgsProcessingParameterBoolean|-4|Allow only horizontal and vertical flow of water|False
QgsProcessingParameterBoolean|-a|Use positive flow accumulation even for likely underestimates|False
QgsProcessingParameterBoolean|-b|Beautify flat areas|False
QgsProcessingParameterRasterDestination|accumulation|Number of cells that drain through each cell
QgsProcessingParameterRasterDestination|drainage|Drainage direction
QgsProcessingParameterRasterDestination|basin|Unique label for each watershed basin
QgsProcessingParameterRasterDestination|stream|Stream segments
QgsProcessingParameterRasterDestination|half_basin|Half-basins
QgsProcessingParameterRasterDestination|length_slope|Slope length and steepness (LS) factor for USLE
QgsProcessingParameterRasterDestination|slope_steepness|Slope steepness (S) factor for USLE
QgsProcessingParameterRasterDestination|tci|Topographic index ln(a / tan(b))
QgsProcessingParameterRasterDestination|spi|Stream power index a * tan(b)
QgsProcessingParameterRasterDestination|accumulation|Number of cells that drain through each cell|None|True
QgsProcessingParameterRasterDestination|drainage|Drainage direction|None|True
QgsProcessingParameterRasterDestination|basin|Unique label for each watershed basin|None|True
QgsProcessingParameterRasterDestination|stream|Stream segments|None|True
QgsProcessingParameterRasterDestination|half_basin|Half-basins|None|True
QgsProcessingParameterRasterDestination|length_slope|Slope length and steepness (LS) factor for USLE|None|True
QgsProcessingParameterRasterDestination|slope_steepness|Slope steepness (S) factor for USLE|None|True
QgsProcessingParameterRasterDestination|tci|Topographic index ln(a / tan(b))|None|True
QgsProcessingParameterRasterDestination|spi|Stream power index a * tan(b)|None|True

87
python/plugins/processing/tests/testdata/grass7_algorithms_raster_tests.yaml vendored
View File

@ -1691,49 +1691,50 @@ tests:
name: expected/grass7/r.li.simpson.ascii.txt
type: file
# Differences between osgeo4travis and Debian Stretch
# - algorithm: grass7:r.watershed
# name: GRASS7 r.watershed
# params:
# '-4': false
# -a: false
# -b: false
# -m: false
# -s: false
# GRASS_REGION_CELLSIZE_PARAMETER: 0.0
# GRASS_REGION_PARAMETER: 344500.0,358400.0,6682800.0,6693700.0
# convergence: 5
# elevation:
# name: custom/grass7/float_raster.tif
# type: raster
# max_slope_length: 50
# memory: 300
# threshold: 1
# results:
# accumulation:
# hash: 1ecbadff7aee4101be1c3626a7c77ebca3ae598d33672807f4a6fc34
# type: rasterhash
# basin:
# hash: d4691e1bff8bf352508ecbdf7c694208d07ef83bb13b0768418f322c
# type: rasterhash
# drainage:
# hash: 3e97f781cbca662823a53e7a6cb10e1edde2f8d0e4d64c28a62db2c0
# type: rasterhash
# half_basin:
# hash: 431a0c8359b7662169ef8a9adf469da47a282a70981de5bee24e3528
# type: rasterhash
# length_slope:
# hash: 69b5b31ac93a25f01b85e4f7867e5b8720183732d29d50c24204a7b9
# type: rasterhash
# slope_steepness:
# hash: cafb759a5701e78928a43d87e58e552f9186358b1de40c375047f81e
# type: rasterhash
# stream:
# hash: c6e7b081057d120e47e6d10f5abd05e47b42284c7d7974e64c71e053
# type: rasterhash
# tci:
# hash: 6b213bddf1223f392c01ab26e84485c01d652dfcae40aecd186f3295
# type: rasterhash
- algorithm: grass7:r.watershed
name: GRASS7 r.watershed
params:
'-4': false
-a: false
-b: false
-m: false
-s: false
GRASS_REGION_CELLSIZE_PARAMETER: 0.0
GRASS_REGION_PARAMETER: 344500.0,358400.0,6682800.0,6693700.0
convergence: 5
elevation:
name: custom/grass7/float_raster.tif
type: raster
max_slope_length: 50
memory: 300
threshold: 1
results:
accumulation:
hash: 1ecbadff7aee4101be1c3626a7c77ebca3ae598d33672807f4a6fc34
type: rasterhash
basin:
hash: d4691e1bff8bf352508ecbdf7c694208d07ef83bb13b0768418f322c
type: rasterhash
drainage:
hash: 3e97f781cbca662823a53e7a6cb10e1edde2f8d0e4d64c28a62db2c0
type: rasterhash
half_basin:
hash: 431a0c8359b7662169ef8a9adf469da47a282a70981de5bee24e3528
type: rasterhash
length_slope:
hash: 69b5b31ac93a25f01b85e4f7867e5b8720183732d29d50c24204a7b9
type: rasterhash
slope_steepness:
hash: cafb759a5701e78928a43d87e58e552f9186358b1de40c375047f81e
type: rasterhash
stream:
hash: c6e7b081057d120e47e6d10f5abd05e47b42284c7d7974e64c71e053
type: rasterhash
tci:
hash:
- 6b213bddf1223f392c01ab26e84485c01d652dfcae40aecd186f3295
- e58737ab4169e79243dd7e50dc87555a2180a7e5f6ba00fe18b10fff
type: rasterhash
# Differences between osgeo4travis and Debian Stretch
#- algorithm: grass7:r.transect