Skip to content

Commit

Permalink
[processing][grass] Fix r.stream.extract definition, resurrect test
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Aug 9, 2018
1 parent e893aae commit 7495ec2
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ QgsProcessingParameterNumber|mexp|Montgomery exponent for slope|QgsProcessingPar
QgsProcessingParameterNumber|stream_length|Delete stream segments shorter than cells|QgsProcessingParameterNumber.Integer|0|True|0|None
QgsProcessingParameterNumber|d8cut|Use SFD above this threshold|QgsProcessingParameterNumber.Double|None|True|0|None
*QgsProcessingParameterNumber|memory|Maximum memory to be used (in MB)|QgsProcessingParameterNumber.Integer|300|True|0|None
QgsProcessingParameterRasterDestination|stream_raster|Unique stream ids (rast)
QgsProcessingParameterVectorDestination|stream_vector|Unique stream ids (vect)
QgsProcessingParameterRasterDestination|direction|Flow direction
QgsProcessingParameterRasterDestination|stream_raster|Unique stream ids (rast)|None|True
QgsProcessingParameterVectorDestination|stream_vector|Unique stream ids (vect)|-1|None|True
QgsProcessingParameterRasterDestination|direction|Flow direction|None|True
Original file line number Diff line number Diff line change
Expand Up @@ -1752,24 +1752,23 @@ tests:
# name: expected/grass7/r.transect.txt
# type: file

# Differences between osgeo4travis and Debian Stretch
# - algorithm: grass7:r.stream.extract
# name: GRASS7 r.stream.extract
# params:
# GRASS_OUTPUT_TYPE_PARAMETER: '0'
# GRASS_REGION_CELLSIZE_PARAMETER: 0.0
# GRASS_REGION_PARAMETER: 344500.0,358400.0,6682800.0,6693700.0
# d8cut: 0
# elevation:
# name: custom/grass7/float_raster.tif
# type: raster
# mexp: 0
# stream_length: 0
# threshold: 1
# results:
# direction:
# hash: 8499f6e5f81d0b79a0483481b467263246e2c97f1ef652df90e773e2
# type: rasterhash
# stream_raster:
# hash: 916672ce0c35295100bcdc56bc60e26841b9cbb384924ae4f54648a8
# type: rasterhash
- algorithm: grass7:r.stream.extract
name: GRASS7 r.stream.extract
params:
GRASS_OUTPUT_TYPE_PARAMETER: '0'
GRASS_REGION_CELLSIZE_PARAMETER: 0.0
GRASS_REGION_PARAMETER: 344500.0,358400.0,6682800.0,6693700.0
d8cut: 0
elevation:
name: custom/grass7/float_raster.tif
type: raster
mexp: 0
stream_length: 0
threshold: 1
results:
direction:
hash: 8499f6e5f81d0b79a0483481b467263246e2c97f1ef652df90e773e2
type: rasterhash
stream_raster:
hash: 916672ce0c35295100bcdc56bc60e26841b9cbb384924ae4f54648a8
type: rasterhash

0 comments on commit 7495ec2

Please sign in to comment.