[GRASS-SVN] r53154 - in grass/trunk: lib/python/temporal temporal/t.rast.to.rast3 temporal/t.register
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Sep 10 06:59:05 PDT 2012
Author: huhabla
Date: 2012-09-10 06:59:05 -0700 (Mon, 10 Sep 2012)
New Revision: 53154
Modified:
grass/trunk/lib/python/temporal/abstract_space_time_dataset.py
grass/trunk/lib/python/temporal/core.py
grass/trunk/lib/python/temporal/space_time_datasets.py
grass/trunk/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh
grass/trunk/temporal/t.register/test.t.register.raster.file.reltime.sh
grass/trunk/temporal/t.register/test.t.register.raster.file.sh
grass/trunk/temporal/t.register/test.t.register.raster.sh
grass/trunk/temporal/t.register/test.t.register.raster3d.sh
grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh
grass/trunk/temporal/t.register/test.t.register.vector.sh
Log:
Implemented alternative method to access map metadata information
to avoid the use of the ctypes library.
Modified: grass/trunk/lib/python/temporal/abstract_space_time_dataset.py
===================================================================
--- grass/trunk/lib/python/temporal/abstract_space_time_dataset.py 2012-09-10 13:53:48 UTC (rev 53153)
+++ grass/trunk/lib/python/temporal/abstract_space_time_dataset.py 2012-09-10 13:59:05 UTC (rev 53154)
@@ -692,7 +692,9 @@
if connect:
dbif.close()
- return obj_list
+ if obj_list:
+ return obj_list
+ return None
def get_registered_maps_as_objects_with_gaps(self, where=None, dbif=None):
"""!Return all registered maps as ordered (by start_time) object list with
Modified: grass/trunk/lib/python/temporal/core.py
===================================================================
--- grass/trunk/lib/python/temporal/core.py 2012-09-10 13:53:48 UTC (rev 53153)
+++ grass/trunk/lib/python/temporal/core.py 2012-09-10 13:59:05 UTC (rev 53154)
@@ -38,6 +38,14 @@
import copy
import grass.script.core as core
+# This variable specifies if the ctypes interface to the grass
+# libraries should be used to read map specific data. If set to False
+# the grass scripting library will be used to get map informations.
+# The advantage of the ctypes inteface is speed, the disadvantage is that
+# the GRASS C functions may call G_fatal_error() which exits the process.
+# That is not catchable in Python.
+use_ctypes_map_access = True
+
###############################################################################
# The chosen DBMI back-end can be defined on runtime
@@ -61,7 +69,6 @@
###############################################################################
-
def get_temporal_dbmi_init_string():
kv = core.parse_command("t.connect", flags="pg")
grassenv = core.gisenv()
@@ -88,7 +95,23 @@
###############################################################################
+def set_use_ctypes_map_access(use_ctype = True):
+ """!Define the map access method for the temporal GIS library
+
+ Using ctypes to read map metadata is much faster
+ then using the grass.script interface that calls grass modules.
+ The disadvantage is that GRASS C-library function will call
+ G_fatal_error() that will exit the calling process.
+ GUI developer should set this flag to False.
+
+ @param use_ctype: True use ctypes interface, False use grass.script interface
+ """
+ global use_ctypes_map_access
+ use_ctypes_map_access = use_ctypes
+
+###############################################################################
+
def get_sql_template_path():
base = os.getenv("GISBASE")
base_etc = os.path.join(base, "etc")
@@ -96,7 +119,6 @@
###############################################################################
-
def create_temporal_database():
"""!This function creates the grass location database structure for raster,
vector and raster3d maps as well as for the space-time datasets strds,
Modified: grass/trunk/lib/python/temporal/space_time_datasets.py
===================================================================
--- grass/trunk/lib/python/temporal/space_time_datasets.py 2012-09-10 13:53:48 UTC (rev 53153)
+++ grass/trunk/lib/python/temporal/space_time_datasets.py 2012-09-10 13:59:05 UTC (rev 53154)
@@ -27,10 +27,12 @@
import grass.lib.vector as libvector
import grass.lib.raster3d as libraster3d
import grass.script.array as garray
+import grass.script.raster as raster
+import grass.script.vector as vector
+import grass.script.raster3d as raster3d
from abstract_space_time_dataset import *
-
###############################################################################
class RasterDataset(AbstractMapDataset):
@@ -316,8 +318,13 @@
self.base.set_creator(str(getpass.getuser()))
# Get the data from an existing raster map
- kvp = self.read_info()
+ global use_ctypes_map_access
+ if use_ctypes_map_access:
+ kvp = self.read_info()
+ else:
+ kvp = raster.raster_info(self.get_id())
+
# Fill spatial extent
self.set_spatial_extent(north=kvp["north"], south=kvp["south"],
@@ -331,8 +338,8 @@
self.metadata.set_min(kvp["min"])
self.metadata.set_max(kvp["max"])
- rows = kvp["rows"]
- cols = kvp["cols"]
+ rows = int(kvp["rows"])
+ cols = int(kvp["cols"])
ncells = cols * rows
@@ -532,9 +539,14 @@
# Fill spatial extent
- # Get the data from an existing raster map
- kvp = self.read_info()
+ # Get the data from an existing 3D raster map
+ global use_ctypes_map_access
+ if use_ctypes_map_access:
+ kvp = self.read_info()
+ else:
+ kvp = raster3d.raster3d_info(self.get_id())
+
self.set_spatial_extent(north=kvp["north"], south=kvp["south"],
east=kvp["east"], west=kvp["west"],
top=kvp["top"], bottom=kvp["bottom"])
@@ -547,9 +559,9 @@
self.metadata.set_min(kvp["min"])
self.metadata.set_max(kvp["max"])
- rows = kvp["rows"]
- cols = kvp["cols"]
- depths = kvp["depths"]
+ rows = int(kvp["rows"])
+ cols = int(kvp["cols"])
+ depths = int(kvp["depths"])
ncells = cols * rows
@@ -717,7 +729,7 @@
kvp["top"] = bbox.T
kvp["bottom"] = bbox.B
- kvp["is_3d"] = bool(libvector.Vect_is_3d(byref(Map)))
+ kvp["map3d"] = bool(libvector.Vect_is_3d(byref(Map)))
# Read number of features
if with_topo:
@@ -737,7 +749,7 @@
# Summarize the primitives
kvp["primitives"] = kvp["points"] + kvp["lines"] + \
kvp["boundaries"] + kvp["centroids"]
- if kvp["is_3d"]:
+ if kvp["map3d"]:
kvp["primitives"] += kvp["faces"] + kvp["kernels"]
# Read topology information
@@ -772,16 +784,21 @@
# Fill base information
self.base.set_creator(str(getpass.getuser()))
- # Get the data from an existing raster map
- kvp = self.read_info()
+ # Get the data from an existing vector map
+ global use_ctypes_map_access
+ if use_ctypes_map_access:
+ kvp = self.read_info()
+ else:
+ kvp = vector.vector_info(self.get_map_id())
+
# Fill spatial extent
self.set_spatial_extent(north=kvp["north"], south=kvp["south"],
east=kvp["east"], west=kvp["west"],
top=kvp["top"], bottom=kvp["bottom"])
# Fill metadata
- self.metadata.set_3d_info(kvp["is_3d"])
+ self.metadata.set_3d_info(kvp["map3d"])
self.metadata.set_number_of_points(kvp["points"])
self.metadata.set_number_of_lines(kvp["lines"])
self.metadata.set_number_of_boundaries(kvp["boundaries"])
@@ -1051,4 +1068,4 @@
if __name__ == "__main__":
import doctest
- doctest.testmod()
\ No newline at end of file
+ doctest.testmod()
Modified: grass/trunk/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh
===================================================================
--- grass/trunk/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh 2012-09-10 13:53:48 UTC (rev 53153)
+++ grass/trunk/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh 2012-09-10 13:59:05 UTC (rev 53154)
@@ -12,6 +12,14 @@
r.mapcalc --o expr="prec_5 = 500"
r.mapcalc --o expr="prec_6 = 600"
+n1=`g.tempfile pid=1 -d`
+
+cat > "${n1}" << EOF
+prec_1|2001-01-01|2001-04-01
+prec_2|2001-05-01|2001-07-01
+prec_3|2001-08-01|2001-10-01
+EOF
+
# @test
# We create the space time raster inputs and register the raster maps with absolute time interval
@@ -60,6 +68,13 @@
t.info type=rast3d input=precipitation
r3.info precipitation
+t.register --o --v -i type=rast input=precip_abs file=${n1}
+t.info type=strds input=precip_abs
+
+t.rast.to.rast3 --o input=precip_abs output=precipitation
+t.info type=rast3d input=precipitation
+r3.info precipitation
+
t.register --o --v -i type=rast input=precip_rel maps=prec_4,prec_5,prec_6 start=1000 increment=100 unit=years
t.info type=strds input=precip_rel
Modified: grass/trunk/temporal/t.register/test.t.register.raster.file.reltime.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster.file.reltime.sh 2012-09-10 13:53:48 UTC (rev 53153)
+++ grass/trunk/temporal/t.register/test.t.register.raster.file.reltime.sh 2012-09-10 13:59:05 UTC (rev 53154)
@@ -58,47 +58,47 @@
# Test with input files
# File 1, and 3 without a space time raster dataset
-t.register -i file="${n1}" start=0 increment=7 unit=days
+t.register --o -i file="${n1}" start=0 increment=7 unit=days
t.unregister --v type=rast file="${n1}"
-t.register file="${n2}" unit=minutes
+t.register --o file="${n2}" unit=minutes
t.unregister --v type=rast file="${n1}"
-t.register -i file="${n3}" unit=seconds
+t.register --o -i file="${n3}" unit=seconds
t.unregister --v type=rast file="${n1}"
# File 1
-t.register -i input=precip_abs8 file="${n1}" start=0 increment=7 unit=days
+t.register --o -i input=precip_abs8 file="${n1}" start=0 increment=7 unit=days
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 1
t.unregister --v type=rast file="${n1}"
-t.register input=precip_abs8 file="${n1}" start=20 unit=years
+t.register --o input=precip_abs8 file="${n1}" start=20 unit=years
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 2
t.unregister --v type=rast file="${n1}"
-t.register input=precip_abs8 file="${n2}" unit=minutes
+t.register --o input=precip_abs8 file="${n2}" unit=minutes
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 2 ERROR ERROR -- Increment computation needs to be fixed
t.unregister --v type=rast file="${n1}"
-t.register input=precip_abs8 file="${n2}" increment=14 unit=days
+t.register --o input=precip_abs8 file="${n2}" increment=14 unit=days
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 2 ERROR ERROR -- Increment computation needs to be fixed
t.unregister --v type=rast file="${n1}"
-t.register -i input=precip_abs8 file="${n2}" increment=14 unit=days
+t.register --o -i input=precip_abs8 file="${n2}" increment=14 unit=days
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 3
t.unregister --v type=rast file="${n1}"
-t.register -i input=precip_abs8 file="${n3}" unit=seconds
+t.register --o -i input=precip_abs8 file="${n3}" unit=seconds
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
t.unregister --v type=rast file="${n1}"
# @test of correct @failure handling
-t.register -i input=precip_abs8 maps=preac_1,prec_2 file="${n3}" # Maps and file set
-t.register -i input=precip_abs8 file="${n3}" # No relative unit set
+t.register --o -i input=precip_abs8 maps=preac_1,prec_2 file="${n3}" # Maps and file set
+t.register --o -i input=precip_abs8 file="${n3}" # No relative unit set
t.remove --v type=strds input=precip_abs8
Modified: grass/trunk/temporal/t.register/test.t.register.raster.file.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster.file.sh 2012-09-10 13:53:48 UTC (rev 53153)
+++ grass/trunk/temporal/t.register/test.t.register.raster.file.sh 2012-09-10 13:59:05 UTC (rev 53154)
@@ -58,23 +58,23 @@
# Test with input files
# File 1
-t.register -i input=precip_abs8 file="${n1}" start="2001-01-01" increment="1 months"
+t.register --o -i input=precip_abs8 file="${n1}" start="2001-01-01" increment="1 months"
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 1
-t.register input=precip_abs8 file="${n1}" start="2001-01-01"
+t.register --o input=precip_abs8 file="${n1}" start="2001-01-01"
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 2
-t.register input=precip_abs8 file="${n2}"
+t.register --o input=precip_abs8 file="${n2}"
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 2
-t.register input=precip_abs8 file="${n2}" increment="1 months"
+t.register --o input=precip_abs8 file="${n2}" increment="1 months"
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 3
-t.register -i input=precip_abs8 file="${n3}"
+t.register --o -i input=precip_abs8 file="${n3}"
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
Modified: grass/trunk/temporal/t.register/test.t.register.raster.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster.sh 2012-09-10 13:53:48 UTC (rev 53153)
+++ grass/trunk/temporal/t.register/test.t.register.raster.sh 2012-09-10 13:59:05 UTC (rev 53154)
@@ -29,63 +29,63 @@
t.create --o type=strds temporaltype=absolute output=precip_abs6 title="A test" descr="A test"
t.create --o type=strds temporaltype=absolute output=precip_abs7 title="A test" descr="A test"
-t.register -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="1 seconds"
+t.register --o -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="1 seconds"
t.info type=strds input=precip_abs1
t.info -g type=strds input=precip_abs1
r.info map=prec_1
t.rast.list input=precip_abs1
t.topology input=precip_abs1
-t.register -i input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="20 seconds, 5 minutes"
+t.register --o -i input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="20 seconds, 5 minutes"
t.info type=strds input=precip_abs2
t.info -g type=strds input=precip_abs2
r.info map=prec_1
t.rast.list input=precip_abs2
t.topology input=precip_abs2
-t.register -i input=precip_abs3 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="8 hours"
+t.register --o -i input=precip_abs3 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="8 hours"
t.info -g type=strds input=precip_abs3
r.info map=prec_1
t.rast.list input=precip_abs3
t.topology input=precip_abs3
-t.register input=precip_abs4 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 days"
+t.register --o input=precip_abs4 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 days"
t.info -g type=strds input=precip_abs4
r.info map=prec_1
t.rast.list input=precip_abs4
t.topology input=precip_abs4
-t.register input=precip_abs5 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="4 weeks"
+t.register --o input=precip_abs5 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="4 weeks"
t.info -g type=strds input=precip_abs5
r.info map=prec_1
t.rast.list input=precip_abs5
t.topology input=precip_abs5
-t.register input=precip_abs6 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-08-01" increment="2 months"
+t.register --o input=precip_abs6 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-08-01" increment="2 months"
t.info -g type=strds input=precip_abs6
r.info map=prec_1
t.rast.list input=precip_abs6
t.topology input=precip_abs6
-t.register input=precip_abs7 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="20 years, 3 months, 1 days, 4 hours"
+t.register --o input=precip_abs7 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="20 years, 3 months, 1 days, 4 hours"
t.info -g type=strds input=precip_abs7
r.info map=prec_1
t.rast.list input=precip_abs7
t.topology input=precip_abs7
# Register with different valid time again
-t.register input=precip_abs7 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
+t.register --o input=precip_abs7 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
t.info -g type=strds input=precip_abs7
r.info map=prec_1
t.rast.list input=precip_abs7
t.topology input=precip_abs7
# Register with different valid time again creating an interval
-t.register -i input=precip_abs7 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
+t.register --o -i input=precip_abs7 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
t.info -g type=strds input=precip_abs7
r.info map=prec_1
t.rast.list input=precip_abs7
t.topology input=precip_abs7
-t.register input=precip_abs7 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" end="2002-01-01"
+t.register --o input=precip_abs7 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" end="2002-01-01"
t.info -g type=strds input=precip_abs7
r.info map=prec_1
t.rast.list input=precip_abs7
@@ -93,7 +93,7 @@
# Check for correct errors
# Increment format error
-t.register -i input=precip_abs7 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="months"
+t.register -i --o input=precip_abs7 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="months"
t.unregister type=rast maps=prec_1,prec_2,prec_3
Modified: grass/trunk/temporal/t.register/test.t.register.raster3d.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster3d.sh 2012-09-10 13:53:48 UTC (rev 53153)
+++ grass/trunk/temporal/t.register/test.t.register.raster3d.sh 2012-09-10 13:59:05 UTC (rev 53154)
@@ -29,12 +29,12 @@
t.create --v --o type=str3ds temporaltype=absolute output=volume_abs6 title="A test" descr="A test"
t.create --v --o type=str3ds temporaltype=absolute output=volume_abs7 title="A test" descr="A test"
-t.register type=rast3d --v -i input=volume_abs1 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="1 seconds"
+t.register type=rast3d --o --v -i input=volume_abs1 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="1 seconds"
t.info type=str3ds input=volume_abs1
t.unregister --v type=rast3d input=volume_abs1 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
t.info type=str3ds input=volume_abs1
-t.register type=rast3d --v -i input=volume_abs2 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="20 seconds, 5 minutes"
+t.register type=rast3d --o --v -i input=volume_abs2 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="20 seconds, 5 minutes"
t.info type=str3ds input=volume_abs2
r3.info volume_1
r3.info volume_2
@@ -43,27 +43,27 @@
r3.info volume_5
r3.info volume_6
-t.register type=rast3d --v -i input=volume_abs3 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="8 hours"
+t.register type=rast3d --o --v -i input=volume_abs3 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="8 hours"
t.info type=str3ds input=volume_abs3
t.unregister --v type=rast3d maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
t.info type=str3ds input=volume_abs3
-t.register type=rast3d input=volume_abs4 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="3 days"
+t.register type=rast3d --o input=volume_abs4 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="3 days"
t.info type=str3ds input=volume_abs4
-t.register type=rast3d input=volume_abs5 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="4 weeks"
+t.register type=rast3d --o input=volume_abs5 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="4 weeks"
t.info type=str3ds input=volume_abs5
-t.register type=rast3d input=volume_abs6 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-08-01" increment="2 months"
+t.register type=rast3d --o input=volume_abs6 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-08-01" increment="2 months"
t.info type=str3ds input=volume_abs6
-t.register type=rast3d input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="20 years, 3 months, 1 days, 4 hours"
+t.register type=rast3d --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="20 years, 3 months, 1 days, 4 hours"
t.info type=str3ds input=volume_abs7
# Register with different valid time again
-t.register type=rast3d input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
+t.register type=rast3d --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
t.info type=str3ds input=volume_abs7
# Register with different valid time again creating intervals
-t.register type=rast3d -i input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
+t.register type=rast3d -i --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
t.info type=str3ds input=volume_abs7
t.unregister --v type=rast3d maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
Modified: grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh 2012-09-10 13:53:48 UTC (rev 53153)
+++ grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh 2012-09-10 13:59:05 UTC (rev 53154)
@@ -54,19 +54,19 @@
# The first @test
# Test with input files
# File 1
-t.register --v type=vect input=lidar_abs_ds1 file="${n1}" start="2001-01-01" increment="1 months"
+t.register --o --v type=vect input=lidar_abs_ds1 file="${n1}" start="2001-01-01" increment="1 months"
t.list type=vect columns=id,name,start_time,end_time where="name='lidar_abs_1'"
# File 1
-t.register --v type=vect input=lidar_abs_ds1 file="${n1}" start="2001-01-01"
+t.register --o --v type=vect input=lidar_abs_ds1 file="${n1}" start="2001-01-01"
t.list type=vect columns=id,name,start_time,end_time where="name='lidar_abs_1'"
# File 2
-t.register --v type=vect input=lidar_abs_ds1 file="${n2}"
+t.register --o --v type=vect input=lidar_abs_ds1 file="${n2}"
t.list type=vect columns=id,name,start_time,end_time where="name='lidar_abs_1'"
# File 2
-t.register --v type=vect input=lidar_abs_ds1 -i file="${n2}" start=file increment="1 months"
+t.register --o --v type=vect input=lidar_abs_ds1 -i file="${n2}" start=file increment="1 months"
t.list type=vect columns=id,name,start_time,end_time where="name='lidar_abs_1'"
# File 3
-t.register --v type=vect input=lidar_abs_ds1 file="${n3}" start=file
+t.register --o --v type=vect input=lidar_abs_ds1 file="${n3}" start=file
t.list type=vect columns=id,name,start_time,end_time where="name='lidar_abs_1'"
t.unregister --v type=vect maps=lidar_abs_1:1,lidar_abs_1:2,lidar_abs_1:3,lidar_abs_1:4,lidar_abs_1:5,lidar_abs_1:6
Modified: grass/trunk/temporal/t.register/test.t.register.vector.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.vector.sh 2012-09-10 13:53:48 UTC (rev 53153)
+++ grass/trunk/temporal/t.register/test.t.register.vector.sh 2012-09-10 13:59:05 UTC (rev 53154)
@@ -27,35 +27,35 @@
t.create --v --o type=stvds temporaltype=absolute output=lidar_abs_ds6 title="A test" descr="A test"
t.create --v --o type=stvds temporaltype=absolute output=lidar_abs_ds7 title="A test" descr="A test"
-t.register type=vect --v -i input=lidar_abs_ds1 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="1 seconds"
+t.register type=vect --o --v -i input=lidar_abs_ds1 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="1 seconds"
t.info type=stvds input=lidar_abs_ds1
t.unregister --v type=vect input=lidar_abs_ds1 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6
t.info type=stvds input=lidar_abs_ds1
-t.register type=vect --v -i input=lidar_abs_ds2 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="20 seconds, 5 minutes"
+t.register type=vect --o --v -i input=lidar_abs_ds2 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="20 seconds, 5 minutes"
t.info type=stvds input=lidar_abs_ds2
-t.register type=vect --v -i input=lidar_abs_ds3 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="8 hours"
+t.register type=vect --o --v -i input=lidar_abs_ds3 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="8 hours"
t.info type=stvds input=lidar_abs_ds3
t.unregister --v type=vect maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6
t.info type=stvds input=lidar_abs_ds3
-t.register type=vect input=lidar_abs_ds4 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="3 days"
+t.register type=vect --o input=lidar_abs_ds4 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="3 days"
t.info type=stvds input=lidar_abs_ds4
-t.register type=vect input=lidar_abs_ds5 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="4 weeks"
+t.register type=vect --o input=lidar_abs_ds5 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="4 weeks"
t.info type=stvds input=lidar_abs_ds5
-t.register type=vect input=lidar_abs_ds6 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-08-01" increment="2 months"
+t.register type=vect --o input=lidar_abs_ds6 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-08-01" increment="2 months"
t.info type=stvds input=lidar_abs_ds6
-t.register type=vect input=lidar_abs_ds7 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="20 years, 3 months, 1 days, 4 hours"
+t.register type=vect --o input=lidar_abs_ds7 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="20 years, 3 months, 1 days, 4 hours"
t.info type=stvds input=lidar_abs_ds7
# Register with different valid time again
-t.register type=vect input=lidar_abs_ds7 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
+t.register type=vect --o input=lidar_abs_ds7 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
t.info type=stvds input=lidar_abs_ds7
# Register with different valid time again creating an interval
-t.register type=vect -i input=lidar_abs_ds7 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
+t.register type=vect --o -i input=lidar_abs_ds7 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
t.info type=stvds input=lidar_abs_ds7
t.unregister --v type=vect maps=lidar_abs_1,lidar_abs_2,lidar_abs_3
More information about the grass-commit
mailing list