[processing][grass] Fix r.sun parameter definition, resurrect test

(cherry-picked from 0c24fdb)
qgis · Aug 9, 2018 · 3d7b0d5 · 3d7b0d5
1 parent c9fe1a5
commit 3d7b0d5
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/python/plugins/processing/algs/grass7/description/r.sun.txt b/python/plugins/processing/algs/grass7/description/r.sun.txt
@@ -16,7 +16,7 @@ QgsProcessingParameterRasterLayer|coeff_dh|Name of real-sky diffuse radiation co
 QgsProcessingParameterRasterLayer|horizon_basemap|The horizon information input map basename|None|True
 QgsProcessingParameterNumber|horizon_step|Angle step size for multidirectional horizon [degrees]|QgsProcessingParameterNumber.Double|None|True|0.0|360.0
 QgsProcessingParameterNumber|day|No. of day of the year (1-365)|QgsProcessingParameterNumber.Integer|1|False|1|365
-*QgsProcessingParameterNumber|step|Time step when computing all-day radiation sums [decimal hours]|QgsProcessingParameterNumber.Double|0.5|True|None|0
+*QgsProcessingParameterNumber|step|Time step when computing all-day radiation sums [decimal hours]|QgsProcessingParameterNumber.Double|0.5|True|0
 *QgsProcessingParameterNumber|declination|Declination value (overriding the internally computed value) [radians]|QgsProcessingParameterNumber.Double|None|True|None|None
 *QgsProcessingParameterNumber|distance_step|Sampling distance step coefficient (0.5-1.5)|QgsProcessingParameterNumber.Double|1.0|True|0.5|1.5
 *QgsProcessingParameterNumber|npartitions|Read the input files in this number of chunks|QgsProcessingParameterNumber.Integer|1|True|1|None

diff --git a/python/plugins/processing/tests/testdata/grass7_algorithms_raster_tests.yaml b/python/plugins/processing/tests/testdata/grass7_algorithms_raster_tests.yaml
@@ -461,42 +461,42 @@ tests:
         hash: 95e064f05759606bc60f1dfa88931f545c066629c1f07919156ac03b
         type: rasterhash
 
-#  - algorithm: grass7:r.sun
-#    name: GRASS7 r.sun
-#    params:
-#      -m: false
-#      -p: false
-#      GRASS_REGION_CELLSIZE_PARAMETER: 0.0
-#      GRASS_REGION_PARAMETER: 344500.0,358400.0,6682800.0,6693700.0
-#      aspect:
-#        name: custom/grass7/float_raster.tif
-#        type: raster
-#      day: 1
-#      declination: 0.0
-#      distance_step: 1.0
-#      elevation:
-#        name: custom/grass7/raster_6class.tif
-#        type: raster
-#      slope:
-#        name: custom/grass7/float_raster.tif
-#        type: raster
-#      step: 0.5
-#    results:
-#      beam_rad:
-#        hash: c43a64c35cd5999888b1dc7099249a54f37df8658cbe9c30b92627e5
-#        type: rasterhash
-#      diff_rad:
-#        hash: ecaa83578ab6eaf24a48f2fc265e8f1deff743c145af9c85cd39bceb
-#        type: rasterhash
-#      glob_rad:
-#        hash: 3917bc5633ce2225c864055d4b3c952b87461cbe48093b8fd9738215
-#        type: rasterhash
-#      insol_time:
-#        hash: 64851f59edafe67d007da78f33b7491b949d5be3eca83ef513e2b11f
-#        type: rasterhash
-#      refl_rad:
-#        hash: cd2002486c5117db9c493e365ff6983faf1ea92b1bbea87569d3ebdd
-#        type: rasterhash
+  - algorithm: grass7:r.sun
+    name: GRASS7 r.sun
+    params:
+      -m: false
+      -p: false
+      GRASS_REGION_CELLSIZE_PARAMETER: 0.0
+      GRASS_REGION_PARAMETER: 344500.0,358400.0,6682800.0,6693700.0
+      aspect:
+        name: custom/grass7/float_raster.tif
+        type: raster
+      day: 1
+      declination: 0.0
+      distance_step: 1.0
+      elevation:
+        name: custom/grass7/raster_6class.tif
+        type: raster
+      slope:
+        name: custom/grass7/float_raster.tif
+        type: raster
+      step: 0.5
+    results:
+      beam_rad:
+        hash: c43a64c35cd5999888b1dc7099249a54f37df8658cbe9c30b92627e5
+        type: rasterhash
+      diff_rad:
+        hash: ecaa83578ab6eaf24a48f2fc265e8f1deff743c145af9c85cd39bceb
+        type: rasterhash
+      glob_rad:
+        hash: 3917bc5633ce2225c864055d4b3c952b87461cbe48093b8fd9738215
+        type: rasterhash
+      insol_time:
+        hash: 64851f59edafe67d007da78f33b7491b949d5be3eca83ef513e2b11f
+        type: rasterhash
+      refl_rad:
+        hash: cd2002486c5117db9c493e365ff6983faf1ea92b1bbea87569d3ebdd
+        type: rasterhash
 
 #  - algorithm: grass7:r.stats.quantile.out
 #    name: GRASS7 r.stats.quantile.out