Explorar o código

update g.region calls to use new element names (https://trac.osgeo.org/grass/ticket/2409)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63628 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler %!s(int64=10) %!d(string=hai) anos
pai
achega
a9a8c7e4e0
Modificáronse 100 ficheiros con 161 adicións e 166 borrados
  1. 1 1
      display/d.barscale/thumbnails/README
  2. 1 1
      display/d.geodesic/d.geodesic.html
  3. 1 1
      display/d.his/d.his.html
  4. 1 1
      display/d.path/d.path.html
  5. 1 1
      display/d.rhumbline/d.rhumbline.html
  6. 1 1
      display/d.vect.chart/d.vect.chart.html
  7. 1 1
      display/d.vect/d.vect.html
  8. 1 1
      general/g.list/g.list.html
  9. 6 11
      general/g.region/g.region.html
  10. 1 1
      general/g.region/main.c
  11. 3 3
      gui/wxpython/gcp/manager.py
  12. 1 1
      gui/wxpython/mapdisp/frame.py
  13. 2 2
      gui/wxpython/psmap/instructions.py
  14. 2 2
      gui/wxpython/rlisetup/functions.py
  15. 2 2
      gui/wxpython/rlisetup/g.gui.rlisetup.html
  16. 1 1
      gui/wxpython/rlisetup/sampling_frame.py
  17. 3 3
      gui/wxpython/rlisetup/wizard.py
  18. 1 1
      imagery/i.atcorr/i.atcorr.html
  19. 1 1
      imagery/i.atcorr/test_suite/README.txt
  20. 1 1
      imagery/i.cluster/i.cluster.html
  21. 2 2
      imagery/i.fft/i.fft.html
  22. 1 1
      imagery/i.pca/i.pca.html
  23. 2 2
      imagery/i.segment/i.segment.html
  24. 1 1
      imagery/i.smap/i.smap.html
  25. 1 1
      imagery/i.vi/i.vi.html
  26. 3 3
      lib/cairodriver/cairodriver.html
  27. 1 1
      lib/pngdriver/pngdriver.html
  28. 1 1
      lib/psdriver/psdriver.html
  29. 1 1
      lib/python/docs/src/gunittest_testing.rst
  30. 2 2
      lib/python/gunittest/testsuite/test_assertions.py
  31. 1 1
      lib/python/pygrass/modules/grid/grid.py
  32. 6 6
      lib/python/script/testsuite/test_start_command_functions.py
  33. 9 9
      lib/python/script/testsuite/test_start_command_functions_nc.py
  34. 2 2
      lib/python/temporal/stds_import.py
  35. 1 1
      misc/m.nviz.image/m.nviz.image.html
  36. 1 1
      misc/m.nviz.script/m.nviz.script.html
  37. 1 1
      ps/ps.map/ps.map.html
  38. 1 1
      raster/r.carve/r.carve.html
  39. 1 1
      raster/r.clump/r.clump.html
  40. 1 1
      raster/r.contour/r.contour.html
  41. 1 1
      raster/r.cost/r.cost.html
  42. 1 1
      raster/r.cost/test_suite/profile.sh
  43. 1 1
      raster/r.drain/tests/test.r.drain.sh
  44. 1 1
      raster/r.external/r.external.html
  45. 2 2
      raster/r.grow.distance/r.grow.distance.html
  46. 1 1
      raster/r.his/r.his.html
  47. 1 1
      raster/r.horizon/r.horizon.html
  48. 1 1
      raster/r.in.lidar/r.in.lidar.html
  49. 1 1
      raster/r.in.poly/testsuite/test_rinpoly.py
  50. 1 1
      raster/r.kappa/r.kappa.html
  51. 1 1
      raster/r.lake/r.lake.html
  52. 1 1
      raster/r.latlong/r.latlong.html
  53. 2 2
      raster/r.li/TODO
  54. 1 1
      raster/r.li/r.li.daemon/daemon.c
  55. 2 2
      raster/r.li/r.li.dominance/r.li.dominance.html
  56. 2 2
      raster/r.li/r.li.edgedensity/r.li.edgedensity.html
  57. 1 1
      raster/r.li/r.li.html
  58. 2 2
      raster/r.li/r.li.mpa/r.li.mpa.html
  59. 2 2
      raster/r.li/r.li.mps/r.li.mps.html
  60. 2 2
      raster/r.li/r.li.padcv/r.li.padcv.html
  61. 2 2
      raster/r.li/r.li.padrange/r.li.padrange.html
  62. 2 2
      raster/r.li/r.li.padsd/r.li.padsd.html
  63. 2 2
      raster/r.li/r.li.patchdensity/r.li.patchdensity.html
  64. 2 2
      raster/r.li/r.li.patchnum/r.li.patchnum.html
  65. 2 2
      raster/r.li/r.li.pielou/r.li.pielou.html
  66. 2 2
      raster/r.li/r.li.renyi/r.li.renyi.html
  67. 2 2
      raster/r.li/r.li.richness/r.li.richness.html
  68. 2 2
      raster/r.li/r.li.shannon/r.li.shannon.html
  69. 2 2
      raster/r.li/r.li.shape/r.li.shape.html
  70. 2 2
      raster/r.li/r.li.simpson/r.li.simpson.html
  71. 1 1
      raster/r.li/r.li.testing_nc_asc.sh
  72. 1 1
      raster/r.li/r.li.testing_sp_mov.sh
  73. 1 1
      raster/r.mapcalc/test_suite/README
  74. 1 1
      raster/r.mode/r.mode.html
  75. 7 7
      raster/r.out.gdal/r.out.gdal.html
  76. 1 1
      raster/r.out.ppm/r.out.ppm.html
  77. 1 1
      raster/r.out.ppm3/r.out.ppm3.html
  78. 1 1
      raster/r.param.scale/r.param.scale.html
  79. 2 2
      raster/r.patch/r.patch.html
  80. 1 1
      raster/r.profile/testsuite/test_profile_ncspm.py
  81. 1 1
      raster/r.proj/r.proj.html
  82. 2 2
      raster/r.quantile/r.quantile.html
  83. 2 2
      raster/r.random/r.random.html
  84. 1 1
      raster/r.reclass/r.reclass.html
  85. 1 1
      raster/r.recode/testsuite/test_rrecode_ncspm.py
  86. 2 2
      raster/r.regression.line/r.regression.line.html
  87. 1 1
      raster/r.regression.multi/r.regression.multi.html
  88. 1 1
      raster/r.relief/r.relief.html
  89. 2 2
      raster/r.resamp.bspline/r.resamp.bspline.html
  90. 1 1
      raster/r.resamp.interp/r.resamp.interp.html
  91. 1 1
      raster/r.resamp.rst/BUGS
  92. 2 2
      raster/r.resamp.rst/r.resamp.rst.html
  93. 1 1
      raster/r.resamp.stats/r.resamp.stats.html
  94. 1 1
      raster/r.sim/r.sim.water/r.sim.water.html
  95. 1 1
      raster/r.sim/r.sim.water/spearfish.sh
  96. 2 2
      raster/r.slope.aspect/testsuite/test_r_slope_aspect.py
  97. 1 1
      raster/r.stats/test_suite/profile.sh
  98. 1 1
      raster/r.stream.extract/r.stream.extract.html
  99. 2 2
      raster/r.sun/r.sun.html
  100. 0 0
      raster/r.sunmask/r.sunmask.html

+ 1 - 1
display/d.barscale/thumbnails/README

@@ -7,7 +7,7 @@ export GRASS_RENDER_IMMEDIATE=png
 export GRASS_RENDER_TRUECOLOR=TRUE
 export GRASS_RENDER_TRUECOLOR=TRUE
 export GRASS_RENDER_WIDTH=300
 export GRASS_RENDER_WIDTH=300
 export GRASS_RENDER_HEIGHT=300
 export GRASS_RENDER_HEIGHT=300
-g.region rast=elevation
+g.region raster=elevation
 
 
 for STYLE in classic line solid hollow full_checker part_checker mixed_checker tail_checker up_ticks down_ticks both_ticks arrow_ends
 for STYLE in classic line solid hollow full_checker part_checker mixed_checker tail_checker up_ticks down_ticks both_ticks arrow_ends
 do
 do

+ 1 - 1
display/d.geodesic/d.geodesic.html

@@ -30,7 +30,7 @@ A geodesic line if shown over the political map of the world
 (demolocation dataset):
 (demolocation dataset):
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region vect=country_boundaries -p
+g.region vector=country_boundaries -p
 d.mon wx0
 d.mon wx0
 d.vect country_boundaries type=area
 d.vect country_boundaries type=area
 d.geodesic coordinates=55:58W,33:18S,26:43E,60:37N \
 d.geodesic coordinates=55:58W,33:18S,26:43E,60:37N \

+ 1 - 1
display/d.his/d.his.html

@@ -106,7 +106,7 @@ command <em><a href="r.his.html">r.his</a></em>.
 <h2>EXAMPLE</h2>
 <h2>EXAMPLE</h2>
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
 r.relief input=elevation output=elevation_shaded_relief
 r.relief input=elevation output=elevation_shaded_relief
 
 
 d.mon wx0
 d.mon wx0

+ 1 - 1
display/d.path/d.path.html

@@ -24,7 +24,7 @@ map, use the <em>v.net.path</em> module.
 
 
 Interactive shortest path routing on road network (North Carolina sample dataset):
 Interactive shortest path routing on road network (North Carolina sample dataset):
 <div class="code"><pre>
 <div class="code"><pre>
-g.region vect=roadsmajor -p
+g.region vector=roadsmajor -p
 d.vect roadsmajor
 d.vect roadsmajor
 d.path roadsmajor coordinates=668646.15,224447.16,668348.83,235894.02
 d.path roadsmajor coordinates=668646.15,224447.16,668348.83,235894.02
 </pre></div>
 </pre></div>

+ 1 - 1
display/d.rhumbline/d.rhumbline.html

@@ -24,7 +24,7 @@ A geodesic line if shown over the political map of the world
 (demolocation dataset):
 (demolocation dataset):
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region vect=country_boundaries -p
+g.region vector=country_boundaries -p
 d.mon wx0
 d.mon wx0
 d.vect country_boundaries type=area
 d.vect country_boundaries type=area
 d.rhumbline coordinates=55:58W,33:18S,26:43E,60:37N \
 d.rhumbline coordinates=55:58W,33:18S,26:43E,60:37N \

+ 1 - 1
display/d.vect.chart/d.vect.chart.html

@@ -48,7 +48,7 @@ Creation of framed bar charts of an erodibiliy index from the Spearfish
 sample dataset:
 sample dataset:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=erode.index -p
+g.region raster=erode.index -p
 r.to.vect -s input=erode.index output=erode_index type=area 
 r.to.vect -s input=erode.index output=erode_index type=area 
 v.extract input=erode_index output=erode_index_ctrds type=centroid 
 v.extract input=erode_index output=erode_index_ctrds type=centroid 
 d.rast aspect
 d.rast aspect

+ 1 - 1
display/d.vect/d.vect.html

@@ -83,7 +83,7 @@ d.vect -c map=soils where="label='VBF'" display=shape attribute_column=label
 
 
 <p>3D points, 3D lines and 3D polygons colorized according to z height:
 <p>3D points, 3D lines and 3D polygons colorized according to z height:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation.10m
+g.region raster=elevation.10m
 r.random input=elevation.10m n=5000 vector=random3d -d
 r.random input=elevation.10m n=5000 vector=random3d -d
 d.mon start=x0
 d.mon start=x0
 # display as black points
 # display as black points

+ 1 - 1
general/g.list/g.list.html

@@ -161,7 +161,7 @@ g.list -e type=rast separator=comma pattern="precip_total.(199[7-9]|200[0-9]|201
 List all raster maps starting with &quot;tmp_&quot; whose region overlaps with
 List all raster maps starting with &quot;tmp_&quot; whose region overlaps with
 the region of &quot;test&quot; raster map:
 the region of &quot;test&quot; raster map:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=test save=test_region
+g.region raster=test save=test_region
 g.list type=rast pattern='tmp_*' region=test_region
 g.list type=rast pattern='tmp_*' region=test_region
 </pre></div>
 </pre></div>
 
 

+ 6 - 11
general/g.region/g.region.html

@@ -126,11 +126,6 @@ with the UNIX eval command, "<tt>eval `g.region -g`</tt>".
 <h3>Additional parameter information:</h3>
 <h3>Additional parameter information:</h3>
 
 
 <dl>
 <dl>
-<dt><b>3dview=</b><em>name</em> 
-<dd>Make current region settings same as those in the named
-3dview file, which holds the region that was current when
-the 3dview was saved.
-
 
 
 <dt><b>zoom=</b><em>name</em>
 <dt><b>zoom=</b><em>name</em>
 <dd>Shrink current region settings to the smallest region
 <dd>Shrink current region settings to the smallest region
@@ -138,7 +133,7 @@ encompassing all non-NULL data in the named raster map
 layer that fall inside the user's current region. In this
 layer that fall inside the user's current region. In this
 way you can tightly zoom in on isolated clumps within a
 way you can tightly zoom in on isolated clumps within a
 bigger map.
 bigger map.
-<p>If the user also includes the <b>rast=</b><em>name</em>
+<p>If the user also includes the <b>raster=</b><em>name</em>
 option on the command line, <b>zoom=</b><em>name</em> will
 option on the command line, <b>zoom=</b><em>name</em> will
 set the current region settings to the smallest region
 set the current region settings to the smallest region
 encompassing all non-NULL data in the named <b>zoom</b> map
 encompassing all non-NULL data in the named <b>zoom</b> map
@@ -154,7 +149,7 @@ column edge in the named map.  Alignment only moves the
 existing region edges outward to the edges of the next
 existing region edges outward to the edges of the next
 nearest cell in the named raster map - not to the named
 nearest cell in the named raster map - not to the named
 map's edges.  To perform the latter function, use the
 map's edges.  To perform the latter function, use the
-<b>rast=</b><em>name</em> option.
+<b>raster=</b><em>name</em> option.
 </dl>
 </dl>
 
 
 
 
@@ -222,7 +217,7 @@ northern and eastern boundary values.
 
 
 
 
 <dt><span class="code"><tt>
 <dt><span class="code"><tt>
-g.region rast=soils
+g.region raster=soils
 </tt></span>
 </tt></span>
 
 
 <dd> This form will make the current region settings
 <dd> This form will make the current region settings
@@ -232,7 +227,7 @@ the raster map layer <em>soils</em>.
 <p>
 <p>
 
 
 <dt><span class="code"><tt>
 <dt><span class="code"><tt>
-g.region rast=soils zoom=soils
+g.region raster=soils zoom=soils
 </tt></span>
 </tt></span>
 
 
 <dd> This form will first look up the cell header file for
 <dd> This form will first look up the cell header file for
@@ -240,7 +235,7 @@ the raster map layer <em>soils</em>, use this as the
 current region setting, and then shrink the region down to
 current region setting, and then shrink the region down to
 the smallest region which still encompasses all non-NULL
 the smallest region which still encompasses all non-NULL
 data in the map layer <em>soils</em>.  Note that if the
 data in the map layer <em>soils</em>.  Note that if the
-parameter <em>rast=soils</em> were not specified, the
+parameter <em>raster=soils</em> were not specified, the
 zoom would shrink to encompass all non-NULL data values in
 zoom would shrink to encompass all non-NULL data values in
 the soils map that were located within the <i>current region</i>
 the soils map that were located within the <i>current region</i>
 settings.
 settings.
@@ -248,7 +243,7 @@ settings.
 <p>
 <p>
 
 
 <dt><span class="code"><tt>
 <dt><span class="code"><tt>
-g.region -up rast=soils
+g.region -up raster=soils
 </tt></span>
 </tt></span>
 
 
 <dd> The <b>-u</b> option suppresses the re-setting of the
 <dd> The <b>-u</b> option suppresses the re-setting of the

+ 1 - 1
general/g.region/main.c

@@ -450,7 +450,7 @@ int main(int argc, char *argv[])
 	Rast3d_region_to_cell_head(&win, &window);
 	Rast3d_region_to_cell_head(&win, &window);
     }
     }
 
 
-    /* vect= */
+    /* vector= */
     if (parm.vect->answer) {
     if (parm.vect->answer) {
 	int first = 0;
 	int first = 0;
 
 

+ 3 - 3
gui/wxpython/gcp/manager.py

@@ -15,7 +15,7 @@ Classes:
  - manager::EditGCP
  - manager::EditGCP
  - manager::GrSettingsDialog
  - manager::GrSettingsDialog
 
 
-(C) 2006-2012 by the GRASS Development Team
+(C) 2006-2014 by the GRASS Development Team
 
 
 This program is free software under the GNU General Public License
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.
 (>=v2). Read the file COPYING that comes with GRASS for details.
@@ -673,9 +673,9 @@ class DispMapPage(TitledPage):
         try:
         try:
         # set computational region to match selected map and zoom display to region
         # set computational region to match selected map and zoom display to region
             if maptype == 'raster':
             if maptype == 'raster':
-                p = RunCommand('g.region', 'rast=src_map')
+                p = RunCommand('g.region', 'raster=src_map')
             elif maptype == 'vector':
             elif maptype == 'vector':
-                p = RunCommand('g.region', 'vect=src_map')
+                p = RunCommand('g.region', 'vector=src_map')
             
             
             if p.returncode == 0:
             if p.returncode == 0:
                 print 'returncode = ', str(p.returncode)
                 print 'returncode = ', str(p.returncode)

+ 1 - 1
gui/wxpython/mapdisp/frame.py

@@ -688,7 +688,7 @@ class MapFrame(SingleMapFrame):
             return
             return
         # set region for composite
         # set region for composite
         grass.use_temp_region()
         grass.use_temp_region()
-        returncode, messages = RunCommand('g.region', rast=tmpName + '.red',
+        returncode, messages = RunCommand('g.region', raster=tmpName + '.red',
                                           quiet=True, getErrorMsg=True)
                                           quiet=True, getErrorMsg=True)
         if not returncode == 0:
         if not returncode == 0:
             grass.del_temp_region()
             grass.del_temp_region()

+ 2 - 2
gui/wxpython/psmap/instructions.py

@@ -551,9 +551,9 @@ class MapFrame(InstructionObject):
         if self.instruction['scaleType'] == 0: #match map
         if self.instruction['scaleType'] == 0: #match map
             map = self.instruction['map']
             map = self.instruction['map']
             if self.instruction['mapType'] == 'raster':
             if self.instruction['mapType'] == 'raster':
-                comment = "# g.region rast=%s nsres=%s ewres=%s\n" % (map, region['nsres'], region['ewres'])
+                comment = "# g.region raster=%s nsres=%s ewres=%s\n" % (map, region['nsres'], region['ewres'])
             else:
             else:
-                comment = "# g.region vect=%s\n" % (map)
+                comment = "# g.region vector=%s\n" % (map)
         elif self.instruction['scaleType'] == 1:# saved region
         elif self.instruction['scaleType'] == 1:# saved region
             region = self.instruction['region']
             region = self.instruction['region']
             comment = "# g.region region=%s\n" % region
             comment = "# g.region region=%s\n" % region

+ 2 - 2
gui/wxpython/rlisetup/functions.py

@@ -84,8 +84,8 @@ def convertFeature(vect, outrast, cat, origrast, layer='1', overwrite=False):
     grass.run_command('v.extract', input=vect, cats=cat, type='area',
     grass.run_command('v.extract', input=vect, cats=cat, type='area',
                       layer=layer, output=tmp_vect, flags='d',
                       layer=layer, output=tmp_vect, flags='d',
                       overwrite=overwrite, quiet=True)
                       overwrite=overwrite, quiet=True)
-    grass.run_command('g.region', rast=origrast)
-    grass.run_command('g.region', vect=tmp_vect)
+    grass.run_command('g.region', rastor=origrast)
+    grass.run_command('g.region', vector=tmp_vect)
     grass.run_command('g.region', align=origrast)
     grass.run_command('g.region', align=origrast)
     grass.run_command('v.to.rast', input=tmp_vect, type='area',
     grass.run_command('v.to.rast', input=tmp_vect, type='area',
                       layer=layer, use='val', value=cat, output=outrast,
                       layer=layer, use='val', value=cat, output=outrast,

+ 2 - 2
gui/wxpython/rlisetup/g.gui.rlisetup.html

@@ -276,7 +276,7 @@ Select type of shape:
 <p>
 <p>
 Now an anaysis can be performed using one of the analytical modules, e.g.
 Now an anaysis can be performed using one of the analytical modules, e.g.
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=forests -p
+g.region raster=forests -p
 r.li.patchdensity input=forests conf=movwindow7 output=forests_p_dens7
 r.li.patchdensity input=forests conf=movwindow7 output=forests_p_dens7
 r.univar forests_p_dens7
 r.univar forests_p_dens7
 </pre></div>
 </pre></div>
@@ -314,7 +314,7 @@ Click on "New", then:
 <p>
 <p>
 Now an anaysis can be performed using one of the analytical modules, e.g.
 Now an anaysis can be performed using one of the analytical modules, e.g.
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=lsat7_2002_40 -p
+g.region raster=lsat7_2002_40 -p
 r.li.shannon input=lsat7_2000_40 conf=whole_region output=lsat7_2000_40_shannon
 r.li.shannon input=lsat7_2000_40 conf=whole_region output=lsat7_2000_40_shannon
 </pre></div>
 </pre></div>
 
 

+ 1 - 1
gui/wxpython/rlisetup/sampling_frame.py

@@ -258,7 +258,7 @@ class RLiSetupMapPanel(wx.Panel):
                    value=1, use='val')
                    value=1, use='val')
         wx.EndBusyCursor()
         wx.EndBusyCursor()
         grass.use_temp_region()
         grass.use_temp_region()
-        grass.run_command('g.region', vect=tmpvector)
+        grass.run_command('g.region', vector=tmpvector)
         region = grass.region()
         region = grass.region()
 
 
         marea = MaskedArea(region, rasterName)
         marea = MaskedArea(region, rasterName)

+ 3 - 3
gui/wxpython/rlisetup/wizard.py

@@ -144,7 +144,7 @@ class RLIWizard(object):
         grass.use_temp_region()
         grass.use_temp_region()
         # Temporarily aligning region resolution to $RASTER resolution
         # Temporarily aligning region resolution to $RASTER resolution
         # keep boundary settings
         # keep boundary settings
-        grass.run_command('g.region', rast=self.startpage.rast)
+        grass.run_command('g.region', raster=self.startpage.rast)
         self.gregion = grass.region()
         self.gregion = grass.region()
         self.SF_NSRES = self.gregion['nsres']
         self.SF_NSRES = self.gregion['nsres']
         self.SF_EWRES = self.gregion['ewres']
         self.SF_EWRES = self.gregion['ewres']
@@ -240,7 +240,7 @@ class RLIWizard(object):
                           coordinate=[xcenter, ycenter], quiet=True)
                           coordinate=[xcenter, ycenter], quiet=True)
         grass.del_temp_region()
         grass.del_temp_region()
         grass.use_temp_region()
         grass.use_temp_region()
-        grass.run_command('g.region', rast=self.startpage.rast)
+        grass.run_command('g.region', raster=self.startpage.rast)
 
 
     def getSamplingType(self):
     def getSamplingType(self):
         """Obtain the sampling type"""
         """Obtain the sampling type"""
@@ -353,7 +353,7 @@ class RLIWizard(object):
                                                     SamplingType.MUNITSC]:
                                                     SamplingType.MUNITSC]:
             # get the raster region into rastregion
             # get the raster region into rastregion
             grass.use_temp_region()
             grass.use_temp_region()
-            grass.run_command('g.region', rast=self.startpage.rast)
+            grass.run_command('g.region', raster=self.startpage.rast)
             rastregion = grass.region()
             rastregion = grass.region()
             s_n = rastregion['n']
             s_n = rastregion['n']
             s_w = rastregion['w']
             s_w = rastregion['w']

+ 1 - 1
imagery/i.atcorr/i.atcorr.html

@@ -615,7 +615,7 @@ micrometer.</td>
 The example is based on the North Carolina sample dataset (GMT -5 hours).
 The example is based on the North Carolina sample dataset (GMT -5 hours).
 First we set the computational region to the satellite map, e.g. channel 4:
 First we set the computational region to the satellite map, e.g. channel 4:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=lsat7_2002_40 -p
+g.region raster=lsat7_2002_40 -p
 </pre></div>
 </pre></div>
 
 
 It is important to verify the available metadata for the sun position which
 It is important to verify the available metadata for the sun position which

+ 1 - 1
imagery/i.atcorr/test_suite/README.txt

@@ -11,7 +11,7 @@ ETM4_400x400_atms_corr.raw = Image output file (expected output)
 # import raw Landsat channel 4:
 # import raw Landsat channel 4:
 r.in.gdal ETM4_400x400.raw out=ETM4_400x400.raw -o
 r.in.gdal ETM4_400x400.raw out=ETM4_400x400.raw -o
 # set region to this map
 # set region to this map
-g.region rast=ETM4_400x400.raw
+g.region raster=ETM4_400x400.raw
 
 
 # create synthetic DEM, close to sea level
 # create synthetic DEM, close to sea level
 r.mapcalc "atcorr_dem = 10.0"
 r.mapcalc "atcorr_dem = 10.0"

+ 1 - 1
imagery/i.cluster/i.cluster.html

@@ -219,7 +219,7 @@ Preparing the statistics for unsupervised classification of
 a LANDSAT subscene in North Carolina:
 a LANDSAT subscene in North Carolina:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 
 
 # store VIZ, NIR, MIR into group/subgroup
 # store VIZ, NIR, MIR into group/subgroup
 i.group group=lsat7_2002 subgroup=lsat7_2002 \
 i.group group=lsat7_2002 subgroup=lsat7_2002 \

+ 2 - 2
imagery/i.fft/i.fft.html

@@ -26,11 +26,11 @@ resulting fast Fourier transform invalid.
 North Carolina example:
 North Carolina example:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=lsat7_2002_70
+g.region raster=lsat7_2002_70
 i.fft input=lsat7_2002_70 real=lsat7_2002_70.real imaginary=lsat7_2002_70.imag
 i.fft input=lsat7_2002_70 real=lsat7_2002_70.real imaginary=lsat7_2002_70.imag
 
 
 # set region to resulting FFT output map (due to new FFT coordinate space):
 # set region to resulting FFT output map (due to new FFT coordinate space):
-g.region rast=lsat7_2002_70.real -p
+g.region raster=lsat7_2002_70.real -p
 d.mon x0
 d.mon x0
 d.rast lsat7_2002_70.real
 d.rast lsat7_2002_70.real
 d.rast lsat7_2002_70.imag
 d.rast lsat7_2002_70.imag

+ 1 - 1
imagery/i.pca/i.pca.html

@@ -53,7 +53,7 @@ history files. View with <em>r.info</em>.
 Using Landsat imagery in the North Carolina sample dataset:
 Using Landsat imagery in the North Carolina sample dataset:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 i.pca in=lsat7_2002_10,lsat7_2002_20,lsat7_2002_30,lsat7_2002_40,lsat7_2002_50,lsat7_2002_70 \
 i.pca in=lsat7_2002_10,lsat7_2002_20,lsat7_2002_30,lsat7_2002_40,lsat7_2002_50,lsat7_2002_70 \
     out=lsat7_2002_pca
     out=lsat7_2002_pca
 
 

+ 2 - 2
imagery/i.segment/i.segment.html

@@ -122,7 +122,7 @@ i.group group=ortho_group input=ortho_2001_t792_1m@PERMANENT
 input ortho photograph).
 input ortho photograph).
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region -p rast=ortho_2001_t792_1m n=220446 s=220075 e=639151 w=638592
+g.region -p raster=ortho_2001_t792_1m n=220446 s=220075 e=639151 w=638592
 </pre></div>
 </pre></div>
 
 
 Try out a low threshold and check the results.
 Try out a low threshold and check the results.
@@ -162,7 +162,7 @@ they are less similar than required by our threshold):
 
 
 <p>Set the region to match the entire map(s) in the group.
 <p>Set the region to match the entire map(s) in the group.
 <div class="code"><pre>
 <div class="code"><pre>
-g.region -p rast=ortho_2001_t792_1m@PERMANENT
+g.region -p raster=ortho_2001_t792_1m@PERMANENT
 </pre></div>
 </pre></div>
 
 
 <p>
 <p>

+ 1 - 1
imagery/i.smap/i.smap.html

@@ -147,7 +147,7 @@ r.mapcalc "MASKed_map = classification_results"
 Supervised classification of LANDSAT
 Supervised classification of LANDSAT
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 
 
 # store VIZ, NIR, MIR into group/subgroup
 # store VIZ, NIR, MIR into group/subgroup
 i.group group=my_lsat7_2002 subgroup=my_lsat7_2002 \
 i.group group=my_lsat7_2002 subgroup=my_lsat7_2002 \

+ 1 - 1
imagery/i.vi/i.vi.html

@@ -253,7 +253,7 @@ dataset.
 
 
 <!-- todo: check if i.landsat.toar use is needed for NC data -->
 <!-- todo: check if i.landsat.toar use is needed for NC data -->
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=lsat5_1987_30 -p
+g.region raster=lsat5_1987_30 -p
 i.vi red=lsat5_1987_30 viname=ndvi output=lsat5_1987.ndvi nir=lsat5_1987_40
 i.vi red=lsat5_1987_30 viname=ndvi output=lsat5_1987.ndvi nir=lsat5_1987_40
 r.colors lsat5_1987.ndvi color=ndvi
 r.colors lsat5_1987.ndvi color=ndvi
 </pre></div>
 </pre></div>

+ 3 - 3
lib/cairodriver/cairodriver.html

@@ -95,7 +95,7 @@ export GRASS_RENDER_WIDTH=800
 export GRASS_RENDER_HEIGHT=800
 export GRASS_RENDER_HEIGHT=800
 export GRASS_RENDER_FILE_READ=TRUE
 export GRASS_RENDER_FILE_READ=TRUE
 
 
-g.region rast=elevation
+g.region raster=elevation
 d.rast map=elevation
 d.rast map=elevation
 d.vect map=streams width=1 color=blue fcolor=aqua type=area,line
 d.vect map=streams width=1 color=blue fcolor=aqua type=area,line
 d.vect map=roadsmajor width=2
 d.vect map=roadsmajor width=2
@@ -111,7 +111,7 @@ export GRASS_RENDER_FILE=nc_spm.pdf
 export GRASS_RENDER_WIDTH=800
 export GRASS_RENDER_WIDTH=800
 export GRASS_RENDER_HEIGHT=800
 export GRASS_RENDER_HEIGHT=800
 
 
-g.region vect=roadsmajor
+g.region vector=roadsmajor
 # activate vector font
 # activate vector font
 d.font Vera
 d.font Vera
 d.vect map=roadsmajor layer=1 display=shape attrcolumn=ROAD_NAME lcolor=0:90:255
 d.vect map=roadsmajor layer=1 display=shape attrcolumn=ROAD_NAME lcolor=0:90:255
@@ -126,7 +126,7 @@ export GRASS_RENDER_FILE=nc_spm.pdf
 export GRASS_RENDER_WIDTH=800
 export GRASS_RENDER_WIDTH=800
 export GRASS_RENDER_HEIGHT=800
 export GRASS_RENDER_HEIGHT=800
 
 
-g.region rast=elevation
+g.region raster=elevation
 d.rast map=elevation
 d.rast map=elevation
 </pre></div>
 </pre></div>
 
 

+ 1 - 1
lib/pngdriver/pngdriver.html

@@ -67,7 +67,7 @@ Several environment variables affect the operation of the PNG driver:
 export GRASS_RENDER_IMMEDIATE=png
 export GRASS_RENDER_IMMEDIATE=png
 export GRASS_RENDER_TRUECOLOR=TRUE
 export GRASS_RENDER_TRUECOLOR=TRUE
 
 
-g.region rast=elevation
+g.region raster=elevation
 d.rast elevation
 d.rast elevation
 d.vect roadsmajor color=red
 d.vect roadsmajor color=red
 </pre></div>
 </pre></div>

+ 1 - 1
lib/psdriver/psdriver.html

@@ -57,7 +57,7 @@ Several environment variables affect the operation of the PS driver:
 export GRASS_RENDER_IMMEDIATE=ps
 export GRASS_RENDER_IMMEDIATE=ps
 export GRASS_RENDER_TRUECOLOR=TRUE
 export GRASS_RENDER_TRUECOLOR=TRUE
 
 
-g.region rast=elevation
+g.region raster=elevation
 d.rast elevation
 d.rast elevation
 d.vect roadsmajor color=red
 d.vect roadsmajor color=red
 </pre></div>
 </pre></div>

+ 1 - 1
lib/python/docs/src/gunittest_testing.rst

@@ -55,7 +55,7 @@ it must be placed into a directory named ``testsuite``.
             # to not override mapset's region (which might be used by other tests)
             # to not override mapset's region (which might be used by other tests)
             cls.use_temp_region()
             cls.use_temp_region()
             # cls.runModule or self.runModule is used for general module calls
             # cls.runModule or self.runModule is used for general module calls
-            cls.runModule('g.region', rast='elevation')
+            cls.runModule('g.region', raster='elevation')
             # note that the region set by default for NC location is the same as
             # note that the region set by default for NC location is the same as
             # the elevation raster map, this is an example shows what to do
             # the elevation raster map, this is an example shows what to do
             # in the general case
             # in the general case

+ 2 - 2
lib/python/gunittest/testsuite/test_assertions.py

@@ -81,7 +81,7 @@ class TestAssertModuleKeyValue(grass.gunittest.TestCase):
     @classmethod
     @classmethod
     def setUpClass(cls):
     def setUpClass(cls):
         cls.use_temp_region()
         cls.use_temp_region()
-        cls.runModule(SimpleModule('g.region', rast='elevation'))
+        cls.runModule(SimpleModule('g.region', raster='elevation'))
 
 
     @classmethod
     @classmethod
     def tearDownClass(cls):
     def tearDownClass(cls):
@@ -123,7 +123,7 @@ class TestRasterMapAssertions(grass.gunittest.TestCase):
     def setUpClass(cls):
     def setUpClass(cls):
         cls.use_temp_region()
         cls.use_temp_region()
         # TODO: here we should actually not call self.runModule but call_module
         # TODO: here we should actually not call self.runModule but call_module
-        cls.runModule(SimpleModule('g.region', rast='elevation'))
+        cls.runModule(SimpleModule('g.region', raster='elevation'))
 
 
     @classmethod
     @classmethod
     def tearDownClass(cls):
     def tearDownClass(cls):

+ 1 - 1
lib/python/pygrass/modules/grid/grid.py

@@ -353,7 +353,7 @@ def cmd_exe(args):
             inputs[key] = mapnames[key]
             inputs[key] = mapnames[key]
         cmd['inputs'] = inputs.items()
         cmd['inputs'] = inputs.items()
         # set the region to the tile
         # set the region to the tile
-        sub.Popen(['g,region', 'rast=%s' % key], env=env).wait()
+        sub.Popen(['g,region', 'raster=%s' % key], env=env).wait()
     else:
     else:
         # set the computational region
         # set the computational region
         lcmd = ['g.region', ]
         lcmd = ['g.region', ]

+ 6 - 6
lib/python/script/testsuite/test_start_command_functions.py

@@ -15,27 +15,27 @@ class TestPythonKeywordsInParameters(grass.gunittest.TestCase):
 
 
     def test_prefixed_underscore(self):
     def test_prefixed_underscore(self):
         proc = start_command(
         proc = start_command(
-            'g.region', _rast=self.raster, stderr=PIPE)
+            'g.region', _raster=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         stderr = proc.communicate()[1]
-        self.assertNotIn('_rast', stderr)
+        self.assertNotIn('_raster', stderr)
         self.assertIn(self.raster, stderr,
         self.assertIn(self.raster, stderr,
             msg="Raster map name should appear in the error output")
             msg="Raster map name should appear in the error output")
 
 
     def test_suffixed_underscore(self):
     def test_suffixed_underscore(self):
         proc = start_command(
         proc = start_command(
-            'g.region', rast_=self.raster, stderr=PIPE)
+            'g.region', raster_=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         stderr = proc.communicate()[1]
-        self.assertNotIn('rast_', stderr)
+        self.assertNotIn('raster_', stderr)
         self.assertIn(self.raster, stderr,
         self.assertIn(self.raster, stderr,
             msg="Raster map name should appear in the error output")
             msg="Raster map name should appear in the error output")
 
 
     def test_multiple_underscores(self):
     def test_multiple_underscores(self):
         proc = start_command(
         proc = start_command(
-            'g.region', _rast_=self.raster, stderr=PIPE)
+            'g.region', _raster_=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         stderr = proc.communicate()[1]
         returncode = proc.poll()
         returncode = proc.poll()
         self.assertEquals(returncode, 1)
         self.assertEquals(returncode, 1)
-        self.assertIn('rast', stderr)
+        self.assertIn('raster', stderr)
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     grass.gunittest.test()
     grass.gunittest.test()

+ 9 - 9
lib/python/script/testsuite/test_start_command_functions_nc.py

@@ -24,30 +24,30 @@ class TestPythonKeywordsInParameters(grass.gunittest.TestCase):
 
 
     def test_prefixed_underscore(self):
     def test_prefixed_underscore(self):
         proc = start_command(
         proc = start_command(
-            'g.region', _rast=self.raster, stderr=PIPE)
+            'g.region', _raster=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         stderr = proc.communicate()[1]
         returncode = proc.poll()
         returncode = proc.poll()
         self.assertEquals(returncode, 0,
         self.assertEquals(returncode, 0,
-            msg="Undersocre as prefix was not accepted")
-        self.assertNotIn('_rast', stderr)
+            msg="Underscore as prefix was not accepted")
+        self.assertNotIn('_raster', stderr)
 
 
     def test_suffixed_underscore(self):
     def test_suffixed_underscore(self):
         proc = start_command(
         proc = start_command(
-            'g.region', rast_=self.raster, stderr=PIPE)
+            'g.region', raster_=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         stderr = proc.communicate()[1]
         returncode = proc.poll()
         returncode = proc.poll()
         self.assertEquals(returncode, 0,
         self.assertEquals(returncode, 0,
-            msg="Undersocre as suffix was not accepted, stderr is:\n%s" % stderr)
-        self.assertNotIn('rast_', stderr)
+            msg="Underscore as suffix was not accepted, stderr is:\n%s" % stderr)
+        self.assertNotIn('raster_', stderr)
 
 
     def test_multiple_underscores(self):
     def test_multiple_underscores(self):
         proc = start_command(
         proc = start_command(
-            'g.region', _rast_=self.raster, stderr=PIPE)
+            'g.region', _raster_=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         stderr = proc.communicate()[1]
         returncode = proc.poll()
         returncode = proc.poll()
         self.assertEquals(returncode, 1,
         self.assertEquals(returncode, 1,
-            msg="Undersocre at both sides was accepted")
-        self.assertIn('rast', stderr)
+            msg="Underscore at both sides was accepted")
+        self.assertIn('raster', stderr)
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     grass.gunittest.test()
     grass.gunittest.test()

+ 2 - 2
lib/python/temporal/stds_import.py

@@ -97,7 +97,7 @@ def _import_raster_maps_from_gdal(maplist, overr, exp, location, link, format_,
 
 
     # Set the computational region from the last map imported
     # Set the computational region from the last map imported
     if set_current_region is True:
     if set_current_region is True:
-        gscript.run_command("g.region", rast=name)
+        gscript.run_command("g.region", raster=name)
 
 
 ############################################################################
 ############################################################################
 
 
@@ -121,7 +121,7 @@ def _import_raster_maps(maplist, set_current_region=False):
 
 
     # Set the computational region from the last map imported
     # Set the computational region from the last map imported
     if set_current_region is True:
     if set_current_region is True:
-        gscript.run_command("g.region", rast=name)
+        gscript.run_command("g.region", raster=name)
 
 
 ############################################################################
 ############################################################################
 
 

+ 1 - 1
misc/m.nviz.image/m.nviz.image.html

@@ -11,7 +11,7 @@ of <em>volume</em> data (3D raster data) from the command line.
 Render elevation map in a 3D space.
 Render elevation map in a 3D space.
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
 m.nviz.image elevation_map=elevation output=elev perspective=15
 m.nviz.image elevation_map=elevation output=elev perspective=15
 </pre></div>
 </pre></div>
 
 

+ 1 - 1
misc/m.nviz.script/m.nviz.script.html

@@ -85,7 +85,7 @@ To interactively create an NVIZ animation from raster elev.rast with
 the scene, run the following:
 the scene, run the following:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation.dem
+g.region raster=elevation.dem
 d.rast elevation.dem
 d.rast elevation.dem
 m.nviz.script -ik input=elevation.dem output=nviz.script dist=2400 ht=1220 frames=1000
 m.nviz.script -ik input=elevation.dem output=nviz.script dist=2400 ht=1220 frames=1000
 </pre></div>
 </pre></div>

+ 1 - 1
ps/ps.map/ps.map.html

@@ -1576,7 +1576,7 @@ This script file can be entered at the command line:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
  # First set the region
  # First set the region
- g.region rast=soils
+ g.region raster=soils
 
 
  # Generate comment file (or use text editor)
  # Generate comment file (or use text editor)
  echo "Spearfish (SD) soils" &gt; soil.cmt
  echo "Spearfish (SD) soils" &gt; soil.cmt

+ 1 - 1
raster/r.carve/r.carve.html

@@ -21,7 +21,7 @@ depressions are in flat areas and not in the streams.
 North Carolina sample dataset:
 North Carolina sample dataset:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.carve rast=elevation vect=streams out=carve_dem width=20 depth=5
 r.carve rast=elevation vect=streams out=carve_dem width=20 depth=5
 </pre></div>
 </pre></div>
 
 

+ 1 - 1
raster/r.clump/r.clump.html

@@ -38,7 +38,7 @@ Perform clumping on "lakes" map (North Carolina sample dataset) and
 report area sizes for each lake individually rather by waterbody type:
 report area sizes for each lake individually rather by waterbody type:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=lakes -p
+g.region raster=lakes -p
 
 
 # report sizes by waterbody type
 # report sizes by waterbody type
 r.report lakes units=h
 r.report lakes units=h

+ 1 - 1
raster/r.contour/r.contour.html

@@ -40,7 +40,7 @@ r.contour input=elevation.dem output=elevation_dem_contours minlevel=1000 maxlev
 North Carolina example:
 North Carolina example:
 <p>
 <p>
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elev_lid792_1m -p
+g.region raster=elev_lid792_1m -p
 r.contour input=elev_lid792_1m output=elev_lid792_1m_contours minlevel=100 maxlevel=150 step=10
 r.contour input=elev_lid792_1m output=elev_lid792_1m_contours minlevel=100 maxlevel=150 step=10
 </pre></div>
 </pre></div>
 
 

+ 1 - 1
raster/r.cost/r.cost.html

@@ -217,7 +217,7 @@ used. The calculation is done with <em>r.cost</em> as follows
 (example for Spearfish region):
 (example for Spearfish region):
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-  g.region rast=roads -p
+  g.region raster=roads -p
   r.mapcalc "area.one = 1"
   r.mapcalc "area.one = 1"
   r.cost -k input=area.one output=distance start_rast=roads
   r.cost -k input=area.one output=distance start_rast=roads
   d.rast distance
   d.rast distance

+ 1 - 1
raster/r.cost/test_suite/profile.sh

@@ -1,5 +1,5 @@
 # NC dataset
 # NC dataset
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.mapcalc 'one = 1'
 r.mapcalc 'one = 1'
 CMD="r.cost -k in=one start_points=school_copy output=cost.test --o"
 CMD="r.cost -k in=one start_points=school_copy output=cost.test --o"
 
 

+ 1 - 1
raster/r.drain/tests/test.r.drain.sh

@@ -5,7 +5,7 @@
 export GRASS_OVERWRITE=1
 export GRASS_OVERWRITE=1
 
 
 r.in.ascii testascii_nc.asc out=testascii
 r.in.ascii testascii_nc.asc out=testascii
-g.region rast=testascii -p
+g.region raster=testascii -p
 
 
 d.mon wx0
 d.mon wx0
 sleep 2
 sleep 2

+ 1 - 1
raster/r.external/r.external.html

@@ -29,7 +29,7 @@ changed to NULL (if() condition).
 <div class="code"><pre>
 <div class="code"><pre>
 # import of all channels (each channel will become a GRASS raster map):
 # import of all channels (each channel will become a GRASS raster map):
 r.external  /home/user/data/maps/059100.tif out=ortho
 r.external  /home/user/data/maps/059100.tif out=ortho
-g.region rast=ortho.3 -p
+g.region raster=ortho.3 -p
 d.rgb r=ortho.1 g=ortho.2 b=ortho.3
 d.rgb r=ortho.1 g=ortho.2 b=ortho.3
 r.composite r=ortho.1 g=ortho.2 b=ortho.3 output=ortho.rgb
 r.composite r=ortho.1 g=ortho.2 b=ortho.3 output=ortho.rgb
 </pre></div>
 </pre></div>

+ 2 - 2
raster/r.grow.distance/r.grow.distance.html

@@ -64,7 +64,7 @@ distances in meters instead of map units.
 
 
 A) Distance from the streams network (North Carolina sample dataset):
 A) Distance from the streams network (North Carolina sample dataset):
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=streams_derived -p
+g.region raster=streams_derived -p
 r.grow.distance input=streams_derived distance=dist_from_streams
 r.grow.distance input=streams_derived distance=dist_from_streams
 </pre></div>
 </pre></div>
 
 
@@ -76,7 +76,7 @@ r.grow.distance input=streams_derived distance=dist_from_streams
 <p>
 <p>
 B) Distance from sea in meters in latitude-longitude location:
 B) Distance from sea in meters in latitude-longitude location:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=sea -p
+g.region raster=sea -p
 r.grow.distance -m input=sea distance=dist_from_sea_geodetic metric=geodesic
 r.grow.distance -m input=sea distance=dist_from_sea_geodetic metric=geodesic
 </pre></div>
 </pre></div>
 
 

+ 1 - 1
raster/r.his/r.his.html

@@ -92,7 +92,7 @@ Recreate the following example for <em>d.his</em> using <em>r.his</em>.
 First, create shaded relief and show it.
 First, create shaded relief and show it.
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
 r.relief input=elevation output=elevation_shaded_relief
 r.relief input=elevation output=elevation_shaded_relief
 
 
 d.mon wx0
 d.mon wx0

+ 1 - 1
raster/r.horizon/r.horizon.html

@@ -142,7 +142,7 @@ The examples are intended for the North Carolina sample dataset.
 of horizon angles CCW from East):
 of horizon angles CCW from East):
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.horizon elevation=elevation direction=215 step=0 bufferzone=200 \
 r.horizon elevation=elevation direction=215 step=0 bufferzone=200 \
     coordinates=638871.6,223384.4 maxdistance=5000
     coordinates=638871.6,223384.4 maxdistance=5000
 </pre></div>
 </pre></div>

+ 1 - 1
raster/r.in.lidar/r.in.lidar.html

@@ -207,7 +207,7 @@ Import of a LAS file into an existing location/mapset (metric):
 <div class="code"><pre>
 <div class="code"><pre>
 # set the computational region automatically, resol. for binning is 5m
 # set the computational region automatically, resol. for binning is 5m
 r.in.lidar -e -o input=points.las resolution=5 output=lidar_dem_mean
 r.in.lidar -e -o input=points.las resolution=5 output=lidar_dem_mean
-g.region rast=lidar_dem_mean -p
+g.region raster=lidar_dem_mean -p
 r.univar lidar_dem_mean
 r.univar lidar_dem_mean
 </pre></div>
 </pre></div>
 
 

+ 1 - 1
raster/r.in.poly/testsuite/test_rinpoly.py

@@ -31,7 +31,7 @@ class TestRInPoly(grass.gunittest.TestCase):
     @classmethod
     @classmethod
     def setUpClass(cls):
     def setUpClass(cls):
         cls.use_temp_region()
         cls.use_temp_region()
-        cls.runModule('g.region', rast='elevation')
+        cls.runModule('g.region', raster='elevation')
 
 
     @classmethod
     @classmethod
     def tearDownClass(cls):
     def tearDownClass(cls):

+ 1 - 1
raster/r.kappa/r.kappa.html

@@ -51,7 +51,7 @@ information for each and every category.
 Example for North Carolina sample dataset:
 Example for North Carolina sample dataset:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.kappa -w classification=landuse96_28m reference=landclass96
 r.kappa -w classification=landuse96_28m reference=landclass96
 </pre></div>
 </pre></div>
 <p>
 <p>

+ 1 - 1
raster/r.lake/r.lake.html

@@ -86,7 +86,7 @@ during single run.
 Example of small flooding along a street (North Carolina sample dataset):
 Example of small flooding along a street (North Carolina sample dataset):
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elev_lid792_1m -p
+g.region raster=elev_lid792_1m -p
 
 
 # water accumulation next to street dam
 # water accumulation next to street dam
 r.lake elev_lid792_1m coordinates=638759.3,220264.1 water_level=113.4 lake=flooding
 r.lake elev_lid792_1m coordinates=638759.3,220264.1 water_level=113.4 lake=flooding

+ 1 - 1
raster/r.latlong/r.latlong.html

@@ -14,7 +14,7 @@ Datum transform is not implemented, the same datum is taken as output.
 <h2>EXAMPLE</h2>
 <h2>EXAMPLE</h2>
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.latlong input=elevation output=latitude
 r.latlong input=elevation output=latitude
 </pre></div>
 </pre></div>
 
 

+ 2 - 2
raster/r.li/TODO

@@ -15,7 +15,7 @@ GRASS 7:
 # TODO: change the examples to North Carolina wherever possible:
 # TODO: change the examples to North Carolina wherever possible:
 
 
 # Spearfish tests
 # Spearfish tests
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 d.mon wx0
 d.mon wx0
 d.rast forests
 d.rast forests
@@ -61,7 +61,7 @@ sh ./r.li.testing_nc_asc.sh
 echo "SAMPLINGFRAME 0|0|1|1
 echo "SAMPLINGFRAME 0|0|1|1
 SAMPLEAREA 0.0|0.0|1.0|1.0" > $HOME/.grass7/r.li/landsat_test
 SAMPLEAREA 0.0|0.0|1.0|1.0" > $HOME/.grass7/r.li/landsat_test
 
 
-g.region rast=lsat7_2002_40 -p
+g.region raster=lsat7_2002_40 -p
 r.li.shannon input=lsat7_2002_40 conf=landsat_test output=landsat_shannon
 r.li.shannon input=lsat7_2002_40 conf=landsat_test output=landsat_shannon
 --> Result written to ASCII file <$HOME/.grass7/r.li/output/landsat_shannon>
 --> Result written to ASCII file <$HOME/.grass7/r.li/output/landsat_shannon>
 
 

+ 1 - 1
raster/r.li/r.li.daemon/daemon.c

@@ -413,7 +413,7 @@ int parseSetup(char *path, struct list *l, struct g_area *g, char *raster)
 	char maskname[GNAME_MAX] = {'\0'};
 	char maskname[GNAME_MAX] = {'\0'};
 	msg m;
 	msg m;
 
 
-	/* Get the window setting. g.region rast=<input raster> */
+	/* Get the window setting. g.region raster=<input raster> */
 	/*   ? same as cellhd above ? */
 	/*   ? same as cellhd above ? */
 	/* no. the current window might be different */
 	/* no. the current window might be different */
 
 

+ 2 - 2
raster/r.li/r.li.dominance/r.li.dominance.html

@@ -35,7 +35,7 @@ r.li.dominance input=my_map conf=my_conf output=my_out
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.dominance input=forests conf=movwindow7 out=forests_dominance_mov7
 r.li.dominance input=forests conf=movwindow7 out=forests_dominance_mov7
 r.univar forests_dominance_mov7
 r.univar forests_dominance_mov7
@@ -44,7 +44,7 @@ r.univar forests_dominance_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.dominance input=forests conf=movwindow7 out=forests_dominance_mov7
 r.li.dominance input=forests conf=movwindow7 out=forests_dominance_mov7
 
 

+ 2 - 2
raster/r.li/r.li.edgedensity/r.li.edgedensity.html

@@ -56,7 +56,7 @@ r.li.edgedensity input=my_map conf=my_conf output=my_out patch_type=34
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.edgedensity input=forests conf=movwindow7 out=forests_edgedens_mov7
 r.li.edgedensity input=forests conf=movwindow7 out=forests_edgedens_mov7
 r.univar forests_edgedens_mov7
 r.univar forests_edgedens_mov7
@@ -65,7 +65,7 @@ r.univar forests_edgedens_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.edgedensity input=forests conf=movwindow7 out=forests_edgedensity_mov7
 r.li.edgedensity input=forests conf=movwindow7 out=forests_edgedensity_mov7
 
 

+ 1 - 1
raster/r.li/r.li.html

@@ -81,7 +81,7 @@ in the Spearfish sample dataset, using a 5x5 moving window:
   <ol>
   <ol>
   <li> set the region settings to the "<tt>geology</tt>" raster map:
   <li> set the region settings to the "<tt>geology</tt>" raster map:
 <div class="code"><pre>
 <div class="code"><pre>
-  g.region rast=geology -p
+  g.region raster=geology -p
 </pre></div>
 </pre></div>
 
 
   <li> run <em>r.li.patchdensity</em>:
   <li> run <em>r.li.patchdensity</em>:

+ 2 - 2
raster/r.li/r.li.mpa/r.li.mpa.html

@@ -43,7 +43,7 @@ r.li.mpa input=my_map conf=my_conf output=my_out
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.mpa input=forests conf=movwindow7 out=forests_mpa_mov7
 r.li.mpa input=forests conf=movwindow7 out=forests_mpa_mov7
 r.univar forests_mpa_mov7
 r.univar forests_mpa_mov7
@@ -52,7 +52,7 @@ r.univar forests_mpa_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.mpa input=forests conf=movwindow7 out=forests_mpa_mov7
 r.li.mpa input=forests conf=movwindow7 out=forests_mpa_mov7
 
 

+ 2 - 2
raster/r.li/r.li.mps/r.li.mps.html

@@ -45,7 +45,7 @@ r.li.mps input=my_map conf=my_conf output=my_out
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.mps input=forests conf=movwindow7 out=forests_mps_mov7
 r.li.mps input=forests conf=movwindow7 out=forests_mps_mov7
 r.univar forests_mps_mov7
 r.univar forests_mps_mov7
@@ -54,7 +54,7 @@ r.univar forests_mps_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.mps input=forests conf=movwindow7 out=forests_mps_mov7
 r.li.mps input=forests conf=movwindow7 out=forests_mps_mov7
 
 

+ 2 - 2
raster/r.li/r.li.padcv/r.li.padcv.html

@@ -35,7 +35,7 @@ r.li.padcv input=my_map conf=my_conf output=my_out
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.padcv input=forests conf=movwindow7 out=forests_padcv_mov7
 r.li.padcv input=forests conf=movwindow7 out=forests_padcv_mov7
 r.univar forests_padcv_mov7
 r.univar forests_padcv_mov7
@@ -44,7 +44,7 @@ r.univar forests_padcv_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.padcv input=forests conf=movwindow7 out=forests_padcv_mov7
 r.li.padcv input=forests conf=movwindow7 out=forests_padcv_mov7
 
 

+ 2 - 2
raster/r.li/r.li.padrange/r.li.padrange.html

@@ -37,7 +37,7 @@ r.li.padrange input=my_map conf=my_conf output=my_out
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.padrange input=forests conf=movwindow7 out=forests_padrange_mov7
 r.li.padrange input=forests conf=movwindow7 out=forests_padrange_mov7
 r.univar forests_padrange_mov7
 r.univar forests_padrange_mov7
@@ -46,7 +46,7 @@ r.univar forests_padrange_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.padrange input=forests conf=movwindow7 out=forests_padrange_mov7
 r.li.padrange input=forests conf=movwindow7 out=forests_padrange_mov7
 
 

+ 2 - 2
raster/r.li/r.li.padsd/r.li.padsd.html

@@ -37,7 +37,7 @@ r.li.padsd input=my_map conf=my_conf output=my_out
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.padsd input=forests conf=movwindow7 out=forests_padsd_mov7
 r.li.padsd input=forests conf=movwindow7 out=forests_padsd_mov7
 r.univar forests_padsd_mov7
 r.univar forests_padsd_mov7
@@ -46,7 +46,7 @@ r.univar forests_padsd_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.padsd input=forests conf=movwindow7 out=forests_padsd_mov7
 r.li.padsd input=forests conf=movwindow7 out=forests_padsd_mov7
 
 

+ 2 - 2
raster/r.li/r.li.patchdensity/r.li.patchdensity.html

@@ -40,7 +40,7 @@ r.li.patchdensity input=my_map conf=my_conf output=my_out
 <p>
 <p>
 Example for Spearfish forest areas:
 Example for Spearfish forest areas:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 # extract forested areas:
 # extract forested areas:
 r.category landcover.30m
 r.category landcover.30m
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43, 1, null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43, 1, null())"
@@ -57,7 +57,7 @@ d.vect forests type=boundary
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.patchdensity input=forests conf=movwindow7 out=forests_patchdensity_mov7
 r.li.patchdensity input=forests conf=movwindow7 out=forests_patchdensity_mov7
 
 

+ 2 - 2
raster/r.li/r.li.patchnum/r.li.patchnum.html

@@ -31,7 +31,7 @@ r.li.patchnum input=my_map conf=my_conf out=my_out
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.patchnum input=forests conf=movwindow7 out=forests_patchnum_mov7
 r.li.patchnum input=forests conf=movwindow7 out=forests_patchnum_mov7
 r.univar forests_patchnum_mov7
 r.univar forests_patchnum_mov7
@@ -40,7 +40,7 @@ r.univar forests_patchnum_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.patchnum input=forests conf=movwindow7 out=forests_patchnum_mov7
 r.li.patchnum input=forests conf=movwindow7 out=forests_patchnum_mov7
 
 

+ 2 - 2
raster/r.li/r.li.pielou/r.li.pielou.html

@@ -34,7 +34,7 @@ r.li.pielou input=my_map conf=my_conf output=my_out
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.pielou input=forests conf=movwindow7 out=forests_pielou_mov7
 r.li.pielou input=forests conf=movwindow7 out=forests_pielou_mov7
 r.univar forests_pielou_mov7
 r.univar forests_pielou_mov7
@@ -43,7 +43,7 @@ r.univar forests_pielou_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.pielou input=forests conf=movwindow7 out=forests_pielou_mov7
 r.li.pielou input=forests conf=movwindow7 out=forests_pielou_mov7
 
 

+ 2 - 2
raster/r.li/r.li.renyi/r.li.renyi.html

@@ -37,7 +37,7 @@ r.li.renyi input=my_map conf=my_conf output=my_out alpha=0.6
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.renyi input=forests conf=movwindow7 out=forests_renyi_mov7_a06 alpha=0.6
 r.li.renyi input=forests conf=movwindow7 out=forests_renyi_mov7_a06 alpha=0.6
 r.univar forests_renyi_mov7_a06
 r.univar forests_renyi_mov7_a06
@@ -46,7 +46,7 @@ r.univar forests_renyi_mov7_a06
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.renyi input=forests conf=movwindow7 out=forests_renyi_mov7
 r.li.renyi input=forests conf=movwindow7 out=forests_renyi_mov7
 
 

+ 2 - 2
raster/r.li/r.li.richness/r.li.richness.html

@@ -37,7 +37,7 @@ r.li.richness input=my_map conf=my_conf output=my_out
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.richness input=forests conf=movwindow7 out=forests_richness_mov7
 r.li.richness input=forests conf=movwindow7 out=forests_richness_mov7
 r.univar forests_richness_mov7
 r.univar forests_richness_mov7
@@ -46,7 +46,7 @@ r.univar forests_richness_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.richness input=forests conf=movwindow7 out=forests_richness_mov7
 r.li.richness input=forests conf=movwindow7 out=forests_richness_mov7
 
 

+ 2 - 2
raster/r.li/r.li.shannon/r.li.shannon.html

@@ -35,7 +35,7 @@ r.li.shannon input=my_map conf=my_conf output=my_out
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.shannon input=forests conf=movwindow7 out=forests_shannon_mov7
 r.li.shannon input=forests conf=movwindow7 out=forests_shannon_mov7
 r.univar forests_shannon_mov7
 r.univar forests_shannon_mov7
@@ -44,7 +44,7 @@ r.univar forests_shannon_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.shannon input=forests conf=movwindow7 out=forests_shannon_mov7
 r.li.shannon input=forests conf=movwindow7 out=forests_shannon_mov7
 
 

+ 2 - 2
raster/r.li/r.li.shape/r.li.shape.html

@@ -36,7 +36,7 @@ r.li.shape input=my_map conf=my_conf output=my_out
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.shape input=forests conf=movwindow7 out=forests_shape_mov7
 r.li.shape input=forests conf=movwindow7 out=forests_shape_mov7
 r.univar forests_shape_mov7
 r.univar forests_shape_mov7
@@ -45,7 +45,7 @@ r.univar forests_shape_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.shape input=forests conf=movwindow7 out=forests_shape_mov7
 r.li.shape input=forests conf=movwindow7 out=forests_shape_mov7
 
 

+ 2 - 2
raster/r.li/r.li.simpson/r.li.simpson.html

@@ -34,7 +34,7 @@ r.li.simpson input=my_map conf=my_conf output=my_out
 
 
 Forest map (Spearfish sample dataset) example:
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.simpson input=forests conf=movwindow7 out=forests_simpson_mov7
 r.li.simpson input=forests conf=movwindow7 out=forests_simpson_mov7
 r.univar forests_simpson_mov7
 r.univar forests_simpson_mov7
@@ -43,7 +43,7 @@ r.univar forests_simpson_mov7
 
 
 Forest map (North Carolina sample dataset) example:
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.simpson input=forests conf=movwindow7 out=forests_simpson_mov7
 r.li.simpson input=forests conf=movwindow7 out=forests_simpson_mov7
 
 

+ 1 - 1
raster/r.li/r.li.testing_nc_asc.sh

@@ -11,7 +11,7 @@ SAMPLEAREA 0.0|0.0|1.0|1.0" > $G_RLI/landcover_whole_whole # GRASS7
 
 
 # North Carolina location:
 # North Carolina location:
 export GRASS_OVERWRITE=1
 export GRASS_OVERWRITE=1
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 RASTER_MAP=landclass96
 RASTER_MAP=landclass96
 #r.to.vect in=basin_50K output=basin_50K feature=area
 #r.to.vect in=basin_50K output=basin_50K feature=area
 
 

+ 1 - 1
raster/r.li/r.li.testing_sp_mov.sh

@@ -14,7 +14,7 @@ SAMPLEAREA -1|-1|0.015021459227467811|0.011058451816745656
 MOVINGWINDOW" > $HOME/.grass7/r.li/movwindow7
 MOVINGWINDOW" > $HOME/.grass7/r.li/movwindow7
 
 
 export GRASS_OVERWRITE=1
 export GRASS_OVERWRITE=1
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 
 
 MEASURE="dominance edgedensity mpa mps padcv padrange padsd patchdensity patchnum pielou richness shannon shape simpson"
 MEASURE="dominance edgedensity mpa mps padcv padrange padsd patchdensity patchnum pielou richness shannon shape simpson"

+ 1 - 1
raster/r.mapcalc/test_suite/README

@@ -4,7 +4,7 @@
 #### r.blend for 3-in-1 testing
 #### r.blend for 3-in-1 testing
 #spearfish
 #spearfish
 
 
-g.region rast=elevation.10m res=5
+g.region raster=elevation.10m res=5
 export GRASS_OVERWRITE=1
 export GRASS_OVERWRITE=1
 export GRASS_VERBOSE=0
 export GRASS_VERBOSE=0
 
 

+ 1 - 1
raster/r.mode/r.mode.html

@@ -33,7 +33,7 @@ the same as they were at the time that the result map was created.
 Mode of K-factor (erosion) for Spearfish fields:
 Mode of K-factor (erosion) for Spearfish fields:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=fields -p
+g.region raster=fields -p
 r.mode base=fields cover=soils.Kfactor output=K.by.farm.mode
 r.mode base=fields cover=soils.Kfactor output=K.by.farm.mode
 r.univar K.by.farm.mode
 r.univar K.by.farm.mode
 </pre></div>
 </pre></div>

+ 7 - 7
raster/r.out.gdal/r.out.gdal.html

@@ -19,7 +19,7 @@ a group, when the imagery group's name is entered as input.
 module)
 module)
 <p>As with most GRASS raster modules, the current region extents and region
 <p>As with most GRASS raster modules, the current region extents and region
 resolution are used, and a MASK is respected if present.
 resolution are used, and a MASK is respected if present.
-Use <em><a href="g.region.html">g.region</a></em>'s "align=", or "rast="
+Use <em><a href="g.region.html">g.region</a></em>'s "align=", or "raster="
 options if you need to realign the region settings to match the original
 options if you need to realign the region settings to match the original
 map's before export.
 map's before export.
 
 
@@ -164,33 +164,33 @@ overviews.
 
 
 <h3>Export the integer raster basin_50K map to GeoTIFF format:</h3>
 <h3>Export the integer raster basin_50K map to GeoTIFF format:</h3>
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=basin_50K -p
+g.region raster=basin_50K -p
 r.out.gdal input=basin_50K output=basin_50K.tif
 r.out.gdal input=basin_50K output=basin_50K.tif
 </pre></div>
 </pre></div>
 <p>
 <p>
 <h3>Export a DCELL raster map in GeoTIFF format suitable for ESRI software:</h3>
 <h3>Export a DCELL raster map in GeoTIFF format suitable for ESRI software:</h3>
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.out.gdal in=elevation output=elevation.tif createopt="PROFILE=GeoTIFF,TFW=YES"
 r.out.gdal in=elevation output=elevation.tif createopt="PROFILE=GeoTIFF,TFW=YES"
 </pre></div>
 </pre></div>
 <p>
 <p>
 <h3>Export a raster map in "Deflate" compressed GeoTIFF format:</h3>
 <h3>Export a raster map in "Deflate" compressed GeoTIFF format:</h3>
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.out.gdal in=elevation output=elevation.tif createopt="COMPRESS=DEFLATE"
 r.out.gdal in=elevation output=elevation.tif createopt="COMPRESS=DEFLATE"
 </pre></div>
 </pre></div>
 <p>
 <p>
 <h3>Export R,G,B imagery bands in GeoTIFF format suitable for ESRI software:</h3>
 <h3>Export R,G,B imagery bands in GeoTIFF format suitable for ESRI software:</h3>
 <div class="code"><pre>
 <div class="code"><pre>
 i.group group=nc_landsat_rgb input=lsat7_2002_30,lsat7_2002_20,lsat7_2002_10
 i.group group=nc_landsat_rgb input=lsat7_2002_30,lsat7_2002_20,lsat7_2002_10
-g.region rast=lsat7_2002_30 -p
+g.region raster=lsat7_2002_30 -p
 r.out.gdal in=nc_landsat_rgb output=nc_landsat_rgb.tif type=Byte \
 r.out.gdal in=nc_landsat_rgb output=nc_landsat_rgb.tif type=Byte \
   createopt="PROFILE=GeoTIFF,INTERLEAVE=PIXEL,TFW=YES"
   createopt="PROFILE=GeoTIFF,INTERLEAVE=PIXEL,TFW=YES"
 </pre></div>
 </pre></div>
 <p>
 <p>
 <h3>Export the floating point raster elevation map to ERDAS/IMG format:</h3>
 <h3>Export the floating point raster elevation map to ERDAS/IMG format:</h3>
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.out.gdal input=elevation output=elelevation.img format=HFA type=Float32
 r.out.gdal input=elevation output=elelevation.img format=HFA type=Float32
 </pre></div>
 </pre></div>
 
 
@@ -199,7 +199,7 @@ r.out.gdal input=elevation output=elelevation.img format=HFA type=Float32
 g.list group
 g.list group
 i.group group=tm7 subgroup=tm7 input=tm7_10,tm7_20,tm7_30,tm7_40,tm7_50,tm7_60,tm7_70
 i.group group=tm7 subgroup=tm7 input=tm7_10,tm7_20,tm7_30,tm7_40,tm7_50,tm7_60,tm7_70
 i.group -l tm7
 i.group -l tm7
-g.region rast=tm7_10 -p
+g.region raster=tm7_10 -p
 r.out.gdal tm7 output=lsat_multiband.tif
 r.out.gdal tm7 output=lsat_multiband.tif
 gdalinfo lsat_multiband.tif
 gdalinfo lsat_multiband.tif
 </pre></div>
 </pre></div>

+ 1 - 1
raster/r.out.ppm/r.out.ppm.html

@@ -4,7 +4,7 @@
 at the pixel resolution of the CURRENTLY DEFINED REGION. 
 at the pixel resolution of the CURRENTLY DEFINED REGION. 
 To get the resolution and region settings of the raster map, run:<p>
 To get the resolution and region settings of the raster map, run:<p>
 <div class="code"><pre>
 <div class="code"><pre>
-g.region -p rast=[mapname]
+g.region -p raster=[mapname]
 </pre></div>
 </pre></div>
 
 
 <p>
 <p>

+ 1 - 1
raster/r.out.ppm3/r.out.ppm3.html

@@ -9,7 +9,7 @@ using the the current region settings.
 <p>To get the full area and resolutin of the raster map, run:
 <p>To get the full area and resolutin of the raster map, run:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=[mapname]
+g.region raster=[mapname]
 </pre></div>
 </pre></div>
 
 
 <p>before running <em>r.out.ppm3</em>.
 <p>before running <em>r.out.ppm3</em>.

+ 1 - 1
raster/r.param.scale/r.param.scale.html

@@ -73,7 +73,7 @@ Note that the aspect map is calculated differently from
 The next commands will create a geomorphological map of the Spearfish region:
 The next commands will create a geomorphological map of the Spearfish region:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 r.param.scale in=elevation.10m output=morphology param=feature size=9
 r.param.scale in=elevation.10m output=morphology param=feature size=9
 </pre></div>
 </pre></div>
 
 

+ 2 - 2
raster/r.patch/r.patch.html

@@ -63,7 +63,7 @@ geographic region settings to one or several raster maps, the <em>g.region</em>
 program can be used:
 program can be used:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=map1[,map2[,...]]
+g.region raster=map1[,map2[,...]]
 </pre></div>
 </pre></div>
 
 
 <p>
 <p>
@@ -104,7 +104,7 @@ used in the order listed.
 
 
 <div class="code"><pre>
 <div class="code"><pre>
 MAPS=`g.list type=rast sep=, pat="map_*"`
 MAPS=`g.list type=rast sep=, pat="map_*"`
-g.region rast=$MAPS
+g.region raster=$MAPS
 r.patch in=$MAPS out=mosaic
 r.patch in=$MAPS out=mosaic
 </pre></div>
 </pre></div>
 <br>
 <br>

+ 1 - 1
raster/r.profile/testsuite/test_profile_ncspm.py

@@ -134,7 +134,7 @@ class TestProfileNCSPM(TestCase):
     @classmethod
     @classmethod
     def setUpClass(cls):
     def setUpClass(cls):
         gcore.use_temp_region()
         gcore.use_temp_region()
-        gcore.run_command('g.region', rast='elevation')
+        gcore.run_command('g.region', raster='elevation')
 
 
     @classmethod
     @classmethod
     def tearDownClass(cls):
     def tearDownClass(cls):

+ 1 - 1
raster/r.proj/r.proj.html

@@ -261,7 +261,7 @@ v.proj input=bounds location=source_location_name output=bounds_reprojected
 # bounds map, and align the resolution to the desired cell resolution of the 
 # bounds map, and align the resolution to the desired cell resolution of the 
 # final, reprojected raster map:
 # final, reprojected raster map:
 
 
-g.region vect=bounds_reprojected res=5 -a
+g.region vector=bounds_reprojected res=5 -a
 
 
 # Now reproject the raster into the target location
 # Now reproject the raster into the target location
 
 

+ 2 - 2
raster/r.quantile/r.quantile.html

@@ -8,14 +8,14 @@ for use with large amounts of data. It is using two passes.
 Calculation of elevation quantiles (printed to standard-out):
 Calculation of elevation quantiles (printed to standard-out):
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.quantile input=elevation percentiles=0.1,1,10,25,50,75,90,99,99.9
 r.quantile input=elevation percentiles=0.1,1,10,25,50,75,90,99,99.9
 </pre></div>
 </pre></div>
 
 
 The output of <em>r.quantile</em> can be used for quantile classification:
 The output of <em>r.quantile</em> can be used for quantile classification:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.quantile elevation quantiles=5 -r --quiet | r.recode elevation \
 r.quantile elevation quantiles=5 -r --quiet | r.recode elevation \
            out=elev_quant5 rules=-
            out=elev_quant5 rules=-
 </pre></div>
 </pre></div>

+ 2 - 2
raster/r.random/r.random.html

@@ -71,7 +71,7 @@ and then use the reclassed raster map layer as input to <em>r.random</em>.
 Spearfish region, result stored in 2D vector map:
 Spearfish region, result stored in 2D vector map:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 r.random elevation.10m vector=elevrand n=100
 r.random elevation.10m vector=elevrand n=100
 v.db.select elevrand
 v.db.select elevrand
 v.univar elevrand col=value type=point
 v.univar elevrand col=value type=point
@@ -83,7 +83,7 @@ Spearfish region with collocated values sampled from landuse map,
 result stored in 3D vector map:
 result stored in 3D vector map:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 r.random -d elevation.10m cover=landcover.30m vector=luserand3d n=100
 r.random -d elevation.10m cover=landcover.30m vector=luserand3d n=100
 
 
 # data output (value: elevation, covervalue: landuse class):
 # data output (value: elevation, covervalue: landuse class):

+ 1 - 1
raster/r.reclass/r.reclass.html

@@ -46,7 +46,7 @@ as a <em>r.reclass</em> of a <em>r.reclass</em>.
 
 
 <p>To convert a reclass map to a regular raster map layer, set your
 <p>To convert a reclass map to a regular raster map layer, set your
 geographic region settings to match the settings in the header for the
 geographic region settings to match the settings in the header for the
-reclass map (with "<tt>g.region&nbsp;rast=reclass_map</tt>", or
+reclass map (with "<tt>g.region&nbsp;raster=reclass_map</tt>", or
 viewable by running <em><a href="r.info.html">r.info</a></em>) 
 viewable by running <em><a href="r.info.html">r.info</a></em>) 
 and then run <em><a href="r.resample.html">r.resample</a></em>.
 and then run <em><a href="r.resample.html">r.resample</a></em>.
 
 

+ 1 - 1
raster/r.recode/testsuite/test_rrecode_ncspm.py

@@ -39,7 +39,7 @@ class TestNCMaps(TestCase):
     @classmethod
     @classmethod
     def setUpClass(cls):
     def setUpClass(cls):
         cls.use_temp_region()
         cls.use_temp_region()
-        cls.runModule('g.region', rast='elevation@PERMANENT')
+        cls.runModule('g.region', raster='elevation@PERMANENT')
         cls.runModule('r.mapcalc', expression="random01 = rand(0, 1.)", seed=1, overwrite=True)
         cls.runModule('r.mapcalc', expression="random01 = rand(0, 1.)", seed=1, overwrite=True)
 
 
     @classmethod
     @classmethod

+ 2 - 2
raster/r.regression.line/r.regression.line.html

@@ -17,14 +17,14 @@ identical to that obtained from R-stats's lm() function.
 
 
 Comparison of the old and the new DEM in Spearfish:
 Comparison of the old and the new DEM in Spearfish:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 r.regression.line map1=elevation.dem map2=elevation.10m
 r.regression.line map1=elevation.dem map2=elevation.10m
 </pre></div>
 </pre></div>
 <p>
 <p>
 Using the script style flag AND <em>eval</em> to make results
 Using the script style flag AND <em>eval</em> to make results
 available in the shell:
 available in the shell:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 eval `r.regression.line -g map1=elevation.dem map2=elevation.10m`
 eval `r.regression.line -g map1=elevation.dem map2=elevation.10m`
 echo $a
 echo $a
 479.615
 479.615

+ 1 - 1
raster/r.regression.multi/r.regression.multi.html

@@ -72,7 +72,7 @@ available through the R-function stepAIC.
 Multiple regression with soil K-factor and elevation, aspect, and slope
 Multiple regression with soil K-factor and elevation, aspect, and slope
 (North Carolina dataset). Output maps are the residuals and estimates:
 (North Carolina dataset). Output maps are the residuals and estimates:
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=soils_Kfactor -p
+g.region raster=soils_Kfactor -p
 r.regression.multi mapx=elevation,aspect,slope mapy=soils_Kfactor \
 r.regression.multi mapx=elevation,aspect,slope mapy=soils_Kfactor \
   residuals=soils_Kfactor.resid estimates=soils_Kfactor.estim
   residuals=soils_Kfactor.resid estimates=soils_Kfactor.estim
 </pre></div>
 </pre></div>

+ 1 - 1
raster/r.relief/r.relief.html

@@ -53,7 +53,7 @@ In this example, the aspect map in the North Carolina sample
 dataset location is used to hillshade the elevation map:
 dataset location is used to hillshade the elevation map:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.relief input=elevation output=elevation_shade
 r.relief input=elevation output=elevation_shade
 </pre></div>
 </pre></div>
 
 

+ 2 - 2
raster/r.resamp.bspline/r.resamp.bspline.html

@@ -72,7 +72,7 @@ g.region n=north s=south e=east w=west align=input -p
 # interpolate NULL cells
 # interpolate NULL cells
 r.resamp.bspline -n input=input_raster output=interpolated_nulls method=bicubic
 r.resamp.bspline -n input=input_raster output=interpolated_nulls method=bicubic
 # set region to area with NULL cells, align region to input map
 # set region to area with NULL cells, align region to input map
-g.region rast=input -p
+g.region raster=input -p
 # patch original map and interpolated NULLs
 # patch original map and interpolated NULLs
 r.patch input=input_raster,interpolated_nulls output=input_raster_gapfilled
 r.patch input=input_raster,interpolated_nulls output=input_raster_gapfilled
 </pre></div>
 </pre></div>
@@ -85,7 +85,7 @@ elevation values; missing pixels are then re-interpolated to obtain
 a complete elevation map:
 a complete elevation map:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elev_srtm_30m -p
+g.region raster=elev_srtm_30m -p
 d.mon wx0
 d.mon wx0
 d.histogram elev_srtm_30m
 d.histogram elev_srtm_30m
 
 

+ 1 - 1
raster/r.resamp.interp/r.resamp.interp.html

@@ -44,7 +44,7 @@ Resample elevation raster map to a higher resolution (from 500m to 250m;
 North Carolina sample dataset):
 North Carolina sample dataset):
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elev_state_500m -p
+g.region raster=elev_state_500m -p
 g.region res=250 -ap
 g.region res=250 -ap
 r.resamp.interp input=elev_state_500m output=elev_state_250m
 r.resamp.interp input=elev_state_500m output=elev_state_250m
 </pre></div>
 </pre></div>

+ 1 - 1
raster/r.resamp.rst/BUGS

@@ -5,7 +5,7 @@ bugs in segmenting procedure and colortables
 Resolution bug: 
 Resolution bug: 
 
 
 r.resamp.rst N46E011.meters.90 el=N46E011.meters.1425 ew=14.25 ns=14.25
 r.resamp.rst N46E011.meters.90 el=N46E011.meters.1425 ew=14.25 ns=14.25
-GRASS 5.7.cvs:/nfsmnt/levi0/ssi/srtm_DEM90m_egm96geoid/original > g.region rast=N46E011.meters.1425 -p
+GRASS 5.7.cvs:/nfsmnt/levi0/ssi/srtm_DEM90m_egm96geoid/original > g.region raster=N46E011.meters.1425 -p
 projection: 1 (UTM)
 projection: 1 (UTM)
 zone:       32
 zone:       32
 datum:      WGS84
 datum:      WGS84

+ 2 - 2
raster/r.resamp.rst/r.resamp.rst.html

@@ -100,13 +100,13 @@ Resampling the Spearfish 30m resolution elevation model to 15m:
  
  
 <div class="code"><pre>
 <div class="code"><pre>
 # set computation region to original map (30m)
 # set computation region to original map (30m)
-g.region rast=elevation.dem -p
+g.region raster=elevation.dem -p
 
 
 # resample to 15m
 # resample to 15m
 r.resamp.rst input=elevation.dem ew_res=15 ns_res=15 elevation=elev15
 r.resamp.rst input=elevation.dem ew_res=15 ns_res=15 elevation=elev15
 
 
 # set computation region to resulting map
 # set computation region to resulting map
-g.region rast=elev15 -p
+g.region raster=elev15 -p
 
 
 # verify
 # verify
 r.univar elev15 -g
 r.univar elev15 -g

+ 1 - 1
raster/r.resamp.stats/r.resamp.stats.html

@@ -30,7 +30,7 @@ North Carolina sample dataset):
 
 
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=el_D782_6m -p
+g.region raster=el_D782_6m -p
 g.region res=20 -ap
 g.region res=20 -ap
 # from 6m to 20m: weighted resampling -w
 # from 6m to 20m: weighted resampling -w
 r.resamp.stats -w input=el_D782_6m output=el_D782_20m
 r.resamp.stats -w input=el_D782_6m output=el_D782_20m

+ 1 - 1
raster/r.sim/r.sim.water/r.sim.water.html

@@ -140,7 +140,7 @@ for large, cutting-edge applications using high performance computing.
 Spearfish region:
 Spearfish region:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 r.slope.aspect elevation=elevation.10m dx=elev_dx dy=elev_dy
 r.slope.aspect elevation=elevation.10m dx=elev_dx dy=elev_dy
 
 
 # synthetic maps
 # synthetic maps

+ 1 - 1
raster/r.sim/r.sim.water/spearfish.sh

@@ -7,7 +7,7 @@
 
 
 dem=elevation.10m
 dem=elevation.10m
 output=simwe
 output=simwe
-g.region rast=${output}
+g.region raster=${output}
 g.region n=4920800 s=4917800 w=602500 e=606000
 g.region n=4920800 s=4917800 w=602500 e=606000
 g.region -p
 g.region -p
 
 

+ 2 - 2
raster/r.slope.aspect/testsuite/test_r_slope_aspect.py

@@ -109,7 +109,7 @@ class TestSlopeAspectAgainstItself(grass.gunittest.TestCase):
     @classmethod
     @classmethod
     def setUpClass(cls):
     def setUpClass(cls):
         cls.use_temp_region()
         cls.use_temp_region()
-        call_module('g.region', rast='elevation')
+        call_module('g.region', raster='elevation')
 
 
     @classmethod
     @classmethod
     def tearDownClass(cls):
     def tearDownClass(cls):
@@ -150,7 +150,7 @@ class TestExtremes(grass.gunittest.TestCase):
         aspect = 'small_aspect'
         aspect = 'small_aspect'
         self.runModule('r.in.ascii', input='-', output=elevation,
         self.runModule('r.in.ascii', input='-', output=elevation,
                        stdin_=SMALL_MAP)
                        stdin_=SMALL_MAP)
-        call_module('g.region', rast=elevation)
+        call_module('g.region', raster=elevation)
         self.assertModule('r.slope.aspect', elevation=elevation,
         self.assertModule('r.slope.aspect', elevation=elevation,
                           slope=slope, aspect=aspect)
                           slope=slope, aspect=aspect)
         self.assertRasterMinMax(map=slope, refmin=0, refmax=90,
         self.assertRasterMinMax(map=slope, refmin=0, refmax=90,

+ 1 - 1
raster/r.stats/test_suite/profile.sh

@@ -1,6 +1,6 @@
 #spearfish
 #spearfish
 MAP=elevation.10m
 MAP=elevation.10m
-g.region rast=$MAP
+g.region raster=$MAP
 CMD="r.stats -a $MAP"
 CMD="r.stats -a $MAP"
 
 
 time $CMD
 time $CMD

+ 1 - 1
raster/r.stream.extract/r.stream.extract.html

@@ -160,7 +160,7 @@ map produced with <em><a href="r.watershed.html">r.watershed</a></em>.
 
 
 <div class="code"><pre>
 <div class="code"><pre>
 # set region
 # set region
-g.region -p rast=elev_ned_30m@PERMANENT
+g.region -p raster=elev_ned_30m@PERMANENT
 
 
 # calculate flow accumulation
 # calculate flow accumulation
 r.watershed ele=elev_ned_30m@PERMANENT acc=elevation.10m.acc
 r.watershed ele=elev_ned_30m@PERMANENT acc=elevation.10m.acc

+ 2 - 2
raster/r.sun/r.sun.html

@@ -255,7 +255,7 @@ memory_bytes = rows*cols*((IR*4+horizon_steps)/num_partitions  + OR*4)
 
 
 North Carolina example (considering also cast shadows):
 North Carolina example (considering also cast shadows):
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 
 
 # calculate horizon angles (to speed up the subsequent r.sun calculation)
 # calculate horizon angles (to speed up the subsequent r.sun calculation)
 r.horizon elevation=elevation step=30 bufferzone=200 basename=horangle \
 r.horizon elevation=elevation step=30 bufferzone=200 basename=horangle \
@@ -277,7 +277,7 @@ for a given day of the year at 30m resolution. Here day 172 (i.e., 21 June
 in non-leap years):
 in non-leap years):
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elev_ned_30m -p
+g.region raster=elev_ned_30m -p
 
 
 # considering cast shadows
 # considering cast shadows
 r.sun elevation=elev_ned_30m linke_value=2.5 albedo_value=0.2 day=172 \
 r.sun elevation=elev_ned_30m linke_value=2.5 albedo_value=0.2 day=172 \

+ 0 - 0
raster/r.sunmask/r.sunmask.html


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio