temporal: selective sync to trunk

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63299 15284696-431f-4ddb-bdfa-cd5b030d7da7

temporal/Makefile

@@ -1,5 +1,9 @@
 MODULE_TOPDIR = ..
 
+#	t.rast.algebra \
+#	t.rast3d.algebra \
+#	t.vect.algebra \
+
 SUBDIRS = \
 	t.connect \
 	t.create \

temporal/t.create/t.create.py

@@ -2,11 +2,11 @@
 # -*- coding: utf-8 -*-
 ############################################################################
 #
-# MODULE:	t.create
-# AUTHOR(S):	Soeren Gebbert
+# MODULE:       t.create
+# AUTHOR(S):    Soeren Gebbert
 #
-# PURPOSE:	Create a space time dataset
-# COPYRIGHT:	(C) 2011 by the GRASS Development Team
+# PURPOSE:      Create a space time dataset
+# COPYRIGHT:    (C) 2011-2014 by the GRASS Development Team
 #
 #		This program is free software under the GNU General Public
 #		License (version 2). Read the file COPYING that comes with GRASS
@@ -25,7 +25,7 @@
 #%end
 
 #%option G_OPT_STDS_TYPE
-#% description: The output type of the space time dataset
+#% description: Type of the output space time dataset
 #%end
 
 #%option G_OPT_T_TYPE
@@ -57,8 +57,8 @@
 #% multiple: no
 #%end
 
-import grass.temporal as tgis
 import grass.script as grass
+import grass.temporal as tgis
 
 ############################################################################
 
@@ -73,6 +73,7 @@ def main():
     descr = options["description"]
     semantic = options["semantictype"]
 
+    # Make sure the temporal database exists
     tgis.init()
     
     tgis.open_new_stds(name, type, temporaltype, title, descr, 

temporal/t.info/t.info.py

@@ -2,11 +2,11 @@
 # -*- coding: utf-8 -*-
 ############################################################################
 #
-# MODULE:   t.info
+# MODULE:       t.info
 # AUTHOR(S):    Soeren Gebbert
 #
-# PURPOSE:  Print information about a space-time dataset
-# COPYRIGHT:    (C) 2011 by the GRASS Development Team
+# PURPOSE:      Print information about a space-time dataset
+# COPYRIGHT:    (C) 2011-2014 by the GRASS Development Team
 #
 #       This program is free software under the GNU General Public
 #       License (version 2). Read the file COPYING that comes with GRASS
@@ -24,15 +24,10 @@
 #% description: Name of an existing space time dataset or map
 #%end
 
-#%option
-#% key: type
-#% type: string
-#% description: Type of the dataset, default is strds (space time raster dataset)
-#% required: no
+#%option G_OPT_STDS_TYPE
 #% guidependency: input
 #% guisection: Required
 #% options: strds, str3ds, stvds, rast, rast3d, vect
-#% answer: strds
 #%end
 
 #%flag

temporal/t.merge/testsuite/test.t.merge.sh

@@ -49,4 +49,4 @@ t.rast.list precip_abs4
 
 t.remove type=strds input=precip_abs1,precip_abs2,precip_abs3,precip_abs4
 t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6

temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py

@@ -6,10 +6,10 @@
 # AUTHOR(S):	Soeren Gebbert
 #
 # PURPOSE:	Aggregates data of an existing space time raster dataset using the time intervals of a second space time dataset
-# COPYRIGHT:	(C) 2011 by the gcore Development Team
+# COPYRIGHT:	(C) 2011 by the GRASS Development Team
 #
 #		This program is free software under the GNU General Public
-#		License (version 2). Read the file COPYING that comes with gcore
+#		License (version 2). Read the file COPYING that comes with GRASS
 #		for details.
 #
 #############################################################################
@@ -29,7 +29,7 @@
 #%end
 
 #%option G_OPT_STDS_TYPE
-#% description: Type of the aggregation space time dataset, default is strds
+#% description: Type of the aggregation space time dataset
 #%end
 
 #%option G_OPT_STRDS_OUTPUT

temporal/t.rast.algebra/testsuite/test_raster_algebra.py

@@ -90,7 +90,7 @@ class TestTRastAlgebra(gunittest.TestCase):
     def test_simple_arith_hash_1(self):
         """Simple arithmetic test including the hash operator"""
        
-        self.assertModule("t.rast.algebra",  expression='R = A + A {#, equal,l} A', basename="r")
+        self.assertModule("t.rast.algebra",  expression='R = A + (A {#, equal,l} A)', basename="r")
 
         D = tgis.open_old_stds("R", type="strds")
         

temporal/t.rast.algebra/testsuite/test_raster_algebra_fails.py

@@ -31,12 +31,14 @@ class TestTRastAlgebraFails(gunittest.TestCase):
 
     def test_error_handling(self):        
         # Syntax error
-        self.assertModuleFail("t.rast.algebra",  expression="R == A {+,equal| precedes| follows,l} B", basename="r")
+        self.assertModuleFail("t.rast.algebra",  expression="R == A {+,equal| precedes| follows,l} B", 
+                                          basename="r")
         # No STRDS
         self.assertModuleFail("t.rast.algebra",  expression="R = NoSTRDS + NoSTRDS", basename="r")
         # No basename
         self.assertModuleFail("t.rast.algebra",  expression="R = A + B")
-
+        # Catch temporal algebra expressions that are prohibited in the raster algebra
+        self.assertModuleFail("t.rast.algebra",  expression="R = strds(A) + strds(B)", basename="r")
 
 if __name__ == '__main__':
     gunittest.test()

temporal/t.rast.list/test.t.rast.list.sh

@@ -9,12 +9,13 @@ g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 export GRASS_OVERWRITE=1
 
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 n1=`g.tempfile pid=1 -d` 
 n2=`g.tempfile pid=2 -d`

temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh

@@ -9,12 +9,13 @@ export GRASS_OVERWRITE=1
 # 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
 
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
@@ -46,7 +47,7 @@ t.rast.mapcalc -sn inputs=precip_abs1,precip_abs2 output=precip_abs4 \
 t.info type=strds input=precip_abs4
 
 # Let the test fail
-g.remove rast=prec_1
+g.remove -f type=rast name=prec_1
 t.rast.mapcalc -sn inputs=precip_abs1,precip_abs2 output=precip_abs4 \
            expression=" (precip_abs1 + precip_abs2) * null()" base=new_prec \
            method=equal nprocs=5

temporal/t.rast.neighbors/t.rast.neighbors.py

@@ -109,7 +109,7 @@ def main():
         grass.warning(_("Space time raster dataset <%s> is empty") % sp.get_id())
         return
 
-    new_sp = tgis.check_new_stds(input, "strds", dbif=dbif,
+    new_sp = tgis.check_new_stds(output, "strds", dbif=dbif,
                                                overwrite=overwrite)
     # Configure the r.neighbor module
     neighbor_module = pymod.Module("r.neighbors", input="dummy",

temporal/t.rast.out.vtk/t.rast.out.vtk.py

@@ -146,8 +146,8 @@ def main():
             count += 1
 
     if use_granularity:
-        grass.run_command("g.remove", type='rast', name=null_map, flags='f')
-    grass.run_command("g.remove", type='rast', name=map_name, flags='f')
+        grass.run_command("g.remove", flags='f', type='rast', name=null_map)
+    grass.run_command("g.remove", flags='f', type='rast', name=map_name)
 
 if __name__ == "__main__":
     options, flags = grass.parser()

temporal/t.rast.to.rast3/t.rast.to.rast3.py

@@ -149,7 +149,7 @@ def main():
         except CalledModuleError:
             grass.fatal(_("Unable to create 3D raster map <%s>" % output))
 
-    grass.run_command("g.remove", type='rast', name=null_map, flags='f')
+    grass.run_command("g.remove", flags='f', type='rast', name=null_map)
 
     title = _("Space time voxel cube")
     descr = _("This space time voxel cube was created with t.rast.to.rast3")

temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py

@@ -68,7 +68,7 @@ class TestSTRDSToRast3(TestCase):
         """Remove generated data"""
         #self.runModule("t.remove",  flags="rf",  type="strds",  
         #                           inputs="precip_i,precip_f,precip_d")
-        #self.runModule('g.mremove', type='rast', pattern='prec_*', flags='f')
+        #self.runModule('g.remove', type='rast', pattern='prec_*', flags='f')
         self.del_temp_region()
 
     def otest_3m(self):
@@ -257,7 +257,7 @@ class TestSTRDSToRast3MultiGran(TestCase):
     def tearDown(self):
         """Remove generated data"""
         #self.runModule("t.remove",  flags="rf",  type="strds", inputs="precip_d")
-        #self.runModule('g.mremove', type='rast', pattern='prec_*', flags='f')
+        #self.runModule('g.remove', type='rast', pattern='prec_*', flags='f')
         self.del_temp_region()
 
     def otest_years(self):

temporal/t.rast.univar/test.t.rast.univar.sh

@@ -9,12 +9,12 @@ g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 export GRASS_OVERWRITE=1
 
 # Data generation
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.register type=rast --v -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"

temporal/t.rast3d.univar/test.t.rast3d.univar.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-# Univariate statitsics for space time raster3d datasets
-
-# We need to set a specific region in the
-# @preprocess step of this test. 
-# 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
-
-export GRASS_OVERWRITE=1
-
-# Generate data
-r3.mapcalc expr="prec_1 = rand(0, 550)" -s
-r3.mapcalc expr="prec_2 = rand(0, 450)" -s
-r3.mapcalc expr="prec_3 = rand(0, 320)" -s
-r3.mapcalc expr="prec_4 = rand(0, 510)" -s
-r3.mapcalc expr="prec_5 = rand(0, 300)" -s
-r3.mapcalc expr="prec_6 = rand(0, 650)" -s
-
-t.create type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register type=rast3d --v -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"
-t.info type=str3ds input=precip_abs1
-
-# The first @test
-t.rast3d.univar -e input=precip_abs1 
-
-t.rast3d.univar -s input=precip_abs1 
-
-t.remove -rf type=str3ds input=precip_abs1
-

temporal/t.register/test.t.register.raster.sh

@@ -13,12 +13,13 @@ export GRASS_OVERWRITE=1
 # 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
 
-r.mapcalc  expr="prec_1 = rand(0, 550)"
-r.mapcalc  expr="prec_2 = rand(0, 450)"
-r.mapcalc  expr="prec_3 = rand(0, 320)"
-r.mapcalc  expr="prec_4 = rand(0, 510)"
-r.mapcalc  expr="prec_5 = rand(0, 300)"
-r.mapcalc  expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc  expr="prec_1 = rand(0, 550)" -s
+r.mapcalc  expr="prec_2 = rand(0, 450)" -s
+r.mapcalc  expr="prec_3 = rand(0, 320)" -s
+r.mapcalc  expr="prec_4 = rand(0, 510)" -s
+r.mapcalc  expr="prec_5 = rand(0, 300)" -s
+r.mapcalc  expr="prec_6 = rand(0, 650)" -s
 
 # The first @test
 # We create the space time raster inputs and register the raster maps with absolute time interval

temporal/t.select/t.select.py

@@ -44,6 +44,8 @@ import grass.script as grass
 import grass.temporal as tgis
 import sys
 
+############################################################################
+
 def main():
 
     expression = options['expression']

temporal/t.select/test.t.select.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/sh
 
-export GRASS_OVERWRITE=1
-
 # Test for temporal algebra in LatLon location.
 n1=`g.tempfile pid=1 -d`
 n2=`g.tempfile pid=2 -d`

temporal/t.shift/t.shift.py

@@ -2,11 +2,11 @@
 # -*- coding: utf-8 -*-
 ############################################################################
 #
-# MODULE:	t.shift
-# AUTHOR(S):	Soeren Gebbert
+# MODULE:       t.shift
+# AUTHOR(S):    Soeren Gebbert
 #
-# PURPOSE:	Temporally shift the maps of a space time dataset.
-# COPYRIGHT:	(C) 2013 by the GRASS Development Team
+# PURPOSE:      Temporally shift the maps of a space time dataset
+# COPYRIGHT:    (C) 2013-2014 by the GRASS Development Team
 #
 #		This program is free software under the GNU General Public
 #		License (version 2). Read the file COPYING that comes with GRASS
@@ -24,15 +24,9 @@
 #% description: Name of an existing space time dataset
 #%end
 
-#%option
-#% key: type
-#% type: string
-#% description: Type of the dataset, default is strds (space time raster dataset)
-#% required: no
+#%option G_OPT_T_TYPE
 #% guidependency: input
 #% guisection: Required
-#% options: strds, str3ds, stvds
-#% answer: strds
 #%end
 
 #%option

temporal/t.snap/t.snap.py

@@ -2,10 +2,10 @@
 # -*- coding: utf-8 -*-
 ############################################################################
 #
-# MODULE:   t.snap
+# MODULE:       t.snap
 # AUTHOR(S):    Soeren Gebbert
 #
-# PURPOSE:  Temporally snap the maps of a space time dataset.
+# PURPOSE:      Temporally snap the maps of a space time dataset.
 # COPYRIGHT:    (C) 2013 by the GRASS Development Team
 #
 #       This program is free software under the GNU General Public
@@ -24,15 +24,9 @@
 #% description: Name of an existing space time dataset
 #%end
 
-#%option
-#% key: type
-#% type: string
-#% description: Type of the dataset, default is strds (space time raster dataset)
-#% required: no
+#%option G_OPT_STDS_TYPE
 #% guidependency: input
 #% guisection: Required
-#% options: strds, str3ds, stvds
-#% answer: strds
 #%end
 
 import grass.script as grass

temporal/t.support/t.support.py

@@ -65,8 +65,9 @@
 #% description: Update metadata information, temporal and spatial extent from registered maps
 #%end
 
-import grass.temporal as tgis
+
 import grass.script as grass
+import grass.temporal as tgis
 
 ############################################################################
 

temporal/t.support/test.t.support.sh

@@ -38,6 +38,7 @@ t.info type=strds input=precip_abs1
 
 # @test the map update function
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=20 res3=20
+
 # Generate data
 r.mapcalc --o expr="prec_1 = rand(0, 55)" -s
 r.mapcalc --o expr="prec_2 = rand(0, 45)" -s

temporal/t.topology/t.topology.py

@@ -2,11 +2,11 @@
 # -*- coding: utf-8 -*-
 ############################################################################
 #
-# MODULE:	t.topology
-# AUTHOR(S):	Soeren Gebbert
+# MODULE:       t.topology
+# AUTHOR(S):    Soeren Gebbert
 #
-# PURPOSE:	List temporal topology of a space time dataset
-# COPYRIGHT:	(C) 2011 by the GRASS Development Team
+# PURPOSE:      List temporal topology of a space time dataset
+# COPYRIGHT:    (C) 2011-2014 by the GRASS Development Team
 #
 #		This program is free software under the GNU General Public
 #		License (version 2). Read the file COPYING that comes with GRASS

temporal/t.vect.extract/test.t.vect.extract.layer.sh

@@ -42,6 +42,6 @@ t.remove type=strds input=precip_abs1
 t.remove type=stvds input=prec_observer,test_extract_1,test_extract_2,test_extract_3
 t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
 
-g.remove vect=prec_observer
-g.mremove -f type=vect pattern=test_*
-g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=vect name=prec_observer
+g.remove -f type=vect pattern=test_*
+g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6

temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh

@@ -37,4 +37,4 @@ t.remove type=strds input=precip_abs1
 t.remove type=stvds input=prec_observer
 
 #g.remove -f type=vect name=prec_observer
-g.remove -f type=rast pattern=test_prec_*
+#g.remove -f type=rast pattern="test_prec_*"

temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh

@@ -19,7 +19,7 @@ t.create --o type=strds temporaltype=relative output=precip_abs1 title="A test"
 t.register -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start=0 increment=1 unit=months
 
 # The @test
-t.vect.observe.strds input=prec strds=precip_abs1 output=prec_observer vector=prec_observer
+t.vect.observe.strds input=prec strds=precip_abs1 output=prec_observer vector=prec_observer column=observation
 v.info prec_observer
 t.info type=stvds input=prec_observer
 t.vect.list input=prec_observer
@@ -31,5 +31,5 @@ t.remove type=strds input=precip_abs1
 t.remove type=stvds input=prec_observer
 t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
 
-g.remove -f type=vect name=prec_observer,test_extract
-g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+#g.remove -f type=vect name=prec_observer,test_extract
+#g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6

temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh

@@ -45,5 +45,5 @@ t.vect.list input=test_1_observer
 t.vect.db.select input=test_1_observer columns=cat,test1,test2,test3
 
 # @postprocess
-t.remove -rf type=strds input=precip_abs1,precip_abs2
-t.remove -rf type=stvds input=prec_observer,test_1_observer
+#t.remove -rf type=strds input=precip_abs1,precip_abs2
+#t.remove -rf type=stvds input=prec_observer,test_1_observer