[GRASS-SVN] r65316 - in grass/trunk: raster/r.surf.contour vector/v.to.db vector/v.to.rast

Mon May 25 12:04:19 PDT 2015

Author: neteler
Date: 2015-05-25 12:04:19 -0700 (Mon, 25 May 2015)
New Revision: 65316

Modified:
   grass/trunk/raster/r.surf.contour/r.surf.contour.html
   grass/trunk/vector/v.to.db/v.to.db.html
   grass/trunk/vector/v.to.rast/v.to.rast.html
Log:
manual: fix v.to.rast examples; HTML cosmetics

Modified: grass/trunk/raster/r.surf.contour/r.surf.contour.html
===================================================================

--- grass/trunk/raster/r.surf.contour/r.surf.contour.html	2015-05-25 19:03:44 UTC (rev 65315)
+++ grass/trunk/raster/r.surf.contour/r.surf.contour.html	2015-05-25 19:04:19 UTC (rev 65316)
@@ -81,7 +81,7 @@
 
 # rasterize contour lines
 v.info -c contours_5m
-v.to.rast input=contours_5m output=contours_5m use=attr column=level
+v.to.rast input=contours_5m output=contours_5m use=attr attribute_column=level
 
 # generate DEM from rasterized contour lines
 r.surf.contour input=contours_5m output=elevation_from_cont5m

Modified: grass/trunk/vector/v.to.db/v.to.db.html
===================================================================
--- grass/trunk/vector/v.to.db/v.to.db.html	2015-05-25 19:03:44 UTC (rev 65315)
+++ grass/trunk/vector/v.to.db/v.to.db.html	2015-05-25 19:04:19 UTC (rev 65316)
@@ -48,30 +48,30 @@
 
 <p>Upload polygon areas to corresponding centroid record in the attribute table:<br>
 <div class="code"><pre>
-v.to.db map=soils type=centroid option=area col=area_size unit=h
+v.to.db map=soils type=centroid option=area columns=area_size unit=h
 </pre></div>
 
 <p>Upload line lengths (in meters) of each vector line to attribute table
 (use <em>v.category</em> in case of missing categories):<br>
 <div class="code"><pre>
-v.to.db map=roads option=length type=line col=linelength units=me
+v.to.db map=roads option=length type=line columns=linelength units=me
 </pre></div>
 
 <p>Upload x and y coordinates from vector geometry to attribute table:<br>
 <div class="code"><pre>
-v.to.db map=pointsmap option=coor col=x,y
+v.to.db map=pointsmap option=coor columns=x,y
 </pre></div>
 
 <p>Upload x, y and z coordinates from vector geometry to attribute table:<br>
 <div class="code"><pre>
-v.to.db map=pointsmap option=coor col=x,y,z
+v.to.db map=pointsmap option=coor columns=x,y,z
 </pre></div>
 
 <p>Transfer attributes from a character column (with numeric contents) to a new
 integer column:<br>
 <div class="code"><pre>
 v.db.addcolumn usa_income_employment2002 col="FIPS_NUM integer"
-v.to.db usa_income_employment2002 option=query col=FIPS_NUM qcol=STATE_FIPS
+v.to.db usa_income_employment2002 option=query columns=FIPS_NUM query_column=STATE_FIPS
 </pre></div>
 
 <p>Upload category numbers of left and right area, to an attribute table of
@@ -81,14 +81,15 @@
 v.category soils out=mysoils layer=2 type=boundary option=add
 # add a table with columns named "left" and "right" to layer 2 of the input
 # vector map:
-v.db.addtable mysoils layer=2 col="left integer,right integer"
+v.db.addtable mysoils layer=2 columns="left integer,right integer"
 # upload categories of left and right areas:
-v.to.db mysoils option=sides col=left,right layer=2
+v.to.db mysoils option=sides columns=left,right layer=2
 # display the result:
 v.db.select mysoils layer=2
 </pre></div>
 
-<p>Compute D<sub>L</sub>, the Fractal Dimension (Mandelbrot, 1982), of the boundary defining a polygon based on the formula:
+<p>Compute D<sub>L</sub>, the Fractal Dimension (Mandelbrot, 1982), of the
+boundary defining a polygon based on the formula:
 <br><tt>
 D = 2 * (log perimeter) / (log area):<br>
 </tt>
@@ -98,10 +99,10 @@
 v.to.db mysoils option=fd column="d"
 
 g.region vector=mysoils res=50
-v.to.rast in=mysoils out=soils_fd type=area use=attr column=d
+v.to.rast input=mysoils output=soils_fd type=area use=attr attribute_column=d
 r.colors map=soils_fd color=gyr
 
-d.mon x0
+d.mon wx0
 d.rast.leg soils_fd
 d.vect mysoils type=boundary
 </pre></div>

Modified: grass/trunk/vector/v.to.rast/v.to.rast.html
===================================================================
--- grass/trunk/vector/v.to.rast/v.to.rast.html	2015-05-25 19:03:44 UTC (rev 65315)
+++ grass/trunk/vector/v.to.rast/v.to.rast.html	2015-05-25 19:04:19 UTC (rev 65316)
@@ -60,7 +60,8 @@
 
 <h2>EXAMPLES</h2>
 
-<em>1. Convert a vector map and use column SPEED from attribute table</em><br>
+<h3>Convert a vector map and use column SPEED from attribute table</h3>
+
 <div class="code"><pre>
 db.describe -c table=vect_map
 
@@ -71,17 +72,19 @@
 </pre></div>
 
 <div class="code"><pre>
-v.to.rast in=vect_map out=raster_map col=SPEED
+v.to.rast input=vect_map output=raster_map attribute_column=SPEED
 </pre></div>
 
-<p><p><em>2. Calculate stream directions from a river vector map (Spearfish)</em><br>
+<h3>Calculate stream directions from a river vector map (Spearfish)</h3>
+
 <div class="code"><pre>
-v.to.rast in=streams out=streamsdir use=dir
+v.to.rast input=streams output=streamsdir use=dir
 </pre></div>
 
-<p><p><em>3. Convert a vector polygon map to raster including descriptive labels (Spearfish)</em><br>
+<h3>Convert a vector polygon map to raster including descriptive labels (Spearfish)</h3>
+
 <div class="code"><pre>
-v.to.rast in=fields out=myfields use=attr col=cat labelcol=label
+v.to.rast input=fields output=myfields use=attr attribute_column=cat label_column=label
 r.category myfields
 </pre></div>
 
@@ -90,7 +93,6 @@
 <a href="db.describe.html">db.describe</a>,
 <a href="v.category.html">v.category</a>
 </em>
-<br>
 
 <h2>AUTHORS</h2>
 

