Sfoglia il codice sorgente

r.fillnulls: Fix RST segmax/npmin logic.
Current version errornously was discarding user provided values (as implemented by me at https://trac.osgeo.org/grass/changeset/57030)
This bug was causing segmentation even for small holes.


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@72029 15284696-431f-4ddb-bdfa-cd5b030d7da7

Maris Nartiss 7 anni fa
parent
commit
9becc263e8
1 ha cambiato i file con 6 aggiunte e 3 eliminazioni
  1. 6 3
      scripts/r.fillnulls/r.fillnulls.py

+ 6 - 3
scripts/r.fillnulls/r.fillnulls.py

@@ -340,8 +340,11 @@ def main():
 
 
             # Avoid v.surf.rst warnings
             # Avoid v.surf.rst warnings
             if pointsnumber < segmax:
             if pointsnumber < segmax:
-                npmin = pointsnumber + 1
-                segmax = pointsnumber
+                use_npmin = pointsnumber
+                use_segmax = pointsnumber * 2
+            else:
+                use_npmin = npmin
+                use_segmax = segmax
 
 
             # launch v.surf.rst
             # launch v.surf.rst
             tmp_rmaps.append(holename + '_dem')
             tmp_rmaps.append(holename + '_dem')
@@ -349,7 +352,7 @@ def main():
                 grass.run_command('v.surf.rst', quiet=quiet,
                 grass.run_command('v.surf.rst', quiet=quiet,
                                   input=holename, elev=holename + '_dem',
                                   input=holename, elev=holename + '_dem',
                                   tension=tension, smooth=smooth,
                                   tension=tension, smooth=smooth,
-                                  segmax=segmax, npmin=npmin)
+                                  segmax=use_segmax, npmin=use_npmin)
             except CalledModuleError:
             except CalledModuleError:
                 # GTC Hole is NULL area in a raster map
                 # GTC Hole is NULL area in a raster map
                 grass.fatal(_("Failed to fill hole %s") % cat)
                 grass.fatal(_("Failed to fill hole %s") % cat)