[GRASS-SVN] r50587 - in grass/trunk/temporal: t.time.abs tv.what.rast

[svn_grass at osgeo.org]

Author: huhabla
Date: 2012-01-31 05:31:56 -0800 (Tue, 31 Jan 2012)
New Revision: 50587

Modified:
   grass/trunk/temporal/t.time.abs/test.t.time.abs.file.layer.sh
   grass/trunk/temporal/tv.what.rast/test.tv.what.rast.layer.sh
Log:
Updated v.category usage


Modified: grass/trunk/temporal/t.time.abs/test.t.time.abs.file.layer.sh
===================================================================
--- grass/trunk/temporal/t.time.abs/test.t.time.abs.file.layer.sh	2012-01-31 12:02:20 UTC (rev 50586)
+++ grass/trunk/temporal/t.time.abs/test.t.time.abs.file.layer.sh	2012-01-31 13:31:56 UTC (rev 50587)
@@ -1,8 +1,7 @@
 # This is a test to absolute time for vector maps with layer support
 # We need to set a specific region in the
 # @preprocess step of this test. We generate
-# vector with v.random and create several space time vector inputs
-# with absolute time
+# vector with v.random.
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
@@ -10,16 +9,11 @@
 
 n1=`g.tempfile pid=4 -d` # Only map names and layer
 n2=`g.tempfile pid=5 -d` # Map names, layer and start time 
-n3=`g.tempfile pid=6 -d` # Map names, layer start time and increment
-v.random --o -z seed=1 output=lidar_abs_orig n=20 zmin=0 zmax=100 column=sand
+n3=`g.tempfile pid=6 -d` # Map names, layer, start time and increment
+# The vector map
+v.random --o -z seed=1 output=lidar_abs_orig n=100 zmin=0 zmax=100 column=sand
 # Adding new layer with categories
-v.category input=lidar_abs_orig out=lidar_abs option=transfer layer=1,1 --o
-v.category input=lidar_abs out=lidar_abs_orig option=transfer layer=1,2 --o
-v.category input=lidar_abs_orig out=lidar_abs option=transfer layer=1,3 --o
-v.category input=lidar_abs out=lidar_abs_orig option=transfer layer=1,4 --o
-v.category input=lidar_abs_orig out=lidar_abs option=transfer layer=1,5 --o
-v.category input=lidar_abs out=lidar_abs_orig option=transfer layer=1,6 --o
-g.copy --o vect=lidar_abs_orig,lidar_abs_1
+v.category input=lidar_abs_orig out=lidar_abs_1 option=transfer layer=1,2,3,4,5,6 --o
 
 cat > "${n1}" << EOF
 lidar_abs_1|1

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-01-31 12:02:20 UTC (rev 50586)
+++ grass/trunk/temporal/tv.what.rast/test.tv.what.rast.layer.sh	2012-01-31 13:31:56 UTC (rev 50587)
@@ -13,15 +13,9 @@
 r.mapcalc --o expr="sand_frac_5 = 65.0"
 r.mapcalc --o expr="sand_frac_6 = 75.0"
 # The vector map
-v.random --o -z seed=1 output=soil_orig n=5 zmin=0 zmax=100 column=sand
+v.random --o -z seed=1 output=soil_orig n=100 zmin=0 zmax=100 column=sand
 # Adding new layer with categories
-v.category input=soil_orig out=soils option=transfer layer=1,1 --o
-v.category input=soils out=soil_orig option=transfer layer=1,2 --o
-v.category input=soil_orig out=soils option=transfer layer=1,3 --o
-v.category input=soils out=soil_orig option=transfer layer=1,4 --o
-v.category input=soil_orig out=soils option=transfer layer=1,5 --o
-v.category input=soils out=soil_orig option=transfer layer=1,6 --o
-g.copy --o vect=soil_orig,soils
+v.category input=soil_orig out=soils option=transfer layer=1,2,3,4,5,6 --o
 # Creating new tables for each layer
 db.copy from_table=soil_orig to_table=soils_2
 db.copy from_table=soil_orig to_table=soils_3