[GRASS-SVN] r50789 - grass/trunk/temporal/tv.what.rast

[svn_grass at osgeo.org]

Author: huhabla
Date: 2012-02-13 06:07:12 -0800 (Mon, 13 Feb 2012)
New Revision: 50789

Modified:
   grass/trunk/temporal/tv.what.rast/test.tv.what.rast.layer.sh
   grass/trunk/temporal/tv.what.rast/test.tv.what.rast.sh
Log:
Use t.register and t.unregister


Modified: grass/trunk/temporal/tv.what.rast/test.tv.what.rast.layer.sh
===================================================================
--- grass/trunk/temporal/tv.what.rast/test.tv.what.rast.layer.sh	2012-02-13 14:06:40 UTC (rev 50788)
+++ grass/trunk/temporal/tv.what.rast/test.tv.what.rast.layer.sh	2012-02-13 14:07:12 UTC (rev 50789)
@@ -31,24 +31,24 @@
 n1=`g.tempfile pid=1 -d` 
 
 cat > "${n1}" << EOF
-soils|1
-soils|2
-soils|3
-soils|4
-soils|5
-soils|6
+soils:1
+soils:2
+soils:3
+soils:4
+soils:5
+soils:6
 EOF
 
 t.create --o type=stvds temporaltype=absolute output=soil_abs title="A test" descr="A test"
-tv.register -i input=soil_abs file="${n1}" layer=file start="2001-03-01 00:00:00" increment="1 months"
+t.register -i type=vect input=soil_abs file="${n1}" start="2001-03-01 00:00:00" increment="1 months"
 tv.list input=soil_abs columns=name,layer,start_time,end_time
 
 t.create --o type=strds temporaltype=absolute output=sand_frac_abs_1 title="A test" descr="A test"
-tr.register -i input=sand_frac_abs_1 maps=sand_frac start="2001-01-01 00:00:00" increment="12 months"
+t.register -i type=rast input=sand_frac_abs_1 maps=sand_frac start="2001-01-01 00:00:00" increment="12 months"
 tr.list input=sand_frac_abs_1 columns=name,start_time,end_time
 
 t.create --o type=strds temporaltype=absolute output=sand_frac_abs_2 title="A test" descr="A test"
-tr.register -i input=sand_frac_abs_2 maps=sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6 \
+t.register -i type=rast input=sand_frac_abs_2 maps=sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6 \
             start="2001-03-01 00:00:00" increment="1 months"
 tr.list input=sand_frac_abs_2 columns=name,start_time,end_time
 
@@ -70,10 +70,10 @@
 v.db.select map=soils layer=6
 
 # @postprocess
-t.remove type=vect input=soils:1,soils:2,soils:3,soils:4,soils:5,soils:6
+t.unregister type=vect maps=soils:1,soils:2,soils:3,soils:4,soils:5,soils:6
 t.remove type=stvds input=soil_abs
 
-t.remove type=rast input=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6
+t.unregister type=rast maps=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6
 t.remove type=strds input=sand_frac_abs_1,sand_frac_abs_2
 
 g.remove rast=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6

Modified: grass/trunk/temporal/tv.what.rast/test.tv.what.rast.sh
===================================================================
--- grass/trunk/temporal/tv.what.rast/test.tv.what.rast.sh	2012-02-13 14:06:40 UTC (rev 50788)
+++ grass/trunk/temporal/tv.what.rast/test.tv.what.rast.sh	2012-02-13 14:07:12 UTC (rev 50789)
@@ -24,10 +24,10 @@
 EOF
 
 t.create --o type=stvds temporaltype=absolute output=soil_abs1 title="A test" descr="A test"
-tv.register input=soil_abs1 file="${n1}" start=file end=file
+t.register type=vect input=soil_abs1 file="${n1}" start=file end=file
 
 t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-tr.register -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-03-01 00:00:00" increment="1 months"
+t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-03-01 00:00:00" increment="1 months"
 
 # The @test
 
@@ -42,10 +42,10 @@
 v.db.select map=soil_3
 
 # @postprocess
-t.remove type=vect input=soil_1,soil_2,soil_3
+t.unregister type=vect maps=soil_1,soil_2,soil_3
 t.remove type=stvds input=soil_abs1
 
-t.remove type=rast input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
 t.remove type=strds input=precip_abs1
 
 g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6