[GRASS-SVN] r63779 - in grass-addons/grass7: display/d.frame general/g.cloud general/g.cloud/test general/g.compare.md5 gui/wxpython/newgui gui/wxpython/wx.stream/gui_modules imagery/i.edge imagery/i.fusion.brovey imagery/i.histo.match imagery/i.segment.gsoc imagery/i.spec.unmix raster raster/r.basin raster/r.convergence raster/r.edm.eval raster/r.geomorphon raster/r.grow.shrink raster/r.hants raster/r.hazard.flood raster/r.lake.series raster/r.le.patch raster/r.le.pixel raster/r.lfp raster/r.los raster/r.mess raster/r.northerness.easterness raster/r.segment raster/r.skyview raster/r.stream.basins raster/r.stream.channel raster/r.stream.distance raster/r.stream.order raster/r.stream.segment raster/r.stream.slope raster/r.stream.snap raster/r.stream.stats raster/r.surf.nnbathy raster/r.to.vect.lines raster/r.traveltime raster/r.univar2 raster/r.valley.bottom raster/r.vif vector/v.area.weigh vector/v.colors2 vector/v.habitat.dem vector/v.isochrones vector/v.surf.mass vector/v.surf .nnbathy vector/v.transects
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Dec 27 05:30:46 PST 2014
Author: neteler
Date: 2014-12-27 05:30:46 -0800 (Sat, 27 Dec 2014)
New Revision: 63779
Modified:
grass-addons/grass7/display/d.frame/d.frame.html
grass-addons/grass7/general/g.cloud/cloud_collect.sh
grass-addons/grass7/general/g.cloud/test/test_morevariables_raster.sh
grass-addons/grass7/general/g.cloud/test/test_onevariable.sh
grass-addons/grass7/general/g.cloud/test/test_onevariable_raster.sh
grass-addons/grass7/general/g.cloud/test/test_onevariable_sun.sh
grass-addons/grass7/general/g.compare.md5/g.compare.md5.html
grass-addons/grass7/gui/wxpython/newgui/render2.py
grass-addons/grass7/gui/wxpython/wx.stream/gui_modules/rstream_panelOne.py
grass-addons/grass7/imagery/i.edge/i.edge.html
grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.html
grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.py
grass-addons/grass7/imagery/i.histo.match/i.histo.match.py
grass-addons/grass7/imagery/i.segment.gsoc/i.segment.gsoc.html
grass-addons/grass7/imagery/i.spec.unmix/i.spec.unmix.html
grass-addons/grass7/raster/Makefile
grass-addons/grass7/raster/r.basin/r.basin.html
grass-addons/grass7/raster/r.convergence/memory.c
grass-addons/grass7/raster/r.edm.eval/r.edm.eval
grass-addons/grass7/raster/r.geomorphon/memory.c
grass-addons/grass7/raster/r.grow.shrink/r.grow.shrink.html
grass-addons/grass7/raster/r.hants/r.hants.html
grass-addons/grass7/raster/r.hazard.flood/r.hazard.flood.html
grass-addons/grass7/raster/r.lake.series/r.lake.series.html
grass-addons/grass7/raster/r.le.patch/driver.c
grass-addons/grass7/raster/r.le.pixel/driver.c
grass-addons/grass7/raster/r.lfp/r.lfp.py
grass-addons/grass7/raster/r.los/r.los.html
grass-addons/grass7/raster/r.mess/r.mess
grass-addons/grass7/raster/r.northerness.easterness/r.northerness.easterness.html
grass-addons/grass7/raster/r.northerness.easterness/r.northerness.easterness.py
grass-addons/grass7/raster/r.segment/r.segment.html
grass-addons/grass7/raster/r.skyview/r.skyview.html
grass-addons/grass7/raster/r.stream.basins/io.c
grass-addons/grass7/raster/r.stream.channel/io.c
grass-addons/grass7/raster/r.stream.channel/r.stream.channel.html
grass-addons/grass7/raster/r.stream.distance/io.c
grass-addons/grass7/raster/r.stream.distance/r.stream.distance.html
grass-addons/grass7/raster/r.stream.order/io.c
grass-addons/grass7/raster/r.stream.order/r.stream.order.html
grass-addons/grass7/raster/r.stream.segment/io.c
grass-addons/grass7/raster/r.stream.segment/r.stream.segment.html
grass-addons/grass7/raster/r.stream.slope/main.c
grass-addons/grass7/raster/r.stream.slope/r.stream.slope.html
grass-addons/grass7/raster/r.stream.snap/io.c
grass-addons/grass7/raster/r.stream.snap/r.stream.snap.html
grass-addons/grass7/raster/r.stream.stats/io.c
grass-addons/grass7/raster/r.stream.stats/r.stream.stats.html
grass-addons/grass7/raster/r.surf.nnbathy/r.surf.nnbathy.html
grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.html
grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.py
grass-addons/grass7/raster/r.traveltime/r.traveltime.html
grass-addons/grass7/raster/r.univar2/r.univar2.html
grass-addons/grass7/raster/r.valley.bottom/r.valley.bottom.html
grass-addons/grass7/raster/r.valley.bottom/r.valley.bottom.py
grass-addons/grass7/raster/r.vif/r.vif
grass-addons/grass7/vector/v.area.weigh/v.area.weigh.html
grass-addons/grass7/vector/v.colors2/v.colors2.html
grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.html
grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.py
grass-addons/grass7/vector/v.isochrones/v.isochrones.html
grass-addons/grass7/vector/v.surf.mass/v.surf.mass.html
grass-addons/grass7/vector/v.surf.nnbathy/v.surf.nnbathy.html
grass-addons/grass7/vector/v.transects/v.transects.html
Log:
Addons: update some calls to use new element names (#2409)
Modified: grass-addons/grass7/display/d.frame/d.frame.html
===================================================================
--- grass-addons/grass7/display/d.frame/d.frame.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/display/d.frame/d.frame.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -32,7 +32,7 @@
d.mon cairo out=/tmp/map.png width=600 height=540 --o
# set up region
-g.region rast=elevation
+g.region raster=elevation
# remove all frames and erase the current graphics monitor
d.frame -e
Modified: grass-addons/grass7/general/g.cloud/cloud_collect.sh
===================================================================
--- grass-addons/grass7/general/g.cloud/cloud_collect.sh 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/general/g.cloud/cloud_collect.sh 2014-12-27 13:30:46 UTC (rev 63779)
@@ -103,21 +103,21 @@
for mapset in $LIST ; do
MAPS=`g.list rast mapset=$mapset`
for map in $MAPS ; do
- g.copy rast=$map@$mapset,$map --o
+ g.copy raster=$map@$mapset,$map --o
done
done
for mapset in $LIST ; do
MAPS=`g.list rast3d mapset=$mapset`
for map in $MAPS ; do
- g.copy rast=$map@$mapset,$map --o
+ g.copy raster=$map@$mapset,$map --o
done
done
for mapset in $LIST ; do
MAPS=`g.list vect mapset=$mapset`
for map in $MAPS ; do
- g.copy vect=$map@$mapset,$map --o
+ g.copy vector=$map@$mapset,$map --o
done
done
Modified: grass-addons/grass7/general/g.cloud/test/test_morevariables_raster.sh
===================================================================
--- grass-addons/grass7/general/g.cloud/test/test_morevariables_raster.sh 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/general/g.cloud/test/test_morevariables_raster.sh 2014-12-27 13:30:46 UTC (rev 63779)
@@ -10,6 +10,6 @@
# TEST 2: all-to-all: use var with size 3 and 7; use corr with size 3 and 7
# - g.cloud -c conf=~/.diss server=giscluster grass=/PATH/TO/g.cloud/test/test_morevariables_raster.sh qsub=/PATH/TO/g.cloud/test/test_launch_SGE_grassjob.sh variables="{'TEXTURE' : ['var','corr'], 'SIZE' : [3,7]}" raster=lsat7_2002_40
-g.region rast=lsat7_2002_40
+g.region raster=lsat7_2002_40
r.texture input=lsat7_2002_40 prefix=lsat7_2002_40_$SIZE method=$TEXTURE size=$SIZE
Modified: grass-addons/grass7/general/g.cloud/test/test_onevariable.sh
===================================================================
--- grass-addons/grass7/general/g.cloud/test/test_onevariable.sh 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/general/g.cloud/test/test_onevariable.sh 2014-12-27 13:30:46 UTC (rev 63779)
@@ -8,5 +8,5 @@
# using PID ($$) as name suffix
v.random output=random$$_$NPOINT n=$NPOINT
-g.region vect=random$$_$NPOINT
+g.region vector=random$$_$NPOINT
v.buffer input=random$$_$NPOINT output=buffer$$ distance=1
Modified: grass-addons/grass7/general/g.cloud/test/test_onevariable_raster.sh
===================================================================
--- grass-addons/grass7/general/g.cloud/test/test_onevariable_raster.sh 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/general/g.cloud/test/test_onevariable_raster.sh 2014-12-27 13:30:46 UTC (rev 63779)
@@ -6,5 +6,5 @@
#
# - g.cloud conf=~/.gc_loginfile.txt server=giscluster grass=/PATH/TO/g.cloud/test/test_onevariable_raster.sh qsub=/PATH/TO/g.cloud/test/test_launch_SGE_grassjob.sh variables="{'TEXTURE' : ['var','corr']}" raster=lsat7_2002_40
-g.region rast=lsat7_2002_40
+g.region raster=lsat7_2002_40
r.texture input=lsat7_2002_40 prefix=lsat7_2002_40 method=$TEXTURE
Modified: grass-addons/grass7/general/g.cloud/test/test_onevariable_sun.sh
===================================================================
--- grass-addons/grass7/general/g.cloud/test/test_onevariable_sun.sh 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/general/g.cloud/test/test_onevariable_sun.sh 2014-12-27 13:30:46 UTC (rev 63779)
@@ -12,7 +12,7 @@
ELEV=elevation
-g.region rast=$ELEV
+g.region raster=$ELEV
# r.sun memory requirements: 4 bytes per raster cell
# rows,cols: rows and columns of current region (find out with g.region)
Modified: grass-addons/grass7/general/g.compare.md5/g.compare.md5.html
===================================================================
--- grass-addons/grass7/general/g.compare.md5/g.compare.md5.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/general/g.compare.md5/g.compare.md5.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -10,7 +10,7 @@
<div class="code"><pre>
# copy a raster map
-g.copy rast=elevation,dem
+g.copy raster=elevation,dem
# now check and return TRUE
g.md5sum ain=elevation bin=dem
@@ -23,7 +23,6 @@
# but when adding the -c flag (ignore color table), TRUE is returned
g.md5sum -c ain=elevation bin=dem
-
</pre></div>
<h2>AUTHOR</h2>
Modified: grass-addons/grass7/gui/wxpython/newgui/render2.py
===================================================================
--- grass-addons/grass7/gui/wxpython/newgui/render2.py 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/gui/wxpython/newgui/render2.py 2014-12-27 13:30:46 UTC (rev 63779)
@@ -360,7 +360,7 @@
@param id overlay id (for PseudoDC)
@param type overlay type ('barscale', 'legend', etc.)
@param cmd GRASS command to render overlay,
- given as list, e.g. ['d.legend', 'rast=elevation at PERMANENT']
+ given as list, e.g. ['d.legend', 'raster=elevation at PERMANENT']
@param Map render.Map instance
@param active layer is active, will be rendered only if True
@param hidden layer is hidden, won't be listed in Layer Manager if True
Modified: grass-addons/grass7/gui/wxpython/wx.stream/gui_modules/rstream_panelOne.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.stream/gui_modules/rstream_panelOne.py 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/gui/wxpython/wx.stream/gui_modules/rstream_panelOne.py 2014-12-27 13:30:46 UTC (rev 63779)
@@ -314,7 +314,7 @@
# Add the box for choosing the map
self.select1 = gselect.Select(parent = self.panel, id = wx.ID_ANY, size = (250, -1),
- type = 'rast', multiple = False)
+ type = 'raster', multiple = False)
self.select.Add(item = self.select1, pos = (2,0), span = wx.DefaultSpan)
# binder
@@ -342,7 +342,7 @@
# Box to insert name of acc map
self.select2 = gselect.Select(parent = self.panel, id = wx.ID_ANY, size = (250, -1),
- type = 'rast', multiple = False) # select existing map
+ type = 'raster', multiple = False) # select existing map
self.select.Add(item = self.select2, pos = (5,0), span = wx.DefaultSpan)
self.textOne = wx.TextCtrl(parent = self.panel, id = wx.ID_ANY, style = wx.TE_LEFT)
self.select.Add(item = self.textOne, flag = wx.LEFT | wx.EXPAND , pos = (6,0), span = wx.DefaultSpan)
@@ -372,7 +372,7 @@
# Add the box for choosing the map
self.select3 = gselect.Select(parent = self.panel, id = wx.ID_ANY, size = (250, -1),
- type = 'rast', multiple = False)
+ type = 'raster', multiple = False)
self.select.Add(item = self.select3, pos = (8,0), span = wx.DefaultSpan)
# binder
Modified: grass-addons/grass7/imagery/i.edge/i.edge.html
===================================================================
--- grass-addons/grass7/imagery/i.edge/i.edge.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/imagery/i.edge/i.edge.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -73,7 +73,7 @@
<div class="code"><pre>
# set the region (resolution) to Landsat image
-g.region rast=lsat7_2000_20 at landsat
+g.region raster=lsat7_2000_20 at landsat
# set the region to experimetal area
g.region n=224016 s=220981 w=637589 e=641223
Modified: grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.html
===================================================================
--- grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -28,7 +28,7 @@
Calculation of Brovey fusion map from North Carolina Landsat scene:
<div class="code"><pre>
-g.region rast=lsat7_2002_20 -p
+g.region raster=lsat7_2002_20 -p
# R, G, B composite at 28.5m
d.rgb b=lsat7_2002_10 g=lsat7_2002_20 r=lsat7_2002_30
@@ -39,7 +39,7 @@
outputprefix=brovey
# display at 14.25m
-g.region rast=brovey.blue -p
+g.region raster=brovey.blue -p
d.rgb b=brovey.blue g=brovey.green r=brovey.red
</pre></div>
Modified: grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.py
===================================================================
--- grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.py 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.py 2014-12-27 13:30:46 UTC (rev 63779)
@@ -160,7 +160,7 @@
grass.message(_("%s.%s") % (out, ch))
grass.verbose("To visualize output, run:")
- grass.verbose("g.region -p rast=%s.red" % out)
+ grass.verbose("g.region -p raster=%s.red" % out)
grass.verbose("d.rgb r=%s.red g=%s.green b=%s.blue" % (out, out, out))
grass.verbose("If desired, combine channels with 'r.composite' to a single map.")
Modified: grass-addons/grass7/imagery/i.histo.match/i.histo.match.py
===================================================================
--- grass-addons/grass7/imagery/i.histo.match/i.histo.match.py 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/imagery/i.histo.match/i.histo.match.py 2014-12-27 13:30:46 UTC (rev 63779)
@@ -105,7 +105,7 @@
curs.execute(query_create)
# set the region on the raster
grass.use_temp_region()
- grass.run_command('g.region', rast=i)
+ grass.run_command('g.region', raster=i)
# calculate statistics
stats_out = grass.pipe_command('r.stats', flags='cin', input=i,
separator=':')
@@ -193,7 +193,7 @@
for i in images:
iname = i.split('@')[0]
grass.use_temp_region()
- grass.run_command('g.region', rast=i)
+ grass.run_command('g.region', raster=i)
# write average rules file
outfile = open(grass.tempfile(), 'w')
new_grey = 0
@@ -233,7 +233,7 @@
db.close()
if mosaic:
grass.use_temp_region()
- grass.run_command('g.region', rast=all_images)
+ grass.run_command('g.region', raster=all_images)
grass.run_command('r.patch', input=output_names, output=mosaic)
if __name__ == "__main__":
Modified: grass-addons/grass7/imagery/i.segment.gsoc/i.segment.gsoc.html
===================================================================
--- grass-addons/grass7/imagery/i.segment.gsoc/i.segment.gsoc.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/imagery/i.segment.gsoc/i.segment.gsoc.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -123,7 +123,7 @@
threshold may be required. <br>
<div class="code"><pre>
-g.region rast=ortho_2001_t792_1m at PERMANENT n=220400 s=220200 e=639000 w=638800
+g.region raster=ortho_2001_t792_1m at PERMANENT n=220400 s=220200 e=639000 w=638800
</pre></div>
Try out a first threshold and check the results.<br>
@@ -152,7 +152,7 @@
machine. Now that we are satisfied with the settings, we'll process
the entire image:
<div class="code"><pre>
-g.region rast=ortho_2001_t792_1m at PERMANENT<br>
+g.region raster=ortho_2001_t792_1m at PERMANENT<br>
i.segment -w -l --overwrite group=ortho_group output=ortho_segs \
threshold=10 method=region_growing minsize=5 endt=5000
</pre></div>
Modified: grass-addons/grass7/imagery/i.spec.unmix/i.spec.unmix.html
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/i.spec.unmix.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/imagery/i.spec.unmix/i.spec.unmix.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -14,7 +14,7 @@
<!-- see sample/run.sh, update to NC sample data set -->
<div class="code"><pre>
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
# Find pure endmembers, they are supposed to be in the corners of
# the PCA feature space (or use spectral measurement data)
Modified: grass-addons/grass7/raster/Makefile
===================================================================
--- grass-addons/grass7/raster/Makefile 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/Makefile 2014-12-27 13:30:46 UTC (rev 63779)
@@ -10,6 +10,9 @@
# r.le.setup \
# r.le.trace
+# unclear
+ r.convert \
+
SUBDIRS = \
r.agent \
r.area \
@@ -17,7 +20,6 @@
r.bioclim \
r.bitpattern \
r.convergence \
- r.convert \
r.crater \
r.damflood \
r.diversity \
Modified: grass-addons/grass7/raster/r.basin/r.basin.html
===================================================================
--- grass-addons/grass7/raster/r.basin/r.basin.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.basin/r.basin.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -124,7 +124,7 @@
North Carolina sample dataset example:
<div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
r.basin map=elevation prefix=my_basin coord=637500.0,221750.0 dir=/tmp/bla threshold=1000
# visualize some results
Modified: grass-addons/grass7/raster/r.convergence/memory.c
===================================================================
--- grass-addons/grass7/raster/r.convergence/memory.c 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.convergence/memory.c 2014-12-27 13:30:46 UTC (rev 63779)
@@ -20,7 +20,7 @@
rast->raster_type = Rast_map_type(rast->elevname, mapset);
if (window.ew_res < cellhd.ew_res || window.ns_res < cellhd.ns_res)
- G_fatal_error(_("Region resolution shoudn't be lesser than map %s resolution. Run g.region rast=%s to set proper resolution"),
+ G_fatal_error(_("Region resolution shoudn't be lesser than map %s resolution. Run g.region raster=%s to set proper resolution"),
rast->elevname, rast->elevname);
tmp_buf = Rast_allocate_buf(rast->raster_type);
Modified: grass-addons/grass7/raster/r.edm.eval/r.edm.eval
===================================================================
--- grass-addons/grass7/raster/r.edm.eval/r.edm.eval 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.edm.eval/r.edm.eval 2014-12-27 13:30:46 UTC (rev 63779)
@@ -231,8 +231,8 @@
fft <- execGRASS("g.findfile", flags="quiet", element="cell", file=rast, mapset=mpst, Sys_ignore.stdout=TRUE)
if(fft==0){
rname <- rand.name()
- execGRASS("g.copy", rast=paste(rast, rname, sep=","))
- if(remove.orig){execGRASS("g.remove", flags="f", type="rast", name=rast)}
+ execGRASS("g.copy", raster=paste(rast, rname, sep=","))
+ if(remove.orig){execGRASS("g.remove", flags="f", type="raster", name=rast)}
return(rname)
}else{
print("the selected file does not exist")
@@ -265,7 +265,7 @@
sink("reclass.rules"); cat("1:1:1:1"); cat("\n"); cat("2:2:0:0"); cat("\n"); sink()
execGRASS("r.recode", flags="overwrite", input=tmp.b, output=tmp.a, rules="reclass.rules")
obsmap <- tmp.a
- execGRASS("g.remove", flags="f", type="rast", name=tmp.b); unlink("reclass.rules")
+ execGRASS("g.remove", flags="f", type="raster", name=tmp.b); unlink("reclass.rules")
}
if(bufpres>0){
@@ -275,7 +275,7 @@
execGRASS("r.buffer", flags=c("z","overwrite"), input=tmp.b, output=tmp.c, distances=bufpres, units="kilometers")
execGRASS("r.mapcalc", flags="overwrite", expression=paste(tmp.b, " = if(", tmp.c, "==2,1,", obsmap, ")", sep=""))
obsmap <- tmp.b
- execGRASS("g.remove", flags="f", type="rast", name=tmp.c)
+ execGRASS("g.remove", flags="f", type="raster", name=tmp.c)
}
# Prevalence
@@ -303,7 +303,7 @@
execGRASS("r.random", input=tmp.g, n=as.character(abs.req), raster_output=tmp.h, Sys_wait=TRUE)
execGRASS("r.patch", input=paste(tmp.f, tmp.h, sep=","), output=tmp.i, flags="overwrite", Sys_wait=TRUE)
obsmap <- tmp.i
- execGRASS("g.remove", flags="f", type="rast", name=paste(tmp.f, tmp.g, tmp.h, tmp.e, sep=","), Sys_wait=TRUE)
+ execGRASS("g.remove", flags="f", type="raster", name=paste(tmp.f, tmp.g, tmp.h, tmp.e, sep=","), Sys_wait=TRUE)
}else{
# Set number of presence and absence points
if(num.pres > 0 | num.abs > 0){
@@ -340,7 +340,7 @@
tmp.j <- "tmp_r_model_evaluation_0987654321j"
execGRASS("r.patch", input=paste(tmp.f, tmp.h, sep=","), output=tmp.j, flags="overwrite", Sys_wait=TRUE)
obsmap <- tmp.j
- execGRASS("g.remove", flags="f", type="rast", name=paste(tmp.f, tmp.g, tmp.h, tmp.e, sep=","), Sys_wait=TRUE)
+ execGRASS("g.remove", flags="f", type="raster", name=paste(tmp.f, tmp.g, tmp.h, tmp.e, sep=","), Sys_wait=TRUE)
}
}
@@ -365,7 +365,7 @@
# Based on presence / absence
a <- execGRASS("r.stats", flags=c("c","n"), input=paste(obsmap, tmp.d, sep=","), intern=TRUE)
a <- get_output.GRASS(a, separator=" ")
- execGRASS("g.remove", flags="f", type="rast", name=tmp.d)
+ execGRASS("g.remove", flags="f", type="raster", name=tmp.d)
}else{
# Based on presence / background
tmp.k <- "tmp_r_model_evaluation_0987654321k"
@@ -384,21 +384,21 @@
a <- rbind(a1, a3)
# Clean up
- execGRASS("g.remove", flags="f", type="rast", name=paste(tmp.k, tmp.m, sep=","))
+ execGRASS("g.remove", flags="f", type="raster", name=paste(tmp.k, tmp.m, sep=","))
}
# Clean up
-execGRASS("g.remove", flags="f", type="rast", name=tmp.d)
-if(bufabs>0){execGRASS("g.remove", flags="f", type="rast", name=tmp.a)}
-if(bufabs>0){execGRASS("g.remove", flags="f", type="rast", name=tmp.b)}
-if(preval>0){execGRASS("g.remove", flags="f", type="rast", name=tmp.i)}
-if(num.abs > 0 | num.pres > 0){execGRASS("g.remove", flags="f", type="rast", name=tmp.j)}
+execGRASS("g.remove", flags="f", type="raster", name=tmp.d)
+if(bufabs>0){execGRASS("g.remove", flags="f", type="raster", name=tmp.a)}
+if(bufabs>0){execGRASS("g.remove", flags="f", type="raster", name=tmp.b)}
+if(preval>0){execGRASS("g.remove", flags="f", type="raster", name=tmp.i)}
+if(num.abs > 0 | num.pres > 0){execGRASS("g.remove", flags="f", type="raster", name=tmp.j)}
# the temporary files do not always get cleaned up, need to check why
# this is a temporary fix!
-aa <- execGRASS("g.list", type="rast", pattern="tmp_r_model_evaluation_*", intern=TRUE)
+aa <- execGRASS("g.list", type="raster", pattern="tmp_r_model_evaluation_*", intern=TRUE)
if(length(aa)>0){
- execGRASS("g.remove", type="rast", pattern="tmp_r_model_evaluation_*", flags="f")
+ execGRASS("g.remove", type="raster", pattern="tmp_r_model_evaluation_*", flags="f")
}
# Calculate evaluation stats
Modified: grass-addons/grass7/raster/r.geomorphon/memory.c
===================================================================
--- grass-addons/grass7/raster/r.geomorphon/memory.c 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.geomorphon/memory.c 2014-12-27 13:30:46 UTC (rev 63779)
@@ -20,7 +20,7 @@
rast->raster_type = Rast_map_type(rast->elevname, mapset);
if (window.ew_res < cellhd.ew_res || window.ns_res < cellhd.ns_res)
- G_warning(_("Region resolution shoudn't be lesser than map %s resolution. Run g.region rast=%s to set proper resolution"),
+ G_warning(_("Region resolution shoudn't be lesser than map %s resolution. Run g.region raster=%s to set proper resolution"),
rast->elevname, rast->elevname);
tmp_buf = Rast_allocate_buf(rast->raster_type);
Modified: grass-addons/grass7/raster/r.grow.shrink/r.grow.shrink.html
===================================================================
--- grass-addons/grass7/raster/r.grow.shrink/r.grow.shrink.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.grow.shrink/r.grow.shrink.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -62,7 +62,7 @@
<div class="code"><pre>
# North Carolina sample dataset
-g.region rast=lakes
+g.region raster=lakes
r.grow.shrink in=lakes out=lakes.shrunken radius=-2.01
r.colors lakes.shrunken rast=lakes
</pre></div>
Modified: grass-addons/grass7/raster/r.hants/r.hants.html
===================================================================
--- grass-addons/grass7/raster/r.hants/r.hants.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.hants/r.hants.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -88,13 +88,13 @@
<div class="code"><pre>
# set computational region to one of the maps
-g.region rast=2004_03_tempmean -p
+g.region raster=2004_03_tempmean -p
</pre></div>
Visualize the time series as animation:
<div class="code"><pre>
# note: color table is different from standard "celsius"
-g.gui.animation rast=`g.list rast pattern="*tempmean" sep=comma`
+g.gui.animation rast=`g.list type=raster pattern="*tempmean" sep=comma`
</pre></div>
<p>
@@ -106,13 +106,13 @@
# just wildly guessing the parameters for a test run:
# generate and check list of input maps (the order matters!)
-g.list rast pattern="20??_??_tempmean" output=tempmean.csv
+g.list type=raster pattern="20??_??_tempmean" output=tempmean.csv
r.hants file=tempmean.csv \
nf=6 fet=0.1 dod=5 delta=0.1 base_period=12
# assign reasonable color tables for temperature
-for map in `g.list rast pattern="*tempmean_hants"` ; do
+for map in `g.list type=raster pattern="*tempmean_hants"` ; do
r.colors $map color=celsius
done
@@ -139,7 +139,7 @@
...
# see HANTS time series as animation
-g.gui.animation rast=`g.list rast pattern="*tempmean_hants" sep=comma`
+g.gui.animation rast=`g.list type=raster pattern="*tempmean_hants" sep=comma`
# Check HANTS behaviour in a given point
Modified: grass-addons/grass7/raster/r.hazard.flood/r.hazard.flood.html
===================================================================
--- grass-addons/grass7/raster/r.hazard.flood/r.hazard.flood.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.hazard.flood/r.hazard.flood.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -44,7 +44,7 @@
<h2>EXAMPLE</h2>
<div class="code"><pre>
-g.region rast=elevation -ap
+g.region raster=elevation -ap
r.hazard.flood map=elevation flood=flood mti=mti
</pre></div>
Modified: grass-addons/grass7/raster/r.lake.series/r.lake.series.html
===================================================================
--- grass-addons/grass7/raster/r.lake.series/r.lake.series.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.lake.series/r.lake.series.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -25,7 +25,7 @@
Carolina sample dataset and included also visualization examples.
<div class="code"><pre>
# set computational region
-g.region rast=elev_lid792_1m
+g.region raster=elev_lid792_1m
# prepare input data
v.to.rast -d input=streams output=rural_streams use=val val=1
Modified: grass-addons/grass7/raster/r.le.patch/driver.c
===================================================================
--- grass-addons/grass7/raster/r.le.patch/driver.c 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.le.patch/driver.c 2014-12-27 13:30:46 UTC (rev 63779)
@@ -549,49 +549,49 @@
rather than floating point or int */
if (choice->att[1]) {
if (G_find_raster("a1", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a1,a1bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=a1,a1bak");
system(cmdbuf);
}
a1 = Rast_open_new("a1", DCELL_TYPE);
}
if (choice->att[2]) {
if (G_find_raster("a2", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a2,a2bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=a2,a2bak");
system(cmdbuf);
}
a2 = Rast_open_new("a2", DCELL_TYPE);
}
if (choice->att[3]) {
if (G_find_raster("a3", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a3,a3bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=a3,a3bak");
system(cmdbuf);
}
a3 = Rast_open_new("a3", DCELL_TYPE);
}
if (choice->att[4]) {
if (G_find_raster("a4", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a4,a4bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=a4,a4bak");
system(cmdbuf);
}
a4 = Rast_open_new("a4", DCELL_TYPE);
}
if (choice->att[5]) {
if (G_find_raster("a5", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a5,a5bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=a5,a5bak");
system(cmdbuf);
}
a5 = Rast_open_new("a5", DCELL_TYPE);
}
if (choice->att[6]) {
if (G_find_raster("a6", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a6,a6bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=a6,a6bak");
system(cmdbuf);
}
a6 = Rast_open_new("a6", DCELL_TYPE);
}
if (choice->att[7]) {
if (G_find_raster("a7", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a7,a7bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=a7,a7bak");
system(cmdbuf);
}
a7 = Rast_open_new("a7", DCELL_TYPE);
@@ -599,7 +599,7 @@
if (choice->att[8]) {
if (G_find_raster("a8", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a8,a8bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=a8,a8bak");
system(cmdbuf);
}
a8 = Rast_open_new("a8", DCELL_TYPE);
@@ -607,42 +607,42 @@
if (choice->size[1]) {
if (G_find_raster("s1", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s1,s1bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=s1,s1bak");
system(cmdbuf);
}
s1 = Rast_open_new("s1", DCELL_TYPE);
}
if (choice->size[2]) {
if (G_find_raster("s2", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s2,s2bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=s2,s2bak");
system(cmdbuf);
}
s2 = Rast_open_new("s2", DCELL_TYPE);
}
if (choice->size[3]) {
if (G_find_raster("s3", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s3,s3bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=s3,s3bak");
system(cmdbuf);
}
s3 = Rast_open_new("s3", DCELL_TYPE);
}
if (choice->size[4]) {
if (G_find_raster("s4", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s4,s4bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=s4,s4bak");
system(cmdbuf);
}
s4 = Rast_open_new("s4", DCELL_TYPE);
}
if (choice->size[5]) {
if (G_find_raster("s5", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s5,s5bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=s5,s5bak");
system(cmdbuf);
}
s5 = Rast_open_new("s5", DCELL_TYPE);
}
if (choice->size[6]) {
if (G_find_raster("s6", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s6,s6bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=s6,s6bak");
system(cmdbuf);
}
s6 = Rast_open_new("s6", DCELL_TYPE);
@@ -650,7 +650,7 @@
if (choice->size[7]) {
if (G_find_raster("s7", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s7,s7bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=s7,s7bak");
system(cmdbuf);
}
s7 = Rast_open_new("s7", DCELL_TYPE);
@@ -658,7 +658,7 @@
if (choice->size[8]) {
if (G_find_raster("s8", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s8,s8bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=s8,s8bak");
system(cmdbuf);
}
s8 = Rast_open_new("s8", DCELL_TYPE);
@@ -666,70 +666,70 @@
if (choice->core[1]) {
if (G_find_raster("c1", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c1,c1bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=c1,c1bak");
system(cmdbuf);
}
c1 = Rast_open_new("c1", DCELL_TYPE);
}
if (choice->core[2]) {
if (G_find_raster("c2", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c2,c2bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=c2,c2bak");
system(cmdbuf);
}
c2 = Rast_open_new("c2", DCELL_TYPE);
}
if (choice->core[3]) {
if (G_find_raster("c3", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c3,c3bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=c3,c3bak");
system(cmdbuf);
}
c3 = Rast_open_new("c3", DCELL_TYPE);
}
if (choice->core[4]) {
if (G_find_raster("c4", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c4,c4bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=c4,c4bak");
system(cmdbuf);
}
c4 = Rast_open_new("c4", DCELL_TYPE);
}
if (choice->core[5]) {
if (G_find_raster("c5", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c5,c5bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=c5,c5bak");
system(cmdbuf);
}
c5 = Rast_open_new("c5", DCELL_TYPE);
}
if (choice->core[6]) {
if (G_find_raster("c6", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c6,c6bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=c6,c6bak");
system(cmdbuf);
}
c6 = Rast_open_new("c6", DCELL_TYPE);
}
if (choice->core[7]) {
if (G_find_raster("c7", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c7,c7bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=c7,c7bak");
system(cmdbuf);
}
c7 = Rast_open_new("c7", DCELL_TYPE);
}
if (choice->core[8]) {
if (G_find_raster("c8", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c8,c8bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=c8,c8bak");
system(cmdbuf);
}
c8 = Rast_open_new("c8", DCELL_TYPE);
}
if (choice->core[9]) {
if (G_find_raster("c9", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c9,c9bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=c9,c9bak");
system(cmdbuf);
}
c9 = Rast_open_new("c9", DCELL_TYPE);
}
if (choice->core[10]) {
if (G_find_raster("c10", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c10,c10bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=c10,c10bak");
system(cmdbuf);
}
c10 = Rast_open_new("c10", DCELL_TYPE);
@@ -737,42 +737,42 @@
if (choice->shape[1]) {
if (G_find_raster("h1", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h1,h1bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=h1,h1bak");
system(cmdbuf);
}
h1 = Rast_open_new("h1", DCELL_TYPE);
}
if (choice->shape[2]) {
if (G_find_raster("h2", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h2,h2bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=h2,h2bak");
system(cmdbuf);
}
h2 = Rast_open_new("h2", DCELL_TYPE);
}
if (choice->shape[3]) {
if (G_find_raster("h3", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h3,h3bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=h3,h3bak");
system(cmdbuf);
}
h3 = Rast_open_new("h3", DCELL_TYPE);
}
if (choice->shape[4]) {
if (G_find_raster("h4", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h4,h4bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=h4,h4bak");
system(cmdbuf);
}
h4 = Rast_open_new("h4", DCELL_TYPE);
}
if (choice->shape[5]) {
if (G_find_raster("h5", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h5,h5bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=h5,h5bak");
system(cmdbuf);
}
h5 = Rast_open_new("h5", DCELL_TYPE);
}
if (choice->shape[6]) {
if (G_find_raster("h6", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h6,h6bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=h6,h6bak");
system(cmdbuf);
}
h6 = Rast_open_new("h6", DCELL_TYPE);
@@ -780,7 +780,7 @@
if (choice->boundary[1]) {
if (G_find_raster("n1", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n1,n1bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=n1,n1bak");
system(cmdbuf);
}
n1 = Rast_open_new("n1", DCELL_TYPE);
@@ -788,7 +788,7 @@
if (choice->boundary[2]) {
if (G_find_raster("n2", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n2,n2bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=n2,n2bak");
system(cmdbuf);
}
n2 = Rast_open_new("n2", DCELL_TYPE);
@@ -796,7 +796,7 @@
if (choice->boundary[3]) {
if (G_find_raster("n3", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n3,n3bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=n3,n3bak");
system(cmdbuf);
}
n3 = Rast_open_new("n3", DCELL_TYPE);
@@ -804,7 +804,7 @@
if (choice->boundary[4]) {
if (G_find_raster("n4", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n4,n4bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=n4,n4bak");
system(cmdbuf);
}
n4 = Rast_open_new("n4", DCELL_TYPE);
@@ -812,42 +812,42 @@
if (choice->perim[1]) {
if (G_find_raster("p1", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p1,p1bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=p1,p1bak");
system(cmdbuf);
}
p1 = Rast_open_new("p1", DCELL_TYPE);
}
if (choice->perim[2]) {
if (G_find_raster("p2", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p2,p2bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=p2,p2bak");
system(cmdbuf);
}
p2 = Rast_open_new("p2", DCELL_TYPE);
}
if (choice->perim[3]) {
if (G_find_raster("p3", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p3,p3bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=p3,p3bak");
system(cmdbuf);
}
p3 = Rast_open_new("p3", DCELL_TYPE);
}
if (choice->perim[4]) {
if (G_find_raster("p4", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p4,p4bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=p4,p4bak");
system(cmdbuf);
}
p4 = Rast_open_new("p4", DCELL_TYPE);
}
if (choice->perim[5]) {
if (G_find_raster("p5", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p5,p5bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=p5,p5bak");
system(cmdbuf);
}
p5 = Rast_open_new("p5", DCELL_TYPE);
}
if (choice->perim[6]) {
if (G_find_raster("p6", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p6,p6bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=p6,p6bak");
system(cmdbuf);
}
p6 = Rast_open_new("p6", DCELL_TYPE);
Modified: grass-addons/grass7/raster/r.le.pixel/driver.c
===================================================================
--- grass-addons/grass7/raster/r.le.pixel/driver.c 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.le.pixel/driver.c 2014-12-27 13:30:46 UTC (rev 63779)
@@ -195,28 +195,28 @@
if (choice->att[1]) {
if (G_find_raster("b1", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b1,b1bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=b1,b1bak");
system(cmdbuf);
}
b1 = Rast_open_new("b1", DCELL_TYPE);
}
if (choice->att[2]) {
if (G_find_raster("b2", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b2,b2bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=b2,b2bak");
system(cmdbuf);
}
b2 = Rast_open_new("b2", DCELL_TYPE);
}
if (choice->att[3]) {
if (G_find_raster("b3", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b3,b3bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=b3,b3bak");
system(cmdbuf);
}
b3 = Rast_open_new("b3", DCELL_TYPE);
}
if (choice->att[4]) {
if (G_find_raster("b4", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b4,b4bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=b4,b4bak");
system(cmdbuf);
}
b4 = Rast_open_new("b4", DCELL_TYPE);
@@ -224,28 +224,28 @@
if (choice->div[1]) {
if (G_find_raster("d1", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d1,d1bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=d1,d1bak");
system(cmdbuf);
}
d1 = Rast_open_new("d1", DCELL_TYPE);
}
if (choice->div[2]) {
if (G_find_raster("d2", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d2,d2bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=d2,d2bak");
system(cmdbuf);
}
d2 = Rast_open_new("d2", DCELL_TYPE);
}
if (choice->div[3]) {
if (G_find_raster("d3", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d3,d3bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=d3,d3bak");
system(cmdbuf);
}
d3 = Rast_open_new("d3", DCELL_TYPE);
}
if (choice->div[4]) {
if (G_find_raster("d4", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d4,d4bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=d4,d4bak");
system(cmdbuf);
}
d4 = Rast_open_new("d4", DCELL_TYPE);
@@ -253,35 +253,35 @@
if (choice->te2[1]) {
if (G_find_raster("t1", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t1,t1bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=t1,t1bak");
system(cmdbuf);
}
t1 = Rast_open_new("t1", DCELL_TYPE);
}
if (choice->te2[2]) {
if (G_find_raster("t2", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t2,t2bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=t2,t2bak");
system(cmdbuf);
}
t2 = Rast_open_new("t2", DCELL_TYPE);
}
if (choice->te2[3]) {
if (G_find_raster("t3", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t3,t3bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=t3,t3bak");
system(cmdbuf);
}
t3 = Rast_open_new("t3", DCELL_TYPE);
}
if (choice->te2[4]) {
if (G_find_raster("t4", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t4,t4bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=t4,t4bak");
system(cmdbuf);
}
t4 = Rast_open_new("t4", DCELL_TYPE);
}
if (choice->te2[5]) {
if (G_find_raster("t5", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t5,t5bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=t5,t5bak");
system(cmdbuf);
}
t5 = Rast_open_new("t5", DCELL_TYPE);
@@ -289,28 +289,28 @@
if (choice->jux[1]) {
if (G_find_raster("j1", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=j1,j1bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=j1,j1bak");
system(cmdbuf);
}
j1 = Rast_open_new("j1", DCELL_TYPE);
}
if (choice->jux[2]) {
if (G_find_raster("j2", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=j2,j2bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=j2,j2bak");
system(cmdbuf);
}
j2 = Rast_open_new("j2", DCELL_TYPE);
}
if (choice->edg[1]) {
if (G_find_raster("e1", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=e1,e1bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=e1,e1bak");
system(cmdbuf);
}
e1 = Rast_open_new("e1", DCELL_TYPE);
}
if (choice->edg[2]) {
if (G_find_raster("e2", G_mapset()) != NULL) {
- sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=e2,e2bak");
+ sprintf(cmdbuf, "%s %s", "g.rename --o", "raster=e2,e2bak");
system(cmdbuf);
}
e2 = Rast_open_new("e2", DCELL_TYPE);
Modified: grass-addons/grass7/raster/r.lfp/r.lfp.py
===================================================================
--- grass-addons/grass7/raster/r.lfp/r.lfp.py 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.lfp/r.lfp.py 2014-12-27 13:30:46 UTC (rev 63779)
@@ -104,7 +104,7 @@
grass.fatal(_("Cannot create longest flow path raster map"))
grass.run_command("g.remove", flags="f",
- type="rast,vect", pattern="%s*" % prefix)
+ type="raster,vector", pattern="%s*" % prefix)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass-addons/grass7/raster/r.los/r.los.html
===================================================================
--- grass-addons/grass7/raster/r.los/r.los.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.los/r.los.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -58,10 +58,10 @@
on top of a mountain:
<div class="code"><pre>
-g.region rast=elevation.dem -p
+g.region raster=elevation.dem -p
r.los elevation.dem out=los coord=598869,4916642 obs_elev=50 max_dist=10000
r.colors -e los color=bgyr
-d.shadedmap relief=aspect drape=los bright=10
+d.shade shade=aspect color=los bright=10
echo "symbol extra/target 25 598869 4916642 red" | d.graph -m
</pre></div>
Modified: grass-addons/grass7/raster/r.mess/r.mess
===================================================================
--- grass-addons/grass7/raster/r.mess/r.mess 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.mess/r.mess 2014-12-27 13:30:46 UTC (rev 63779)
@@ -376,7 +376,7 @@
citiam <- system("g.findfile --quiet element=cell file=MASK", ignore.stdout = TRUE)
if(citiam==0){
rname <- paste("MASK",paste(sample(c(0:9, letters, LETTERS), 12, replace=TRUE), collapse=""), sep="_")
- execGRASS("g.copy", rast=paste("MASK", rname, sep=","))
+ execGRASS("g.copy", raster=paste("MASK", rname, sep=","))
system("g.remove -bf type=rast name=MASK")
}
@@ -421,7 +421,7 @@
# geographic areas outside the current region
if(citiam==0){
execGRASS("r.mask", flags="overwrite", raster=rname)
- execGRASS("g.remove", flags="f", type="rast", name=rname)
+ execGRASS("g.remove", flags="f", type="raster", name=rname)
}else{
execGRASS("r.mask", flags="r")
}
@@ -441,7 +441,7 @@
calcc <- paste(z1, z2, z3, z4, sep="")
execGRASS("r.mapcalc", expression=paste(opi[i], " = ", calcc, sep=""), flags="overwrite")
execGRASS("r.mapcalc", expression=paste(opi[i], " = ", opi[i], "/", digits2, ".0", sep=""), flags="overwrite")
- execGRASS("g.remove", flags="bf", type="rast", name=paste(tmpf0, tmpf1, tmpf2, tmpf3, sep=","))
+ execGRASS("g.remove", flags="bf", type="raster", name=paste(tmpf0, tmpf1, tmpf2, tmpf3, sep=","))
unlink(tmp.rule)
}
}else{
@@ -505,7 +505,7 @@
z4 <- paste(", (", envmax, ".0- double(", ipl2[i], "))/(", envmax, ".0-", envmin, ".0) * 100.0)))", sep="")
calcc <- paste(z1, z2, z3, z4, sep="")
execGRASS("r.mapcalc", expression=paste(opi[i], "=", calcc), flags="overwrite")
- execGRASS("g.remove", flags="f", type="rast", name=tmpv1)
+ execGRASS("g.remove", flags="f", type="raster", name=tmpv1)
unlink(tmp.rule)
}
}
Modified: grass-addons/grass7/raster/r.northerness.easterness/r.northerness.easterness.html
===================================================================
--- grass-addons/grass7/raster/r.northerness.easterness/r.northerness.easterness.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.northerness.easterness/r.northerness.easterness.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -38,7 +38,7 @@
<div class="code">
<pre>
# align region to DEM and habitat vector
- g.region -a rast=DEM align=DEM
+ g.region -a raster=DEM align=DEM
# run <em>r.northerness.easterness</em>
r.northerness.easterness elevation=DEM
@@ -64,4 +64,4 @@
<p>
<i>Last changed: $Date$</i>
-</p>
\ No newline at end of file
+</p>
Modified: grass-addons/grass7/raster/r.northerness.easterness/r.northerness.easterness.py
===================================================================
--- grass-addons/grass7/raster/r.northerness.easterness/r.northerness.easterness.py 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.northerness.easterness/r.northerness.easterness.py 2014-12-27 13:30:46 UTC (rev 63779)
@@ -114,11 +114,11 @@
# clean up some temporay files and maps
grass.message( "Some clean up ..." )
- grass.run_command("g.remove", flags="f", type="rast", name= r_slope,
+ grass.run_command("g.remove", flags="f", type="raster", name= r_slope,
quiet = True)
- grass.run_command("g.remove", flags="f", type="rast", name= r_aspect,
+ grass.run_command("g.remove", flags="f", type="raster", name= r_aspect,
quiet = True)
- grass.run_command("g.remove", flags="f", type="rast", name= r_aspect_compass,
+ grass.run_command("g.remove", flags="f", type="raster", name= r_aspect_compass,
quiet = True)
grass.message( "Clean up done." )
grass.message( "----" )
Modified: grass-addons/grass7/raster/r.segment/r.segment.html
===================================================================
--- grass-addons/grass7/raster/r.segment/r.segment.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.segment/r.segment.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -94,7 +94,7 @@
<div><pre class="code">
# set the region to match the <em>ortho_2001_t792_1m</em> raster map:
-g.region rast=ortho_2001_t792_1m -p
+g.region raster=ortho_2001_t792_1m -p
# select a smaller region:
g.region n=221725 s=220225 w=638350 e=639550 -p
Modified: grass-addons/grass7/raster/r.skyview/r.skyview.html
===================================================================
--- grass-addons/grass7/raster/r.skyview/r.skyview.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.skyview/r.skyview.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -16,7 +16,7 @@
dataset <tt>elevation</tt> map:
<div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
r.skyview input=elevation output=elevation_skyview ndir=8
</pre></div>
Modified: grass-addons/grass7/raster/r.stream.basins/io.c
===================================================================
--- grass-addons/grass7/raster/r.stream.basins/io.c 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.basins/io.c 2014-12-27 13:30:46 UTC (rev 63779)
@@ -77,7 +77,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
/* checking if input map is of required type */
@@ -426,7 +426,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
if (check_data_type != seg->data_type)
Modified: grass-addons/grass7/raster/r.stream.channel/io.c
===================================================================
--- grass-addons/grass7/raster/r.stream.channel/io.c 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.channel/io.c 2014-12-27 13:30:46 UTC (rev 63779)
@@ -77,7 +77,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
/* checking if input map is of required type */
@@ -426,7 +426,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
if (check_data_type != seg->data_type)
Modified: grass-addons/grass7/raster/r.stream.channel/r.stream.channel.html
===================================================================
--- grass-addons/grass7/raster/r.stream.channel/r.stream.channel.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.channel/r.stream.channel.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -90,7 +90,7 @@
stream of the catchment:
<div class="code"><pre>
-g.region -p -a rast=elevation
+g.region -p -a raster=elevation
r.watershed elevation=elevation threshold=10000 drainage=direction stream=streams
r.stream.order streams=streams direction=direction hack=hack
r.stream.channel streams=hack direction=direction elevation=elevation \
Modified: grass-addons/grass7/raster/r.stream.distance/io.c
===================================================================
--- grass-addons/grass7/raster/r.stream.distance/io.c 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.distance/io.c 2014-12-27 13:30:46 UTC (rev 63779)
@@ -77,7 +77,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
/* checking if input map is of required type */
@@ -426,7 +426,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
if (check_data_type != seg->data_type)
Modified: grass-addons/grass7/raster/r.stream.distance/r.stream.distance.html
===================================================================
--- grass-addons/grass7/raster/r.stream.distance/r.stream.distance.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.distance/r.stream.distance.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -144,7 +144,7 @@
<div class="code"><pre>
# Set the region to match with elevation map
-g.region -ap rast=elevation
+g.region -pa raster=elevation
# Calculate flow direction and stream network
r.watershed elevation=elevation threshold=10000 drainage=direction stream=streams
Modified: grass-addons/grass7/raster/r.stream.order/io.c
===================================================================
--- grass-addons/grass7/raster/r.stream.order/io.c 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.order/io.c 2014-12-27 13:30:46 UTC (rev 63779)
@@ -77,7 +77,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
/* checking if input map is of required type */
@@ -426,7 +426,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
if (check_data_type != seg->data_type)
Modified: grass-addons/grass7/raster/r.stream.order/r.stream.order.html
===================================================================
--- grass-addons/grass7/raster/r.stream.order/r.stream.order.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.order/r.stream.order.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -296,7 +296,7 @@
<h2>EXAMPLE</h2>
<div class="code"><pre>
-g.region -p -a rast=elevation
+g.region -p -a raster=elevation
r.watershed elevation=elevation threshold=10000 drainage=direction stream=streams
r.stream.order stream_rast=streams direction=direction strahler=riverorder_strahler \
horton=riverorder_horton shreve=riverorder_shreve hack=riverorder_hack \
Modified: grass-addons/grass7/raster/r.stream.segment/io.c
===================================================================
--- grass-addons/grass7/raster/r.stream.segment/io.c 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.segment/io.c 2014-12-27 13:30:46 UTC (rev 63779)
@@ -77,7 +77,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
/* checking if input map is of required type */
@@ -426,7 +426,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
if (check_data_type != seg->data_type)
Modified: grass-addons/grass7/raster/r.stream.segment/r.stream.segment.html
===================================================================
--- grass-addons/grass7/raster/r.stream.segment/r.stream.segment.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.segment/r.stream.segment.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -176,7 +176,7 @@
<h2>EXAMPLE</h2>
<div class="code"><pre>
-g.region -p -a rast=elevation
+g.region -p -a raster=elevation
r.watershed elevation=elevation threshold=10000 drainage=direction stream=streams
r.stream.order stream_vect=streams direction=direction strahler=riverorder_strahler
r.stream.segment stream_rast=riverorder_strahler direction=direction \
Modified: grass-addons/grass7/raster/r.stream.slope/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.slope/main.c 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.slope/main.c 2014-12-27 13:30:46 UTC (rev 63779)
@@ -120,7 +120,7 @@
Rast_get_cellhd(in_dir_opt->answer, mapset, &cellhd);
if (window.ew_res != cellhd.ew_res || window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
in_dir_opt->answer, in_dir_opt->answer);
if (Rast_map_type(in_dir_opt->answer, mapset) != CELL_TYPE)
Modified: grass-addons/grass7/raster/r.stream.slope/r.stream.slope.html
===================================================================
--- grass-addons/grass7/raster/r.stream.slope/r.stream.slope.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.slope/r.stream.slope.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -47,7 +47,7 @@
<h2>EXAMPLE</h2>
<div class="code"><pre>
-g.region -p -a rast=elevation
+g.region -p -a raster=elevation
r.watershed elevation=elevation threshold=10000 drainage=dirs stream=streams
r.stream.slope dir=dirs elevation=elevation difference=downstream_elev_difference \
gradient=downstream_gradient maxcurv=downstream_maxcurv mincurv=downstream_mincurv
Modified: grass-addons/grass7/raster/r.stream.snap/io.c
===================================================================
--- grass-addons/grass7/raster/r.stream.snap/io.c 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.snap/io.c 2014-12-27 13:30:46 UTC (rev 63779)
@@ -77,7 +77,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
/* checking if input map is of required type */
@@ -426,7 +426,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
if (check_data_type != seg->data_type)
Modified: grass-addons/grass7/raster/r.stream.snap/r.stream.snap.html
===================================================================
--- grass-addons/grass7/raster/r.stream.snap/r.stream.snap.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.snap/r.stream.snap.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -96,7 +96,7 @@
<h2>EXAMPLE</h2>
<div class="code"><pre>
-g.region -p -a rast=elevation
+g.region -p -a raster=elevation
r.watershed elevation=elevation threshold=10000 drainage=dirs stream=streams accumulation=accum
# snap a point sampled in the riverine landscape to the calculated river network
r.stream.snap input=mysampleoutlet output=mysampleoutlet_snapped stream_rast=streams accumulation=accum
Modified: grass-addons/grass7/raster/r.stream.stats/io.c
===================================================================
--- grass-addons/grass7/raster/r.stream.stats/io.c 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.stats/io.c 2014-12-27 13:30:46 UTC (rev 63779)
@@ -77,7 +77,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
/* checking if input map is of required type */
@@ -426,7 +426,7 @@
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
- "Run 'g.region rast=%s' to set proper region resolution."),
+ "Run 'g.region raster=%s' to set proper region resolution."),
input_map_name, input_map_name);
if (check_data_type != seg->data_type)
Modified: grass-addons/grass7/raster/r.stream.stats/r.stream.stats.html
===================================================================
--- grass-addons/grass7/raster/r.stream.stats/r.stream.stats.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.stream.stats/r.stream.stats.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -164,7 +164,7 @@
external program (like R) to be visualised:
<div class="code"><pre>
-g.region -p -a rast=elevation
+g.region -p -a raster=elevation
r.watershed elevation=elevation threshold=10000 drainage=direction stream=streams
r.stream.stats stream_rast=horton direction=direction elevation=elevation
# export for processing in R
Modified: grass-addons/grass7/raster/r.surf.nnbathy/r.surf.nnbathy.html
===================================================================
--- grass-addons/grass7/raster/r.surf.nnbathy/r.surf.nnbathy.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.surf.nnbathy/r.surf.nnbathy.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -53,7 +53,7 @@
<h2>EXAMPLE</h2>
<div class="code"><pre>
-g.region rast=elevation at PERMANENT -p
+g.region raster=elevation at PERMANENT -p
r.random input=elevation at PERMANENT n=100000 raster_output=random_points
r.surf.nnbathy input=random_points output=raster_map
d.rast map=raster_map
Modified: grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.html
===================================================================
--- grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -22,7 +22,7 @@
(Spearfish dataset)
<div class="code"><pre>
-g.region rast=elevation.dem
+g.region raster=elevation.dem
r.to.vect.lines.py in=elevation.dem out=wiggle_lines
eval `v.info -g wiggle_lines`
r.mapcalc "floor = $bottom"
Modified: grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.py
===================================================================
--- grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.py 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.py 2014-12-27 13:30:46 UTC (rev 63779)
@@ -13,7 +13,7 @@
#############################################################################
#
# To make a wiggle line plot in NVIZ:
-# g.region rast=elevation.dem
+# g.region raster=elevation.dem
# r.to.vect.lines.py in=elevation.dem out=wiggle_lines
# eval `v.info -g wiggle_lines`
# r.mapcalc "floor = $bottom"
Modified: grass-addons/grass7/raster/r.traveltime/r.traveltime.html
===================================================================
--- grass-addons/grass7/raster/r.traveltime/r.traveltime.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.traveltime/r.traveltime.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -32,7 +32,7 @@
<i>This example uses the North Carolina sample dataset.</i>
<p>
<div class="code"><pre>
-g.region rast=elev_lid792_1m n=n+1 s=s-1 w=w-1 e=e+1 -p
+g.region raster=elev_lid792_1m n=n+1 s=s-1 w=w-1 e=e+1 -p
r.watershed elev_lid792_1m thresh=5000 accum=accum_5K drain=draindir_5K
r.fill.dir elev_lid792_1m output=elev_filled outdir=elev_dir
Modified: grass-addons/grass7/raster/r.univar2/r.univar2.html
===================================================================
--- grass-addons/grass7/raster/r.univar2/r.univar2.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.univar2/r.univar2.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -41,7 +41,7 @@
<div class="code"><pre>
#### set the raster region to match the map
-g.region vect=fields res=10 -ap
+g.region vector=fields res=10 -ap
#### create rasterized version of vector map
v.to.rast in=fields out=fields.10m use=cat type=area labelcolumn=label
@@ -55,7 +55,7 @@
#### populate vector DB with stats
# create working copy of vector map
-g.copy vect=fields,fields_stats
+g.copy vector=fields,fields_stats
# create new attribute columns to hold output
v.db.addcol map=fields_stats \
@@ -90,7 +90,7 @@
#### populate vector DB with stats
# create working copy of vector map
-g.copy vect=fields,fields_stats
+g.copy vector=fields,fields_stats
# create new attribute columns to hold output
v.db.addcol map=fields_stats \
Modified: grass-addons/grass7/raster/r.valley.bottom/r.valley.bottom.html
===================================================================
--- grass-addons/grass7/raster/r.valley.bottom/r.valley.bottom.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.valley.bottom/r.valley.bottom.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -16,7 +16,7 @@
<div class="code">
<pre>
# align region to DEM and habitat vector
- g.region -a rast=DEM align=DEM
+ g.region -a raster=DEM align=DEM
# run <em>r.valley.bottom</em>
r.r.valley.bottom elevation=DEM
@@ -51,4 +51,4 @@
<p>
<i>Last changed: $Date$</i>
-</p>
\ No newline at end of file
+</p>
Modified: grass-addons/grass7/raster/r.valley.bottom/r.valley.bottom.py
===================================================================
--- grass-addons/grass7/raster/r.valley.bottom/r.valley.bottom.py 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.valley.bottom/r.valley.bottom.py 2014-12-27 13:30:46 UTC (rev 63779)
@@ -99,7 +99,7 @@
grass.message( "..." )
- grass.run_command("g.remove", flags="f", type="rast", name= r_slope_degree,
+ grass.run_command("g.remove", flags="f", type="raster", name= r_slope_degree,
quiet = True)
grass.message( "Step 1: Calculation of slope done." )
grass.message( "----" )
@@ -231,7 +231,7 @@
expr2 = "PCTL2 = (100.0 / 48.0) * (%s)" % " + ".join(terms2)
grass.mapcalc( expr2 )
- grass.run_command("g.remove", flags="f", type="rast", name= "elevation_step1",
+ grass.run_command("g.remove", flags="f", type="raster", name= "elevation_step1",
quiet = True)
grass.message( "Step 2: Calculation of elevation percentile PCTL2 done" )
Modified: grass-addons/grass7/raster/r.vif/r.vif
===================================================================
--- grass-addons/grass7/raster/r.vif/r.vif 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/raster/r.vif/r.vif 2014-12-27 13:30:46 UTC (rev 63779)
@@ -159,7 +159,7 @@
eval `g.findfile element=cell file=MASK mapset=$MAPSET`
remove_mask=1
if [ $file ] ; then
- g.copy rast=MASK,mask_r_vif_backup
+ g.copy raster=MASK,mask_r_vif_backup
mask_exists=1
unset file
fi
Modified: grass-addons/grass7/vector/v.area.weigh/v.area.weigh.html
===================================================================
--- grass-addons/grass7/vector/v.area.weigh/v.area.weigh.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/vector/v.area.weigh/v.area.weigh.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -19,7 +19,7 @@
<div class="code"><pre>
# set computational region to raster ...
-g.region -p rast=...
+g.region -p raster=...
# extract urban areas
r.mapcalc "urban = if(...)"
Modified: grass-addons/grass7/vector/v.colors2/v.colors2.html
===================================================================
--- grass-addons/grass7/vector/v.colors2/v.colors2.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/vector/v.colors2/v.colors2.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -41,7 +41,7 @@
<p>
Colorizing the roads map in Spearfish:
<div class="code"><pre>
-g.copy vect=roads,myroads
+g.copy vector=roads,myroads
echo "1 red
2 yellow
3 orange
Modified: grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.html
===================================================================
--- grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -191,7 +191,7 @@
<div class="code">
<pre>
# align region to DEM and habitat vector
- g.region -a rast=DEM vect=myhabitats align=DEM
+ g.region -a raster=DEM vect=myhabitats align=DEM
# run <em>v.habitat.dem</em>
v.habitat.dem elevation=DEM vector=myhabitats column=Id prefix=a dir=C:\wd
@@ -240,4 +240,4 @@
<p>
<i>Last changed: $Date$</i>
-</p>
\ No newline at end of file
+</p>
Modified: grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.py
===================================================================
--- grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.py 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.py 2014-12-27 13:30:46 UTC (rev 63779)
@@ -513,8 +513,8 @@
# clean up some temporay files and maps
grass.message( "Some clean up ..." )
grass.run_command("g.remove", flags="f", type="region", name= saved_region)
- grass.run_command("g.remove", flags="f", type="rast", name= r_flow_accum)
- grass.run_command("g.remove", flags="f", type="rast", name= r_habitat)
+ grass.run_command("g.remove", flags="f", type="raster", name= r_flow_accum)
+ grass.run_command("g.remove", flags="f", type="raster", name= r_habitat)
grass.run_command("db.droptable", flags = 'f',
table = t_habitat_geomorphons)
grass.run_command("db.droptable", flags = 'f',
Modified: grass-addons/grass7/vector/v.isochrones/v.isochrones.html
===================================================================
--- grass-addons/grass7/vector/v.isochrones/v.isochrones.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/vector/v.isochrones/v.isochrones.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -26,13 +26,13 @@
<h2>EXAMPLE</h2>
<div class="code"><pre>
-g.copy vect=roadsmajor,roads
+g.copy vector=roadsmajor,roads
v.db.addcolumn roads col="speed int"
v.db.update roads col=speed value=120 where="ROAD_NAME='US-1'"
v.db.update roads col=speed value=90 where="(ROAD_NAME like 'US%' AND ROAD_NAME <> 'US-1') OR ROAD_NAME like 'I-%'"
v.db.update roads col=speed value=50 where="speed is null"
-g.region vect=roads res=100 -a -p
+g.region vector=roads res=100 -a -p
echo "634637|224663" | v.in.ascii input=- output=start x=1 y=2
Modified: grass-addons/grass7/vector/v.surf.mass/v.surf.mass.html
===================================================================
--- grass-addons/grass7/vector/v.surf.mass/v.surf.mass.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/vector/v.surf.mass/v.surf.mass.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -23,7 +23,7 @@
<div class="code"><pre>
# setting the region
-g.region -p rast=elev_state_500m
+g.region -p raster=elev_state_500m
# create Voronoi diagram based on meteorological stations
v.voronoi input=precip_30ynormals output=precip_annual
Modified: grass-addons/grass7/vector/v.surf.nnbathy/v.surf.nnbathy.html
===================================================================
--- grass-addons/grass7/vector/v.surf.nnbathy/v.surf.nnbathy.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/vector/v.surf.nnbathy/v.surf.nnbathy.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -53,7 +53,7 @@
<h2>EXAMPLE</h2>
<div class="code"><pre>
-g.region rast=elevationelev_lid792_randpts at PERMANENT -p
+g.region raster=elevationelev_lid792_randpts at PERMANENT -p
v.surf.nnbathy input=elevation_lid792_randpts at PERMANENT output=raster_map column=value
d.rast map=raster_map
</pre></div>
Modified: grass-addons/grass7/vector/v.transects/v.transects.html
===================================================================
--- grass-addons/grass7/vector/v.transects/v.transects.html 2014-12-27 12:51:00 UTC (rev 63778)
+++ grass-addons/grass7/vector/v.transects/v.transects.html 2014-12-27 13:30:46 UTC (rev 63779)
@@ -28,7 +28,8 @@
<p>Generate 20 cross-shore transects along 2008 shoreline (1m contour)
<br>
-<div class=code><pre>g.region rast=NH_2008_1m
+<div class=code><pre>
+g.region raster=NH_2008_1m
r.contour input=NH_2008_1m output=NH_2008_1m level=1 cut=100
v.report map=NH_2008_1m option=length
# cat|level|length
@@ -44,7 +45,8 @@
Generate longer, more parallel transects by specifying dleft and dright and
smoothing the input line
<br>
-<div class=code><pre>g.region rast=NH_2008_1m
+<div class=code><pre>
+g.region raster=NH_2008_1m
r.contour input=NH_2008_1m output=NH_2008_1m level=1 cut=100
v.generalize input=NH_2008_1m output=NH_2008_1m_smoothed \
method=sliding_averaging look_ahead=201
@@ -58,7 +60,8 @@
<p>
Generate longer, more parallel transects by specifying dleft and dright and
smoothing the input line<br>
-<div class=code><pre>g.region rast=NH_2008_1m
+<div class=code><pre>
+g.region raster=NH_2008_1m
r.contour input=NH_2008_1m output=NH_2008_1m level=1 cut=100
v.transects input=NH_2008_1m output=NH_2008_areas \
transect_spacing=52 dleft=20 dright=300 type=area
More information about the grass-commit
mailing list