浏览代码

Using "separator" instead of "fs". Relative time fixes and doc update.

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@54751 15284696-431f-4ddb-bdfa-cd5b030d7da7
Soeren Gebbert 12 年之前
父节点
当前提交
5627c16a78

+ 2 - 2
lib/python/temporal/extract.py

@@ -241,8 +241,8 @@ def extract_dataset(input, output, type, where, expression, base, nprocs=1,
                         start, end, tz = old_map.get_absolute_time()
                         start, end, tz = old_map.get_absolute_time()
                         new_map.set_absolute_time(start, end, tz)
                         new_map.set_absolute_time(start, end, tz)
                     else:
                     else:
-                        start, end = old_map.get_relative_time()
-                        new_map.set_relative_time(start, end)
+                        start, end, unit = old_map.get_relative_time()
+                        new_map.set_relative_time(start, end, unit)
 
 
                     # Insert map in temporal database
                     # Insert map in temporal database
                     new_map.insert(dbif)
                     new_map.insert(dbif)

+ 3 - 3
lib/python/temporal/unit_tests.py

@@ -613,7 +613,7 @@ def test_compute_relative_time_granularity():
         end = start + fact
         end = start + fact
 
 
         map = RasterDataset(None)
         map = RasterDataset(None)
-        map.set_relative_time(start, end)
+        map.set_relative_time(start, end, "years")
         maps.append(map)
         maps.append(map)
 
 
     gran = round(compute_relative_time_granularity(maps))
     gran = round(compute_relative_time_granularity(maps))
@@ -632,7 +632,7 @@ def test_compute_relative_time_granularity():
         end = start * fact
         end = start * fact
         map = RasterDataset(None)
         map = RasterDataset(None)
         if count % 2 == 0:
         if count % 2 == 0:
-            map.set_relative_time(start, end)
+            map.set_relative_time(start, end, "years")
         else:
         else:
             map.set_relative_time(start, None)
             map.set_relative_time(start, None)
         maps.append(map)
         maps.append(map)
@@ -653,7 +653,7 @@ def test_compute_relative_time_granularity():
     for i in range(10):
     for i in range(10):
         point = (i + 1) * fact * start
         point = (i + 1) * fact * start
         map = RasterDataset(None)
         map = RasterDataset(None)
-        map.set_relative_time(point, None)
+        map.set_relative_time(point, None, years)
         maps.append(map)
         maps.append(map)
 
 
     gran = round(compute_relative_time_granularity(maps) * 86400)
     gran = round(compute_relative_time_granularity(maps) * 86400)

+ 1 - 1
temporal/t.info/t.info.html

@@ -10,7 +10,7 @@ The user has to utilize <em>r.info, r3.info, v.info</em>
 to report detailed informations about raster, 3D raster and vector maps, since
 to report detailed informations about raster, 3D raster and vector maps, since
 not all map specific informations and metadata are stored in the temporal database. 
 not all map specific informations and metadata are stored in the temporal database. 
 <p>
 <p>
-In addition informations about the chosen temporal database backend can be reported.
+In addition, informations about the chosen temporal database backend can be reported.
 
 
 <h2>EXAMPLE</h2>
 <h2>EXAMPLE</h2>
 
 

+ 9 - 1
temporal/t.list/t.list.html

@@ -1,6 +1,14 @@
 <h2>DESCRIPTION</h2>
 <h2>DESCRIPTION</h2>
 
 
-TBD.
+<em>t.list</em> lists any dataset that is registered in the temporal database. 
+Datasets are raster, 3D raster and vector maps as well as their 
+corresponding space time datasets (STRDS, STR3DS and STVDS). The type of the dataset
+can be specified using the <em>type</em> option, default is STRDS. By default all datasets with
+relative and absolute time are listed. However, the user has the ability to specify
+a single temporal type with the <em>temporaltype</em> option.
+The user can define the columns that should 
+be printed for each dataset and the order of the datasets. In addition a SQL WHERE statement can
+be specified to select a subset of the requested datasets.
 
 
 <h2>SEE ALSO</h2>
 <h2>SEE ALSO</h2>
 
 

+ 3 - 3
temporal/t.list/t.list.py

@@ -66,9 +66,9 @@
 #%end
 #%end
 
 
 #%option
 #%option
-#% key: fs
+#% key: separator
 #% type: string
 #% type: string
-#% description: The field separator character between the columns, default is tabular "\t"
+#% description: Separator character between the columns, default is tabular "\t"
 #% guisection: Formatting
 #% guisection: Formatting
 #% required: no
 #% required: no
 #%end
 #%end
@@ -93,7 +93,7 @@ def main():
     columns = options["columns"]
     columns = options["columns"]
     order = options["order"]
     order = options["order"]
     where = options["where"]
     where = options["where"]
-    separator = options["fs"]
+    separator = options["separator"]
     colhead = flags['c']
     colhead = flags['c']
 
 
     # Make sure the temporal database exists
     # Make sure the temporal database exists

+ 1 - 1
temporal/t.rast.extract/test.t.rast.extract.sh

@@ -23,7 +23,7 @@ t.rast.extract --o --v input=precip_abs1 output=precip_abs2 where="start_time >
 t.info type=strds input=precip_abs2
 t.info type=strds input=precip_abs2
 
 
 t.rast.extract --o --v -n input=precip_abs1 output=precip_abs3 where="start_time > '2001-06-01'" \
 t.rast.extract --o --v -n input=precip_abs1 output=precip_abs3 where="start_time > '2001-06-01'" \
-           expression=" if(precip_abs1@PERMANENT > 400, precip_abs1@PERMANENT, null())" base=new_prec nprocs=4
+           expression=" if(precip_abs1 > 400, precip_abs1, null())" base=new_prec nprocs=4
 t.info type=strds input=precip_abs3
 t.info type=strds input=precip_abs3
 
 
 t.rast.extract --o --v input=precip_abs1 output=precip_abs4 where="start_time > '2001-06-01'" 
 t.rast.extract --o --v input=precip_abs1 output=precip_abs4 where="start_time > '2001-06-01'" 

+ 3 - 3
temporal/t.rast.list/t.rast.list.py

@@ -59,9 +59,9 @@
 #%end
 #%end
 
 
 #%option
 #%option
-#% key: fs
+#% key: separator
 #% type: string
 #% type: string
-#% description: Field separator character between the columns, default is tabular "\t"
+#% description: Separator character between the columns, default is tabular "\t"
 #% required: no
 #% required: no
 #%end
 #%end
 
 
@@ -83,7 +83,7 @@ def main():
     columns = options["columns"]
     columns = options["columns"]
     order = options["order"]
     order = options["order"]
     where = options["where"]
     where = options["where"]
-    separator = options["fs"]
+    separator = options["separator"]
     method = options["method"]
     method = options["method"]
     header = flags["h"]
     header = flags["h"]
 
 

+ 28 - 28
temporal/t.rast.list/test.t.rast.list.sh

@@ -69,49 +69,49 @@ t.create --o type=strds temporaltype=absolute output=precip_abs0 title="A test w
 
 
 # The @test
 # The @test
 t.register type=rast --o -i input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
 t.register type=rast --o -i input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
-t.rast.list    fs=" | " method=comma     input=precip_abs0
+t.rast.list    separator=" | " method=comma     input=precip_abs0
 t.rast.list -h input=precip_abs0
 t.rast.list -h input=precip_abs0
-t.rast.list -h fs=" | " method=cols      input=precip_abs0
-t.rast.list -h fs=" | " method=delta     input=precip_abs0
-t.rast.list -h fs=" | " method=deltagaps input=precip_abs0
-t.rast.list -h fs=" | " method=gran      input=precip_abs0
+t.rast.list -h separator=" | " method=cols      input=precip_abs0
+t.rast.list -h separator=" | " method=delta     input=precip_abs0
+t.rast.list -h separator=" | " method=deltagaps input=precip_abs0
+t.rast.list -h separator=" | " method=gran      input=precip_abs0
 
 
 t.register type=rast --o input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
 t.register type=rast --o input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
-t.rast.list    fs=" | " method=comma     input=precip_abs0
+t.rast.list    separator=" | " method=comma     input=precip_abs0
 t.rast.list -h input=precip_abs0
 t.rast.list -h input=precip_abs0
-t.rast.list -h fs=" | " method=cols      input=precip_abs0
-t.rast.list -h fs=" | " method=delta     input=precip_abs0
-t.rast.list -h fs=" | " method=deltagaps input=precip_abs0
+t.rast.list -h separator=" | " method=cols      input=precip_abs0
+t.rast.list -h separator=" | " method=delta     input=precip_abs0
+t.rast.list -h separator=" | " method=deltagaps input=precip_abs0
 # ERROR: no interval time   
 # ERROR: no interval time   
-t.rast.list -h fs=" | " method=gran      input=precip_abs0
+t.rast.list -h separator=" | " method=gran      input=precip_abs0
 
 
 t.register type=rast --o -i input=precip_abs0 file="${n2}" 
 t.register type=rast --o -i input=precip_abs0 file="${n2}" 
-t.rast.list    fs=" | " method=comma     input=precip_abs0
+t.rast.list    separator=" | " method=comma     input=precip_abs0
 t.rast.list -h input=precip_abs0
 t.rast.list -h input=precip_abs0
-t.rast.list -h fs=" | " method=cols      input=precip_abs0
-t.rast.list -h fs=" | " method=delta     input=precip_abs0
-t.rast.list -h fs=" | " method=deltagaps input=precip_abs0
-t.rast.list -h fs=" | " method=gran      input=precip_abs0
+t.rast.list -h separator=" | " method=cols      input=precip_abs0
+t.rast.list -h separator=" | " method=delta     input=precip_abs0
+t.rast.list -h separator=" | " method=deltagaps input=precip_abs0
+t.rast.list -h separator=" | " method=gran      input=precip_abs0
 
 
 t.register type=rast --o -i input=precip_abs0 file="${n3}"
 t.register type=rast --o -i input=precip_abs0 file="${n3}"
-t.rast.list    fs=" | " method=comma     input=precip_abs0
-t.rast.list -h fs=" | " method=delta     input=precip_abs0
-t.rast.list -h fs=" | " method=deltagaps input=precip_abs0
-t.rast.list -h fs=" | " method=gran      input=precip_abs0
+t.rast.list    separator=" | " method=comma     input=precip_abs0
+t.rast.list -h separator=" | " method=delta     input=precip_abs0
+t.rast.list -h separator=" | " method=deltagaps input=precip_abs0
+t.rast.list -h separator=" | " method=gran      input=precip_abs0
 
 
 t.register type=rast --o -i input=precip_abs0 file="${n4}"
 t.register type=rast --o -i input=precip_abs0 file="${n4}"
-t.rast.list    fs=" | " method=comma     input=precip_abs0
-t.rast.list -h fs=" | " method=delta     input=precip_abs0
-t.rast.list -h fs=" | " method=deltagaps input=precip_abs0
-t.rast.list -h fs=" | " method=gran      input=precip_abs0
+t.rast.list    separator=" | " method=comma     input=precip_abs0
+t.rast.list -h separator=" | " method=delta     input=precip_abs0
+t.rast.list -h separator=" | " method=deltagaps input=precip_abs0
+t.rast.list -h separator=" | " method=gran      input=precip_abs0
 
 
 t.register type=rast --o -i input=precip_abs0 file="${n5}"
 t.register type=rast --o -i input=precip_abs0 file="${n5}"
-t.rast.list    fs=" | " method=comma     input=precip_abs0
+t.rast.list    separator=" | " method=comma     input=precip_abs0
 t.rast.list -h input=precip_abs0
 t.rast.list -h input=precip_abs0
-t.rast.list -h fs=" | " method=cols      input=precip_abs0
-t.rast.list -h fs=" | " method=delta     input=precip_abs0
-t.rast.list -h fs=" | " method=deltagaps input=precip_abs0
-t.rast.list -h fs=" | " method=gran      input=precip_abs0
+t.rast.list -h separator=" | " method=cols      input=precip_abs0
+t.rast.list -h separator=" | " method=delta     input=precip_abs0
+t.rast.list -h separator=" | " method=deltagaps input=precip_abs0
+t.rast.list -h separator=" | " method=gran      input=precip_abs0
 
 
 t.unregister type=rast maps=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_abs0
 t.remove type=strds input=precip_abs0

+ 4 - 4
temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh

@@ -17,7 +17,7 @@ r.mapcalc --o expr="prec_6 = rand(0, 650)"
 t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create --o type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
 t.create --o type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
 t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
 t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
-t.register type=rast input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.register --o type=rast input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
 
 
 t.info precip_abs1
 t.info precip_abs1
 t.info precip_abs2
 t.info precip_abs2
@@ -29,17 +29,17 @@ t.rast.mapcalc --o --v -n inputs=precip_abs1,precip_abs2 output=precip_abs3 \
 t.info type=strds input=precip_abs3
 t.info type=strds input=precip_abs3
 
 
 t.rast.mapcalc --o --v -s inputs=precip_abs1,precip_abs2,precip_abs3 output=precip_abs4 \
 t.rast.mapcalc --o --v -s inputs=precip_abs1,precip_abs2,precip_abs3 output=precip_abs4 \
-           expression=" (precip_abs1 + precip_abs2) / precip_abs3@PERMANENT " base=new_prec \
+           expression=" (precip_abs1 + precip_abs2) / precip_abs2" base=new_prec \
            method=equal nprocs=5
            method=equal nprocs=5
 t.info type=strds input=precip_abs4
 t.info type=strds input=precip_abs4
 
 
 t.rast.mapcalc --o --v -s inputs=precip_abs1,precip_abs2 output=precip_abs4 \
 t.rast.mapcalc --o --v -s inputs=precip_abs1,precip_abs2 output=precip_abs4 \
-           expression=" (precip_abs1 + precip_abs2) * null() " base=new_prec \
+           expression=" (precip_abs1 + precip_abs2) * null()" base=new_prec \
            method=equal nprocs=5
            method=equal nprocs=5
 t.info type=strds input=precip_abs4
 t.info type=strds input=precip_abs4
 
 
 t.rast.mapcalc --o --v -sn inputs=precip_abs1,precip_abs2 output=precip_abs4 \
 t.rast.mapcalc --o --v -sn inputs=precip_abs1,precip_abs2 output=precip_abs4 \
-           expression=" (precip_abs1 + precip_abs2) * null() " base=new_prec \
+           expression=" (precip_abs1 + precip_abs2) * null()" base=new_prec \
            method=equal nprocs=5
            method=equal nprocs=5
 t.info type=strds input=precip_abs4
 t.info type=strds input=precip_abs4
 
 

+ 3 - 3
temporal/t.rast3d.list/t.rast3d.list.py

@@ -59,9 +59,9 @@
 #%end
 #%end
 
 
 #%option
 #%option
-#% key: fs
+#% key: separator
 #% type: string
 #% type: string
-#% description: Field separator character between the output columns, default is tabular "\t"
+#% description: Separator character between the output columns, default is tabular "\t"
 #% required: no
 #% required: no
 #%end
 #%end
 
 
@@ -83,7 +83,7 @@ def main():
     columns = options["columns"]
     columns = options["columns"]
     order = options["order"]
     order = options["order"]
     where = options["where"]
     where = options["where"]
-    separator = options["fs"]
+    separator = options["separator"]
     method = options["method"]
     method = options["method"]
     header = flags["h"]
     header = flags["h"]
 
 

+ 18 - 18
temporal/t.rast3d.list/test.t.rast3d.list.sh

@@ -72,35 +72,35 @@ t.create --o type=str3ds temporaltype=absolute output=volume_abs5 title="A test
 
 
 # The first @test
 # The first @test
 t.register type=rast3d   input=volume_abs1 file="${n1}" start="2001-01-01" increment="1 months"
 t.register type=rast3d   input=volume_abs1 file="${n1}" start="2001-01-01" increment="1 months"
-t.rast3d.list    fs=" | " method=comma     input=volume_abs1
+t.rast3d.list    separator=" | " method=comma     input=volume_abs1
 t.rast3d.list -h input=volume_abs1
 t.rast3d.list -h input=volume_abs1
-t.rast3d.list -h fs=" | " method=cols      input=volume_abs1
-t.rast3d.list -h fs=" | " method=delta     input=volume_abs1
-t.rast3d.list -h fs=" | " method=deltagaps input=volume_abs1
+t.rast3d.list -h separator=" | " method=cols      input=volume_abs1
+t.rast3d.list -h separator=" | " method=delta     input=volume_abs1
+t.rast3d.list -h separator=" | " method=deltagaps input=volume_abs1
 
 
 t.register -i type=rast3d input=volume_abs2 file="${n2}"
 t.register -i type=rast3d input=volume_abs2 file="${n2}"
-t.rast3d.list    fs=" | " method=comma     input=volume_abs2
+t.rast3d.list    separator=" | " method=comma     input=volume_abs2
 t.rast3d.list -h input=volume_abs2
 t.rast3d.list -h input=volume_abs2
-t.rast3d.list -h fs=" | " method=cols      input=volume_abs2
-t.rast3d.list -h fs=" | " method=delta     input=volume_abs2
-t.rast3d.list -h fs=" | " method=deltagaps input=volume_abs2
+t.rast3d.list -h separator=" | " method=cols      input=volume_abs2
+t.rast3d.list -h separator=" | " method=delta     input=volume_abs2
+t.rast3d.list -h separator=" | " method=deltagaps input=volume_abs2
 
 
 t.register -i type=rast3d input=volume_abs3 file="${n3}"
 t.register -i type=rast3d input=volume_abs3 file="${n3}"
-t.rast3d.list    fs=" | " method=comma     input=volume_abs3
-t.rast3d.list -h fs=" | " method=delta     input=volume_abs3
-t.rast3d.list -h fs=" | " method=deltagaps input=volume_abs3
+t.rast3d.list    separator=" | " method=comma     input=volume_abs3
+t.rast3d.list -h separator=" | " method=delta     input=volume_abs3
+t.rast3d.list -h separator=" | " method=deltagaps input=volume_abs3
 
 
 t.register -i type=rast3d input=volume_abs4 file="${n4}"
 t.register -i type=rast3d input=volume_abs4 file="${n4}"
-t.rast3d.list    fs=" | " method=comma     input=volume_abs4
-t.rast3d.list -h fs=" | " method=delta     input=volume_abs4
-t.rast3d.list -h fs=" | " method=deltagaps input=volume_abs4
+t.rast3d.list    separator=" | " method=comma     input=volume_abs4
+t.rast3d.list -h separator=" | " method=delta     input=volume_abs4
+t.rast3d.list -h separator=" | " method=deltagaps input=volume_abs4
 
 
 t.register -i type=rast3d input=volume_abs5 file="${n5}"
 t.register -i type=rast3d input=volume_abs5 file="${n5}"
-t.rast3d.list    fs=" | " method=comma     input=volume_abs5
+t.rast3d.list    separator=" | " method=comma     input=volume_abs5
 t.rast3d.list -h input=volume_abs5
 t.rast3d.list -h input=volume_abs5
-t.rast3d.list -h fs=" | " method=cols      input=volume_abs5
-t.rast3d.list -h fs=" | " method=delta     input=volume_abs5
-t.rast3d.list -h fs=" | " method=deltagaps input=volume_abs5
+t.rast3d.list -h separator=" | " method=cols      input=volume_abs5
+t.rast3d.list -h separator=" | " method=delta     input=volume_abs5
+t.rast3d.list -h separator=" | " method=deltagaps input=volume_abs5
 
 
 t.unregister type=rast3d maps=vol_1,vol_2,vol_3,vol_4,vol_5,vol_6
 t.unregister type=rast3d maps=vol_1,vol_2,vol_3,vol_4,vol_5,vol_6
 t.remove type=str3ds input=volume_abs1,volume_abs2,volume_abs3,volume_abs4,volume_abs5
 t.remove type=str3ds input=volume_abs1,volume_abs2,volume_abs3,volume_abs4,volume_abs5

+ 2 - 2
temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh

@@ -16,7 +16,7 @@ r3.mapcalc --o expr="prec_6 = rand(0, 650)"
 t.create --o type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create --o type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create --o type=str3ds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
 t.create --o type=str3ds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
 t.register -i type=rast3d input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
 t.register -i type=rast3d input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
-t.register type=rast3d input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.register --o type=rast3d input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
 
 
 t.info type=str3ds input=precip_abs1
 t.info type=str3ds input=precip_abs1
 t.info type=str3ds input=precip_abs2
 t.info type=str3ds input=precip_abs2
@@ -28,7 +28,7 @@ t.rast3d.mapcalc --o --v -n inputs=precip_abs1,precip_abs2 output=precip_abs3 \
 t.info type=str3ds input=precip_abs3
 t.info type=str3ds input=precip_abs3
 
 
 t.rast3d.mapcalc --o --v -s inputs=precip_abs1,precip_abs2,precip_abs3 output=precip_abs4 \
 t.rast3d.mapcalc --o --v -s inputs=precip_abs1,precip_abs2,precip_abs3 output=precip_abs4 \
-           expression=" (precip_abs1 + precip_abs2) / precip_abs3@PERMANENT " base=new_prec \
+           expression=" (precip_abs1 + precip_abs2) / precip_abs2" base=new_prec \
            method=equal nprocs=6
            method=equal nprocs=6
 t.info type=str3ds input=precip_abs4
 t.info type=str3ds input=precip_abs4
 
 

+ 3 - 3
temporal/t.sample/t.sample.py

@@ -45,9 +45,9 @@
 #%end
 #%end
 
 
 #%option
 #%option
-#% key: fs
+#% key: separator
 #% type: string
 #% type: string
-#% description: Field separator character between the output columns, default is tabular " | ". Do not use "," as this char is reserved to list several map ids in a sample granule
+#% description: Separator character between the output columns, default is tabular " | ". Do not use "," as this char is reserved to list several map ids in a sample granule
 #% required: no
 #% required: no
 #%end
 #%end
 
 
@@ -75,7 +75,7 @@ def main():
     sampler = options["sample"]
     sampler = options["sample"]
     samtype = options["samtype"]
     samtype = options["samtype"]
     intype = options["intype"]
     intype = options["intype"]
-    separator = options["fs"]
+    separator = options["separator"]
     method = options["method"]
     method = options["method"]
     header = flags["c"]
     header = flags["c"]
     spatial = flags["s"]
     spatial = flags["s"]

+ 3 - 3
temporal/t.vect.db.select/t.vect.db.select.py

@@ -30,9 +30,9 @@
 #%end
 #%end
 
 
 #%option
 #%option
-#% key: fs
+#% key: separator
 #% type: string
 #% type: string
-#% description: Field separator character between the output columns
+#% description: Separator character between the output columns
 #% required: no
 #% required: no
 #% answer: |
 #% answer: |
 #%end
 #%end
@@ -62,7 +62,7 @@ def main():
     columns = options["columns"]
     columns = options["columns"]
     tempwhere = options["t_where"]
     tempwhere = options["t_where"]
     layer = options["layer"]
     layer = options["layer"]
-    fs = options["fs"]
+    fs = options["separator"]
 
 
     if where == "" or where == " " or where == "\n":
     if where == "" or where == " " or where == "\n":
         where = None
         where = None

+ 3 - 3
temporal/t.vect.db.select/test.t.vect.db.select.sh

@@ -22,8 +22,8 @@ t.register -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 s
 t.vect.observe.strds input=prec strds=precip_abs1 output=prec_observer vector=prec_observer column=observation
 t.vect.observe.strds input=prec strds=precip_abs1 output=prec_observer vector=prec_observer column=observation
 t.vect.list input=prec_observer
 t.vect.list input=prec_observer
 t.vect.db.select input=prec_observer
 t.vect.db.select input=prec_observer
-t.vect.db.select input=prec_observer where="cat = 1" fs="  |  "
-t.vect.db.select input=prec_observer where="cat = 1" fs="  |  " columns=observation
+t.vect.db.select input=prec_observer where="cat = 1" separator="  |  "
+t.vect.db.select input=prec_observer where="cat = 1" separator="  |  " columns=observation
 
 
 # Time instances
 # Time instances
 t.register --o input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2004-01-01 00:00:00" increment="3 months"
 t.register --o input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2004-01-01 00:00:00" increment="3 months"
@@ -31,7 +31,7 @@ t.register --o input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
 t.vect.observe.strds --o input=prec strds=precip_abs1 output=prec_observer vector=prec_observer 
 t.vect.observe.strds --o input=prec strds=precip_abs1 output=prec_observer vector=prec_observer 
 t.vect.list input=prec_observer
 t.vect.list input=prec_observer
 t.vect.db.select input=prec_observer
 t.vect.db.select input=prec_observer
-t.vect.db.select input=prec_observer where="cat = 1" fs="  |  "
+t.vect.db.select input=prec_observer where="cat = 1" separator="  |  "
 
 
 # @postprocess
 # @postprocess
 t.unregister type=rast maps=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

+ 3 - 3
temporal/t.vect.list/t.vect.list.py

@@ -58,9 +58,9 @@
 #%end
 #%end
 
 
 #%option
 #%option
-#% key: fs
+#% key: separator
 #% type: string
 #% type: string
-#% description: Field separator character between the columns, default is tabular "\t"
+#% description: Separator character between the columns, default is tabular "\t"
 #% required: no
 #% required: no
 #%end
 #%end
 
 
@@ -82,7 +82,7 @@ def main():
     columns = options["columns"]
     columns = options["columns"]
     order = options["order"]
     order = options["order"]
     where = options["where"]
     where = options["where"]
-    separator = options["fs"]
+    separator = options["separator"]
     method = options["method"]
     method = options["method"]
     header = flags["h"]
     header = flags["h"]
 
 

+ 18 - 18
temporal/t.vect.list/test.t.vect.list.layer.sh

@@ -86,35 +86,35 @@ t.create --o type=stvds temporaltype=absolute output=soils_abs5 title="A test wi
 
 
 # The first @test
 # The first @test
 t.register type=vect --o   input=soils_abs1 file="${n1}" start="2001-01-01" increment="1 months"
 t.register type=vect --o   input=soils_abs1 file="${n1}" start="2001-01-01" increment="1 months"
-t.vect.list    fs=" | " method=comma     input=soils_abs1
+t.vect.list    separator=" | " method=comma     input=soils_abs1
 t.vect.list -h input=soils_abs1
 t.vect.list -h input=soils_abs1
-t.vect.list -h fs=" | " method=cols      input=soils_abs1
-t.vect.list -h fs=" | " method=delta     input=soils_abs1
-t.vect.list -h fs=" | " method=deltagaps input=soils_abs1
+t.vect.list -h separator=" | " method=cols      input=soils_abs1
+t.vect.list -h separator=" | " method=delta     input=soils_abs1
+t.vect.list -h separator=" | " method=deltagaps input=soils_abs1
 
 
 t.register type=vect --o -i input=soils_abs2 file="${n2}"
 t.register type=vect --o -i input=soils_abs2 file="${n2}"
-t.vect.list    fs=" | " method=comma     input=soils_abs2
+t.vect.list    separator=" | " method=comma     input=soils_abs2
 t.vect.list -h input=soils_abs2
 t.vect.list -h input=soils_abs2
-t.vect.list -h fs=" | " method=cols      input=soils_abs2
-t.vect.list -h fs=" | " method=delta     input=soils_abs2
-t.vect.list -h fs=" | " method=deltagaps input=soils_abs2
+t.vect.list -h separator=" | " method=cols      input=soils_abs2
+t.vect.list -h separator=" | " method=delta     input=soils_abs2
+t.vect.list -h separator=" | " method=deltagaps input=soils_abs2
 
 
 t.register type=vect --o -i input=soils_abs3 file="${n3}"
 t.register type=vect --o -i input=soils_abs3 file="${n3}"
-t.vect.list    fs=" | " method=comma     input=soils_abs3
-t.vect.list -h fs=" | " method=delta     input=soils_abs3
-t.vect.list -h fs=" | " method=deltagaps input=soils_abs3
+t.vect.list    separator=" | " method=comma     input=soils_abs3
+t.vect.list -h separator=" | " method=delta     input=soils_abs3
+t.vect.list -h separator=" | " method=deltagaps input=soils_abs3
 
 
 t.register type=vect --o -i input=soils_abs4 file="${n4}"
 t.register type=vect --o -i input=soils_abs4 file="${n4}"
-t.vect.list    fs=" | " method=comma     input=soils_abs4
-t.vect.list -h fs=" | " method=delta     input=soils_abs4
-t.vect.list -h fs=" | " method=deltagaps input=soils_abs4
+t.vect.list    separator=" | " method=comma     input=soils_abs4
+t.vect.list -h separator=" | " method=delta     input=soils_abs4
+t.vect.list -h separator=" | " method=deltagaps input=soils_abs4
 
 
 t.register type=vect --o -i input=soils_abs5 file="${n5}"
 t.register type=vect --o -i input=soils_abs5 file="${n5}"
-t.vect.list    fs=" | " method=comma     input=soils_abs5
+t.vect.list    separator=" | " method=comma     input=soils_abs5
 t.vect.list -h input=soils_abs5
 t.vect.list -h input=soils_abs5
-t.vect.list -h fs=" | " method=cols      input=soils_abs5
-t.vect.list -h fs=" | " method=delta     input=soils_abs5
-t.vect.list -h fs=" | " method=deltagaps input=soils_abs5
+t.vect.list -h separator=" | " method=cols      input=soils_abs5
+t.vect.list -h separator=" | " method=delta     input=soils_abs5
+t.vect.list -h separator=" | " method=deltagaps input=soils_abs5
 
 
 t.unregister type=vect maps=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=soils_abs1,soils_abs2,soils_abs3,soils_abs4,soils_abs5
 t.remove type=stvds input=soils_abs1,soils_abs2,soils_abs3,soils_abs4,soils_abs5

+ 18 - 18
temporal/t.vect.list/test.t.vect.list.sh

@@ -72,35 +72,35 @@ t.create --o type=stvds temporaltype=absolute output=lidar_abs5 title="A test wi
 
 
 # The first @test
 # The first @test
 t.register --o type=vect  input=lidar_abs1 file="${n1}" start="2001-01-01" increment="1 months"
 t.register --o type=vect  input=lidar_abs1 file="${n1}" start="2001-01-01" increment="1 months"
-t.vect.list    fs=" | " method=comma     input=lidar_abs1
+t.vect.list    separator=" | " method=comma     input=lidar_abs1
 t.vect.list -h input=lidar_abs1
 t.vect.list -h input=lidar_abs1
-t.vect.list -h fs=" | " method=cols      input=lidar_abs1
-t.vect.list -h fs=" | " method=delta     input=lidar_abs1
-t.vect.list -h fs=" | " method=deltagaps input=lidar_abs1
+t.vect.list -h separator=" | " method=cols      input=lidar_abs1
+t.vect.list -h separator=" | " method=delta     input=lidar_abs1
+t.vect.list -h separator=" | " method=deltagaps input=lidar_abs1
 
 
 t.register --o type=vect -i input=lidar_abs2 file="${n2}"
 t.register --o type=vect -i input=lidar_abs2 file="${n2}"
-t.vect.list    fs=" | " method=comma     input=lidar_abs2
+t.vect.list    separator=" | " method=comma     input=lidar_abs2
 t.vect.list -h input=lidar_abs2
 t.vect.list -h input=lidar_abs2
-t.vect.list -h fs=" | " method=cols      input=lidar_abs2
-t.vect.list -h fs=" | " method=delta     input=lidar_abs2
-t.vect.list -h fs=" | " method=deltagaps input=lidar_abs2
+t.vect.list -h separator=" | " method=cols      input=lidar_abs2
+t.vect.list -h separator=" | " method=delta     input=lidar_abs2
+t.vect.list -h separator=" | " method=deltagaps input=lidar_abs2
 
 
 t.register --o type=vect -i input=lidar_abs3 file="${n3}"
 t.register --o type=vect -i input=lidar_abs3 file="${n3}"
-t.vect.list    fs=" | " method=comma     input=lidar_abs3
-t.vect.list -h fs=" | " method=delta     input=lidar_abs3
-t.vect.list -h fs=" | " method=deltagaps input=lidar_abs3
+t.vect.list    separator=" | " method=comma     input=lidar_abs3
+t.vect.list -h separator=" | " method=delta     input=lidar_abs3
+t.vect.list -h separator=" | " method=deltagaps input=lidar_abs3
 
 
 t.register --o type=vect -i input=lidar_abs4 file="${n4}"
 t.register --o type=vect -i input=lidar_abs4 file="${n4}"
-t.vect.list    fs=" | " method=comma     input=lidar_abs4
-t.vect.list -h fs=" | " method=delta     input=lidar_abs4
-t.vect.list -h fs=" | " method=deltagaps input=lidar_abs4
+t.vect.list    separator=" | " method=comma     input=lidar_abs4
+t.vect.list -h separator=" | " method=delta     input=lidar_abs4
+t.vect.list -h separator=" | " method=deltagaps input=lidar_abs4
 
 
 t.register --o type=vect -i input=lidar_abs5 file="${n5}"
 t.register --o type=vect -i input=lidar_abs5 file="${n5}"
-t.vect.list    fs=" | " method=comma     input=lidar_abs5
+t.vect.list    separator=" | " method=comma     input=lidar_abs5
 t.vect.list -h input=lidar_abs5
 t.vect.list -h input=lidar_abs5
-t.vect.list -h fs=" | " method=cols      input=lidar_abs5
-t.vect.list -h fs=" | " method=delta     input=lidar_abs5
-t.vect.list -h fs=" | " method=deltagaps input=lidar_abs5
+t.vect.list -h separator=" | " method=cols      input=lidar_abs5
+t.vect.list -h separator=" | " method=delta     input=lidar_abs5
+t.vect.list -h separator=" | " method=deltagaps input=lidar_abs5
 
 
 t.unregister type=vect maps=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
 t.unregister type=vect maps=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
 t.remove type=stvds input=lidar_abs1,lidar_abs2,lidar_abs3,lidar_abs4,lidar_abs5
 t.remove type=stvds input=lidar_abs1,lidar_abs2,lidar_abs3,lidar_abs4,lidar_abs5

+ 2 - 2
temporal/t.vect.univar/t.vect.univar.py

@@ -45,9 +45,9 @@
 #%end
 #%end
 
 
 #%option
 #%option
-#% key: fs
+#% key: separator
 #% type: string
 #% type: string
-#% description: Field separator character between the output columns
+#% description: Separator character between the output columns
 #% required: no
 #% required: no
 #% answer: |
 #% answer: |
 #%end
 #%end

+ 8 - 3
temporal/temporalintro.html

@@ -21,6 +21,7 @@ List of general management modules:
 <ul>
 <ul>
     <li><a href="t.connect.html">t.connect</a></li>
     <li><a href="t.connect.html">t.connect</a></li>
     <li><a href="t.create.html">t.create</a></li>
     <li><a href="t.create.html">t.create</a></li>
+    <li><a href="t.rename.html">t.rename</a></li>
     <li><a href="t.remove.html">t.remove</a></li>
     <li><a href="t.remove.html">t.remove</a></li>
     <li><a href="t.register.html">t.register</a></li>
     <li><a href="t.register.html">t.register</a></li>
     <li><a href="t.unregister.html">t.unregister</a></li>
     <li><a href="t.unregister.html">t.unregister</a></li>
@@ -36,7 +37,7 @@ List of general management modules:
 Space time datasets are stored in a temporal database. SQLite3 or 
 Space time datasets are stored in a temporal database. SQLite3 or 
 PostgreSQL are supported as SQL database back end. 
 PostgreSQL are supported as SQL database back end. 
 Connection settings are performed with <a href="t.connect.html">t.connect</a>.
 Connection settings are performed with <a href="t.connect.html">t.connect</a>.
-<!-- todo: really always PERMANENT? -->
+<!-- todo: really always PERMANENT? -> Yes thats the default that can be modified -->
 As default a sqlite3 database will be created in the PERMANENT mapset that
 As default a sqlite3 database will be created in the PERMANENT mapset that
 stores all space time datasets and registered time series maps from all
 stores all space time datasets and registered time series maps from all
 mapsets in the location.
 mapsets in the location.
@@ -50,11 +51,15 @@ and semantic informations can be provided. The module
 from the temporal database. Use  <a href="t.support.html">t.support</a>
 from the temporal database. Use  <a href="t.support.html">t.support</a>
 to modify the metadata of space time datasets or to update the metadata
 to modify the metadata of space time datasets or to update the metadata
 that is derived from registered maps. This module also checks for removed
 that is derived from registered maps. This module also checks for removed
-and modified maps and updates the space time datasets accordingly.
+and modified maps and updates the space time datasets accordingly. 
+You can rename a space time dataset with <a href="t.rename.html">t.rename</a>. 
 <p>
 <p>
 The module <a href="t.register.html">t.register</a> was designed to 
 The module <a href="t.register.html">t.register</a> was designed to 
 register raster, 3D raster and vector maps in the temporal database and
 register raster, 3D raster and vector maps in the temporal database and
-optionally in a space time dataset.
+optionally in a space time dataset. It supports different input options. Maps
+to register can be provided as a comma separated string on the command line, or
+in an input file. The module supports the definition of time stamps 
+(time instances or intervals) for each map in the input file.
 With  <a href="t.unregister.html">t.unregister</a> maps can be unregistered
 With  <a href="t.unregister.html">t.unregister</a> maps can be unregistered
 from space time datasets or the temporal database.
 from space time datasets or the temporal database.
 <p>
 <p>