[GRASS-SVN] r63775 - in grass/trunk: general/g.list raster/r.patch raster/r.watershed/front scripts/i.spectral scripts/v.dissolve temporal/t.merge temporal/t.rast.aggregate.ds temporal/t.rast.gapfill temporal/t.rast.to.rast3 temporal/t.register temporal/t.remove temporal/t.sample temporal/t.shift temporal/t.snap temporal/t.unregister temporal/t.vect.import vector/v.distance vector/v.lrs/v.lrs.create

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Dec 26 15:33:07 PST 2014


Author: neteler
Date: 2014-12-26 15:33:06 -0800 (Fri, 26 Dec 2014)
New Revision: 63775

Modified:
   grass/trunk/general/g.list/g.list.html
   grass/trunk/raster/r.patch/r.patch.html
   grass/trunk/raster/r.watershed/front/r.watershed.html
   grass/trunk/scripts/i.spectral/i.spectral.html
   grass/trunk/scripts/v.dissolve/v.dissolve.html
   grass/trunk/temporal/t.merge/t.merge.html
   grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.html
   grass/trunk/temporal/t.rast.gapfill/t.rast.gapfill.html
   grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.html
   grass/trunk/temporal/t.register/t.register.html
   grass/trunk/temporal/t.remove/t.remove.html
   grass/trunk/temporal/t.sample/t.sample.html
   grass/trunk/temporal/t.shift/t.shift.html
   grass/trunk/temporal/t.snap/t.snap.html
   grass/trunk/temporal/t.unregister/t.unregister.html
   grass/trunk/temporal/t.vect.import/t.vect.import.html
   grass/trunk/vector/v.distance/v.distance.html
   grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html
Log:
docs: update examples to use new element names (#2409)

Modified: grass/trunk/general/g.list/g.list.html
===================================================================
--- grass/trunk/general/g.list/g.list.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/general/g.list/g.list.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -19,12 +19,12 @@
 List all vector maps as continuous, sorted list with MAPSET info (i.e.
 fully-qualified map names):
 <div class="code"><pre>
-g.list type=vect -m
+g.list type=vector -m
 </pre></div>
 
 List all raster and vector maps ordered by mapset:
 <div class="code"><pre>
-g.list type=rast -p
+g.list type=raster -p
 </pre></div>
 
 List all raster and vector maps as continuous, sorted list:
@@ -86,22 +86,22 @@
 
 List all vector maps starting with letter "r":
 <div class="code"><pre>
-g.list type=vect pattern="r*"
+g.list type=vector pattern="r*"
 </pre></div>
 
 List all vector maps starting with letter "r" or "a":
 <div class="code"><pre>
-g.list type=vect pattern="[ra]*"
+g.list type=vector pattern="[ra]*"
 </pre></div>
 
 List all raster maps starting with "soil_" or "landuse_":
 <div class="code"><pre>
-g.list type=rast pattern="{soil,landuse}_*"
+g.list type=raster pattern="{soil,landuse}_*"
 </pre></div>
 
 List certain raster maps with one variable character/number:
 <div class="code"><pre>
-g.list type=rast pattern="N45E00?.meters"
+g.list type=raster pattern="N45E00?.meters"
 </pre></div>
 
 Use of <b>exclude</b> parameter:
@@ -129,31 +129,31 @@
 
 List all soil maps starting with "soils" in their name:
 <div class="code"><pre>
-g.list -r type=rast pattern='^soils'
+g.list -r type=raster pattern='^soils'
 </pre></div>
 
 List "tmp" if "tmp" raster map exists:
 <div class="code"><pre>
-g.list -r type=rast pattern='^tmp$'
+g.list -r type=raster pattern='^tmp$'
 </pre></div>
 
 List "tmp0" ..."tmp9" if corresponding vector map exists
 (each map name linewise):
 <div class="code"><pre>
-g.list -r type=vect pattern='^tmp[0-9]$'
+g.list -r type=vector pattern='^tmp[0-9]$'
 </pre></div>
 
 List "tmp0"..."tmp9" if corresponding vector map exists
 (each map name comma separated):
 <div class="code"><pre>
-g.list -r type=vect separator=comma pattern='^tmp[0-9]$'
+g.list -r type=vector separator=comma pattern='^tmp[0-9]$'
 </pre></div>
 
 <h3>Extended regular expressions</h3>
 
 List all precipitation maps for the years 1997-2012, comma separated:
 <div class="code"><pre>
-g.list -e type=rast separator=comma pattern="precip_total.(199[7-9]|200[0-9]|201[0-2]).sum"
+g.list -e type=raster separator=comma pattern="precip_total.(199[7-9]|200[0-9]|201[0-2]).sum"
 </pre></div>
 
 <h3>Maps whose region overlaps with a saved region</h3>
@@ -162,13 +162,13 @@
 the region of "test" raster map:
 <div class="code"><pre>
 g.region raster=test save=test_region
-g.list type=rast pattern='tmp_*' region=test_region
+g.list type=raster pattern='tmp_*' region=test_region
 </pre></div>
 
 List "tmp0"..."tmp9" vector maps whose region overlaps with
 the current region:
 <div class="code"><pre>
-g.list -r type=vect pattern='^tmp[0-9]$' region=.
+g.list -r type=vector pattern='^tmp[0-9]$' region=.
 </pre></div>
 
 List all raster and vector maps whose region overlaps with the default region

Modified: grass/trunk/raster/r.patch/r.patch.html
===================================================================
--- grass/trunk/raster/r.patch/r.patch.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/raster/r.patch/r.patch.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -103,7 +103,7 @@
 used in the order listed.
 
 <div class="code"><pre>
-MAPS=`g.list type=rast sep=, pat="map_*"`
+MAPS=`g.list type=raster sep=, pat="map_*"`
 g.region raster=$MAPS
 r.patch in=$MAPS out=mosaic
 </pre></div>

Modified: grass/trunk/raster/r.watershed/front/r.watershed.html
===================================================================
--- grass/trunk/raster/r.watershed/front/r.watershed.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/raster/r.watershed/front/r.watershed.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -422,7 +422,7 @@
        abs(rwater.accum), \
        null() )"
   r.colors -g rwater.course col=bcyr
-  g.remove -f type=rast name=MASK
+  g.remove -f type=raster name=MASK
 
   # <i>Thinning is required before converting raster lines to vector</i>
   r.thin in=rwater.course out=rwater.course.Thin

Modified: grass/trunk/scripts/i.spectral/i.spectral.html
===================================================================
--- grass/trunk/scripts/i.spectral/i.spectral.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/scripts/i.spectral/i.spectral.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -29,7 +29,7 @@
 
 <div class="code"><pre>
 g.region raster=lsat7_2002_10 -p
-LIST=`g.list type=rast pattern="lsat7_2002_[1-5,7]0" separator=","`
+LIST=`g.list type=raster pattern="lsat7_2002_[1-5,7]0" separator=","`
 i.spectral input=$LIST coordinates=637502.25,221744.25
 </pre></div>
 

Modified: grass/trunk/scripts/v.dissolve/v.dissolve.html
===================================================================
--- grass/trunk/scripts/v.dissolve/v.dissolve.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/scripts/v.dissolve/v.dissolve.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -50,7 +50,7 @@
 
 <div class="code"><pre>
 # patch tiles after import:
-v.patch -e `g.list type=vect pat="clc2000_*" separator=","` out=clc2000_patched
+v.patch -e `g.list type=vector pat="clc2000_*" separator=","` out=clc2000_patched
 
 # remove duplicated tile boundaries:
 v.clean clc2000_patched out=clc2000_clean tool=snap,break,rmdupl thresh=.01

Modified: grass/trunk/temporal/t.merge/t.merge.html
===================================================================
--- grass/trunk/temporal/t.merge/t.merge.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/temporal/t.merge/t.merge.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -28,7 +28,7 @@
          title="Daily precipitation" \
          description="Test dataset with daily precipitation"
 
-t.register -i type=rast input=precipitation_daily_1 \
+t.register -i type=raster input=precipitation_daily_1 \
            maps=map1,map2 start=2012-08-20 increment="1 days"
 
 t.info precipitation_daily_1
@@ -94,7 +94,7 @@
          title="Daily precipitation" \
          description="Test dataset with daily precipitation"
 
-t.register -i type=rast input=precipitation_daily_2 \
+t.register -i type=raster input=precipitation_daily_2 \
            maps=map3,map4 start=2012-08-22 increment="1 days"
 
 t.info precipitation_daily_2

Modified: grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.html
===================================================================
--- grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -47,7 +47,7 @@
          title="Daily precipitation" \
          description="Test dataset with daily precipitation"
 
-t.register -i type=rast input=precipitation_daily \
+t.register -i type=raster input=precipitation_daily \
            file=map_list.txt start="2012-08-20" increment="1 days"
 
 t.info type=strds input=precipitation_daily
@@ -112,9 +112,9 @@
          title="Points" \
          description="Points for aggregation"
 
-t.register -i type=vect input=points \
+t.register -i type=vector input=points \
            map=points_1 start="2012-08-20" increment="3 days"
-t.register -i type=vect input=points \
+t.register -i type=vector input=points \
            map=points_2 start="2012-08-23" increment="4 days"
 
 t.info type=stvds input=points

Modified: grass/trunk/temporal/t.rast.gapfill/t.rast.gapfill.html
===================================================================
--- grass/trunk/temporal/t.rast.gapfill/t.rast.gapfill.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/temporal/t.rast.gapfill/t.rast.gapfill.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -24,16 +24,16 @@
 r.mapcalc expr="map2 = 3" 
 r.mapcalc expr="map3 = 5" 
 
-t.register type=rast maps=map1 start=2012-08-20 end=2012-08-21
-t.register type=rast maps=map2 start=2012-08-22 end=2012-08-23
-t.register type=rast maps=map3 start=2012-08-24 end=2012-08-25
+t.register type=raster maps=map1 start=2012-08-20 end=2012-08-21
+t.register type=raster maps=map2 start=2012-08-22 end=2012-08-23
+t.register type=raster maps=map3 start=2012-08-24 end=2012-08-25
 
 t.create type=strds temporaltype=absolute \
          output=precipitation_daily \
          title="Daily precipitation" \
          description="Test dataset with daily precipitation"
          
-t.register type=rast input=precipitation_daily maps=map1,map2,map3
+t.register type=raster input=precipitation_daily maps=map1,map2,map3
 
 t.rast.list input=precipitation_daily columns=name,start_time,min,max
 

Modified: grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.html
===================================================================
--- grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -42,7 +42,7 @@
 # convert to 3D raster map
 t.rast.to.rast3 in=tempmean_monthly_later_2012 at climate_2009_2012 out=tempmean_monthly_2012
 
-t.info type=rast3d input=tempmean_monthly_2012
+t.info type=raster_3d input=tempmean_monthly_2012
  +-------------------- 3D Raster Dataset -------------------------------------+
  |                                                                            |
  +-------------------- Basic information -------------------------------------+

Modified: grass/trunk/temporal/t.register/t.register.html
===================================================================
--- grass/trunk/temporal/t.register/t.register.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/temporal/t.register/t.register.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -84,7 +84,7 @@
 Register maps in a absolute space time dataset, creating a time interval
 
 <div class="code"><pre>
-t.register -i type=rast input=precipitation_monthly \
+t.register -i type=raster input=precipitation_monthly \
     maps=`g.list rast patt=*precip* sep=,` start=2009-01-01 \
     increment="1 months"
 </pre></div>
@@ -105,7 +105,7 @@
     output=precip_abs title="Example" \
     descr="Example"
 
-t.register -i type=rast input=precip_abs \
+t.register -i type=raster input=precip_abs \
     maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
     start="2001-01-01" increment="1 months"
 
@@ -128,7 +128,7 @@
 r.mapcalc expr="prec_7 = 700"
 r.timestamp map=prec_7 date="1 jul 2001 / 1 aug 2001"
 
-t.register type=rast input=precip_abs maps=prec_7
+t.register type=raster input=precip_abs maps=prec_7
 
 t.rast.list input=precip_abs
 

Modified: grass/trunk/temporal/t.remove/t.remove.html
===================================================================
--- grass/trunk/temporal/t.remove/t.remove.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/temporal/t.remove/t.remove.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -26,8 +26,8 @@
   North Carolina sample data location"
 
 #Register maps from sample dataset (selecting a subset with g.list)
-t.register -i type=rast input=precip_months_sum \
-  maps=$(g.list type=rast pattern=201*_precip separator=comma) \
+t.register -i type=raster input=precip_months_sum \
+  maps=$(g.list type=raster pattern=201*_precip separator=comma) \
   start="2010-01-01" increment="1 months"
 
 #Create some new data by aggregating with 1 years granularity

Modified: grass/trunk/temporal/t.sample/t.sample.html
===================================================================
--- grass/trunk/temporal/t.sample/t.sample.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/temporal/t.sample/t.sample.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -78,7 +78,7 @@
 t.create type=stvds temporaltype=absolute output=P \
     title="A test with vector input files" descr="A test with vector input files"
 
-t.register type=rast -i input=A file="${n1}" start="2001-01-01" increment="1 months"
+t.register type=raster -i input=A file="${n1}" start="2001-01-01" increment="1 months"
 
 # Raster map layer in A
 t.rast.list A
@@ -92,7 +92,7 @@
 a6|PERMANENT|2001-06-01 00:00:00|2001-07-01 00:00:00
 
 
-t.register type=vect input=P file="${n2}"
+t.register type=vector input=P file="${n2}"
 
 # Vector map layer in P
 t.vect.list P

Modified: grass/trunk/temporal/t.shift/t.shift.html
===================================================================
--- grass/trunk/temporal/t.shift/t.shift.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/temporal/t.shift/t.shift.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -44,7 +44,7 @@
          title="Daily precipitation" \
          description="Test dataset with daily precipitation"
 
-t.register -i type=rast input=precipitation_daily \
+t.register -i type=raster input=precipitation_daily \
            maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
            start=2012-01-01 increment="1 day"
 

Modified: grass/trunk/temporal/t.snap/t.snap.html
===================================================================
--- grass/trunk/temporal/t.snap/t.snap.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/temporal/t.snap/t.snap.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -28,8 +28,8 @@
          title="Monthly precipitation" \
          description="Dataset with monthly precipitation"
 
-t.register type=rast input=precipitation_monthly \
-           maps=`g.list type=rast patt=2012*precip sep=,` \
+t.register type=raster input=precipitation_monthly \
+           maps=`g.list type=raster patt=2012*precip sep=,` \
            start=2012-01-01 increment="1 months"
 
 # please take attention to "Temporal type of maps" value

Modified: grass/trunk/temporal/t.unregister/t.unregister.html
===================================================================
--- grass/trunk/temporal/t.unregister/t.unregister.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/temporal/t.unregister/t.unregister.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -36,17 +36,17 @@
 
 <div class="code"><pre>
 
-t.register -i type=rast input=tempmean_monthly at climate_2009_2012 \
+t.register -i type=raster input=tempmean_monthly at climate_2009_2012 \
     maps=2012_01_precip \
     start="2013-01-01" increment="1 month"
 
 # We unregister raster map 2012_01_precip from a space time dataset,
 # the raster maps are still present in the temporal database
-t.unregister type=rast input=tempmean_monthly at climate_2009_2012 maps=2012_01_precip
+t.unregister type=raster input=tempmean_monthly at climate_2009_2012 maps=2012_01_precip
 
 # We unregister raster map 2012_01_precip from the temporal database, hence
 # the time stamps are removed
-t.unregister type=rast maps=2012_01_precip
+t.unregister type=raster maps=2012_01_precip
 </pre></div>
 
 

Modified: grass/trunk/temporal/t.vect.import/t.vect.import.html
===================================================================
--- grass/trunk/temporal/t.vect.import/t.vect.import.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/temporal/t.vect.import/t.vect.import.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -26,7 +26,7 @@
          title="Random locations" \
          description="Vector test dataset with random locations"
 
-t.register -i type=vect input=random_locations \
+t.register -i type=vector input=random_locations \
            file=map_list.txt start="2012-01-01" increment="1 months"
 
 t.vect.list random_locations

Modified: grass/trunk/vector/v.distance/v.distance.html
===================================================================
--- grass/trunk/vector/v.distance/v.distance.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/vector/v.distance/v.distance.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -149,7 +149,7 @@
 # we need to give the lines category numbers, create a table, and create
 #  a column in that table to hold the distance data.
 v.category vdistance_vectors_raw out=vdistance_vectors type=line op=add
-g.remove -f type=vect name=vdistance_vectors_raw
+g.remove -f type=vector name=vdistance_vectors_raw
 
 v.db.addtable map=vdistance_vectors column="length DOUBLE"
 v.to.db map=vdistance_vectors option=length column=length

Modified: grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html
===================================================================
--- grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html	2014-12-26 23:19:42 UTC (rev 63774)
+++ grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html	2014-12-26 23:33:06 UTC (rev 63775)
@@ -43,7 +43,7 @@
 # vector line needs to be polyline
 v.build.polylines busroute_tmp2 out=busroute_tmp3
 v.category busroute_tmp3 out=busroute op=add
-g.remove -f type=vect name=busroute_tmp,busroute_tmp2,busroute_tmp3
+g.remove -f type=vector name=busroute_tmp,busroute_tmp2,busroute_tmp3
 </pre></div>
 
 The result can be visualized:



More information about the grass-commit mailing list