瀏覽代碼

Renamed space_time_dataset into stds in several functions

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@60547 15284696-431f-4ddb-bdfa-cd5b030d7da7
Soeren Gebbert 11 年之前
父節點
當前提交
abd79359a2
共有 32 個文件被更改,包括 79 次插入79 次删除
  1. 3 3
      lib/python/temporal/extract.py
  2. 2 2
      lib/python/temporal/list_stds.py
  3. 4 4
      lib/python/temporal/mapcalc.py
  4. 4 4
      lib/python/temporal/open_stds.py
  5. 1 1
      lib/python/temporal/register.py
  6. 1 1
      lib/python/temporal/stds_export.py
  7. 1 1
      lib/python/temporal/temporal_algebra.py
  8. 1 1
      lib/python/temporal/temporal_raster_base_algebra.py
  9. 1 1
      lib/python/temporal/temporal_vector_algebra.py
  10. 2 2
      lib/python/temporal/unittests_register.py
  11. 3 3
      lib/python/temporal/unittests_temporal_raster3d_algebra.py
  12. 25 25
      lib/python/temporal/unittests_temporal_raster_algebra.py
  13. 1 1
      lib/python/temporal/univar_statistics.py
  14. 1 1
      temporal/t.create/t.create.py
  15. 2 2
      temporal/t.merge/t.merge.py
  16. 3 3
      temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py
  17. 2 2
      temporal/t.rast.aggregate/t.rast.aggregate.py
  18. 1 1
      temporal/t.rast.colors/t.rast.colors.py
  19. 1 1
      temporal/t.rast.gapfill/t.rast.gapfill.py
  20. 3 3
      temporal/t.rast.neighbors/t.rast.neighbors.py
  21. 1 1
      temporal/t.rast.out.vtk/t.rast.out.vtk.py
  22. 1 1
      temporal/t.rast.series/t.rast.series.py
  23. 1 1
      temporal/t.rast.to.rast3/t.rast.to.rast3.py
  24. 1 1
      temporal/t.remove/t.remove.py
  25. 1 1
      temporal/t.shift/t.shift.py
  26. 1 1
      temporal/t.snap/t.snap.py
  27. 1 1
      temporal/t.support/t.support.py
  28. 1 1
      temporal/t.topology/t.topology.py
  29. 2 2
      temporal/t.unregister/t.unregister.py
  30. 1 1
      temporal/t.vect.db.select/t.vect.db.select.py
  31. 4 4
      temporal/t.vect.observe.strds/t.vect.observe.strds.py
  32. 2 2
      temporal/t.vect.what.strds/t.vect.what.strds.py

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

@@ -58,9 +58,9 @@ def extract_dataset(input, output, type, where, expression, base, nprocs=1,
     dbif = SQLDatabaseInterfaceConnection()
     dbif = SQLDatabaseInterfaceConnection()
     dbif.connect()
     dbif.connect()
 
 
-    sp = open_old_space_time_dataset(input, type, dbif)
+    sp = open_old_stds(input, type, dbif)
     # Check the new stds
     # Check the new stds
-    new_sp = check_new_space_time_dataset(output, type, dbif,
+    new_sp = check_new_stds(output, type, dbif,
                                           core.overwrite())
                                           core.overwrite())
     if type == "vector":
     if type == "vector":
         rows = sp.get_registered_maps(
         rows = sp.get_registered_maps(
@@ -165,7 +165,7 @@ def extract_dataset(input, output, type, where, expression, base, nprocs=1,
         msgr.percent(0, num_rows, 1)
         msgr.percent(0, num_rows, 1)
 
 
         temporal_type, semantic_type, title, description = sp.get_initial_values()
         temporal_type, semantic_type, title, description = sp.get_initial_values()
-        new_sp = open_new_space_time_dataset(output, type,
+        new_sp = open_new_stds(output, type,
                                              sp.get_temporal_type(),
                                              sp.get_temporal_type(),
                                              title, description,
                                              title, description,
                                              semantic_type, dbif,
                                              semantic_type, dbif,

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

@@ -47,7 +47,7 @@ def get_dataset_list(type,  temporal_type,  columns=None,  where=None,  order=No
         >>> import grass.temporal as tgis
         >>> import grass.temporal as tgis
         >>> tgis.init()
         >>> tgis.init()
         >>> name = "list_stds_test"
         >>> name = "list_stds_test"
-        >>> sp = tgis.open_new_space_time_dataset(name=name, type="strds", 
+        >>> sp = tgis.open_new_stds(name=name, type="strds", 
         ... temporaltype="absolute", title="title", descr="descr", semantic="mean", dbif=None, overwrite=True)
         ... temporaltype="absolute", title="title", descr="descr", semantic="mean", dbif=None, overwrite=True)
         >>> mapset = tgis.get_current_mapset()
         >>> mapset = tgis.get_current_mapset()
         >>> stds_list = tgis.get_dataset_list("strds", "absolute", columns="name")
         >>> stds_list = tgis.get_dataset_list("strds", "absolute", columns="name")
@@ -135,7 +135,7 @@ def list_maps_of_stds(type, input, columns, order, where, separator, method, hea
     dbif, connected = init_dbif(None)
     dbif, connected = init_dbif(None)
     msgr = get_tgis_message_interface()
     msgr = get_tgis_message_interface()
 
 
-    sp = open_old_space_time_dataset(input, type, dbif)
+    sp = open_old_stds(input, type, dbif)
 
 
     if separator is None or separator == "":
     if separator is None or separator == "":
         separator = "\t"
         separator = "\t"

+ 4 - 4
lib/python/temporal/mapcalc.py

@@ -84,7 +84,7 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
 
 
     input_name_list = inputs.split(",")
     input_name_list = inputs.split(",")
 
 
-    first_input = open_old_space_time_dataset(input_name_list[0], type, dbif)
+    first_input = open_old_stds(input_name_list[0], type, dbif)
 
 
     # All additional inputs in reverse sorted order to avoid
     # All additional inputs in reverse sorted order to avoid
     # wrong name substitution
     # wrong name substitution
@@ -94,10 +94,10 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
     input_list = []
     input_list = []
 
 
     for input in input_name_list:
     for input in input_name_list:
-        sp = open_old_space_time_dataset(input, type, dbif)
+        sp = open_old_stds(input, type, dbif)
         input_list.append(copy.copy(sp))
         input_list.append(copy.copy(sp))
 
 
-    new_sp = check_new_space_time_dataset(output, type, dbif,
+    new_sp = check_new_stds(output, type, dbif,
                                          core.overwrite())
                                          core.overwrite())
 
 
     # Sample all inputs by the first input and create a sample matrix
     # Sample all inputs by the first input and create a sample matrix
@@ -281,7 +281,7 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
 
 
         temporal_type, semantic_type, title, description = first_input.get_initial_values()
         temporal_type, semantic_type, title, description = first_input.get_initial_values()
 
 
-        new_sp = open_new_space_time_dataset(output, type,
+        new_sp = open_new_stds(output, type,
                                          temporal_type, title, description,
                                          temporal_type, title, description,
                                          semantic_type, dbif,
                                          semantic_type, dbif,
                                          core.overwrite())
                                          core.overwrite())

+ 4 - 4
lib/python/temporal/open_stds.py

@@ -26,7 +26,7 @@ from factory import *
 
 
 ###############################################################################
 ###############################################################################
 
 
-def open_old_space_time_dataset(name, type, dbif=None):
+def open_old_stds(name, type, dbif=None):
     """!This function opens an existing space time dataset and return the
     """!This function opens an existing space time dataset and return the
        created and intialized object of the specified type.
        created and intialized object of the specified type.
 
 
@@ -76,7 +76,7 @@ def open_old_space_time_dataset(name, type, dbif=None):
 
 
 ###############################################################################
 ###############################################################################
 
 
-def check_new_space_time_dataset(name, type, dbif=None, overwrite=False):
+def check_new_stds(name, type, dbif=None, overwrite=False):
     """!Check if a new space time dataset of a specific type can be created
     """!Check if a new space time dataset of a specific type can be created
 
 
        @param name The name of the new space time dataset
        @param name The name of the new space time dataset
@@ -129,7 +129,7 @@ def check_new_space_time_dataset(name, type, dbif=None, overwrite=False):
 
 
 ###############################################################################
 ###############################################################################
 
 
-def open_new_space_time_dataset(name, type, temporaltype, title, descr, semantic,
+def open_new_stds(name, type, temporaltype, title, descr, semantic,
                               dbif=None, overwrite=False):
                               dbif=None, overwrite=False):
     """!Create a new space time dataset of a specific type
     """!Create a new space time dataset of a specific type
 
 
@@ -149,7 +149,7 @@ def open_new_space_time_dataset(name, type, temporaltype, title, descr, semantic
     """
     """
     dbif, connected = init_dbif(dbif)
     dbif, connected = init_dbif(dbif)
     msgr = get_tgis_message_interface()
     msgr = get_tgis_message_interface()
-    sp =  check_new_space_time_dataset(name, type, dbif, overwrite)
+    sp =  check_new_stds(name, type, dbif, overwrite)
 
 
     if sp.is_in_db(dbif):
     if sp.is_in_db(dbif):
         msgr.warning(_("Overwrite space time %(sp)s dataset <%(name)s> and "
         msgr.warning(_("Overwrite space time %(sp)s dataset <%(name)s> and "

+ 1 - 1
lib/python/temporal/register.py

@@ -94,7 +94,7 @@ def register_maps_in_space_time_dataset(
 
 
     # The name of the space time dataset is optional
     # The name of the space time dataset is optional
     if name:
     if name:
-        sp = open_old_space_time_dataset(name, type, dbif)
+        sp = open_old_stds(name, type, dbif)
 
 
         if sp.is_time_relative() and (start or end) and not unit:
         if sp.is_time_relative() and (start or end) and not unit:
             dbif.close()
             dbif.close()

+ 1 - 1
lib/python/temporal/stds_export.py

@@ -261,7 +261,7 @@ def export_stds(input, output, compression, workdir, where, format_="pack",
     else:
     else:
         columns = "name,start_time,end_time"
         columns = "name,start_time,end_time"
 
 
-    sp = open_old_space_time_dataset(input, type_)
+    sp = open_old_stds(input, type_)
     rows = sp.get_registered_maps(columns, where, "start_time", None)
     rows = sp.get_registered_maps(columns, where, "start_time", None)
 
 
     if compression == "gzip":
     if compression == "gzip":

+ 1 - 1
lib/python/temporal/temporal_algebra.py

@@ -1771,7 +1771,7 @@ class TemporalAlgebraParser(object):
 
 
         """
         """
         if self.run:
         if self.run:
-            resultstds = open_new_space_time_dataset(t[1], self.stdstype, \
+            resultstds = open_new_stds(t[1], self.stdstype, \
                                                         self.temporaltype, "", "", \
                                                         self.temporaltype, "", "", \
                                                         'mean', dbif=self.dbif, \
                                                         'mean', dbif=self.dbif, \
                                                         overwrite = self.overwrite)
                                                         overwrite = self.overwrite)

+ 1 - 1
lib/python/temporal/temporal_raster_base_algebra.py

@@ -320,7 +320,7 @@ class TemporalRasterBaseAlgebraParser(TemporalAlgebraParser):
                 # Open connection to temporal database.
                 # Open connection to temporal database.
                 dbif, connect = init_dbif(self.dbif)
                 dbif, connect = init_dbif(self.dbif)
                 # Create result space time dataset.
                 # Create result space time dataset.
-                resultstds = open_new_space_time_dataset(t[1], self.stdstype, \
+                resultstds = open_new_stds(t[1], self.stdstype, \
                                                          'absolute', t[1], t[1], \
                                                          'absolute', t[1], t[1], \
                                                          'mean', self.dbif, \
                                                          'mean', self.dbif, \
                                                          overwrite = self.overwrite)
                                                          overwrite = self.overwrite)

+ 1 - 1
lib/python/temporal/temporal_vector_algebra.py

@@ -704,7 +704,7 @@ class TemporalVectorAlgebraParser(TemporalAlgebraParser):
                     # Open connection to temporal database.
                     # Open connection to temporal database.
                     dbif, connected = init_dbif(dbif=self.dbif)
                     dbif, connected = init_dbif(dbif=self.dbif)
                     # Create result space time dataset.
                     # Create result space time dataset.
-                    resultstds = open_new_space_time_dataset(t[1], self.stdstype, \
+                    resultstds = open_new_stds(t[1], self.stdstype, \
                                                                 'absolute', t[1], t[1], \
                                                                 'absolute', t[1], t[1], \
                                                                 "temporal vector algebra", dbif=dbif,
                                                                 "temporal vector algebra", dbif=dbif,
                                                                 overwrite = self.overwrite)
                                                                 overwrite = self.overwrite)

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

@@ -37,9 +37,9 @@ class TestRegisterFunctions(unittest.TestCase):
         self.assertEqual(ret, 0)
         self.assertEqual(ret, 0)
         
         
         
         
-        self.strds_abs = tgis.open_new_space_time_dataset(name="register_test_abs", type="strds", temporaltype="absolute", 
+        self.strds_abs = tgis.open_new_stds(name="register_test_abs", type="strds", temporaltype="absolute", 
                                             title="Test strds", descr="Test strds", semantic="field")
                                             title="Test strds", descr="Test strds", semantic="field")
-        self.strds_rel = tgis.open_new_space_time_dataset(name="register_test_rel", type="strds", temporaltype="relative", 
+        self.strds_rel = tgis.open_new_stds(name="register_test_rel", type="strds", temporaltype="relative", 
                                             title="Test strds", descr="Test strds", semantic="field")
                                             title="Test strds", descr="Test strds", semantic="field")
 
 
     def test_absolute_time_strds_1(self):
     def test_absolute_time_strds_1(self):

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

@@ -32,7 +32,7 @@ class TestRegisterFunctions(unittest.TestCase):
         ret += grass.script.run_command("r3.mapcalc", overwrite=True, quiet=True, expression="a4 = 4")
         ret += grass.script.run_command("r3.mapcalc", overwrite=True, quiet=True, expression="a4 = 4")
 
 
 
 
-        tgis.open_new_space_time_dataset(name="A", type="str3ds", temporaltype="absolute",
+        tgis.open_new_stds(name="A", type="str3ds", temporaltype="absolute",
                                          title="A", descr="A", semantic="field", overwrite=True)
                                          title="A", descr="A", semantic="field", overwrite=True)
 
 
         tgis.register_maps_in_space_time_dataset(type="rast3d", name="A", maps="a1,a2,a3,a4",
         tgis.register_maps_in_space_time_dataset(type="rast3d", name="A", maps="a1,a2,a3,a4",
@@ -44,7 +44,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra.parse(expression='D = A[-1] + A[1]',
         tra.parse(expression='D = A[-1] + A[1]',
                   basename="d", overwrite=True)
                   basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="str3ds")
+        D = tgis.open_old_stds("D", type="str3ds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_min_min(), 4)  # 1 + 3
         self.assertEqual(D.metadata.get_min_min(), 4)  # 1 + 3
@@ -59,7 +59,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra.parse(expression='D = A[0,0,0,-1] + A[0,0,0,1]',
         tra.parse(expression='D = A[0,0,0,-1] + A[0,0,0,1]',
                   basename="d", overwrite=True)
                   basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="str3ds")
+        D = tgis.open_old_stds("D", type="str3ds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_min_min(), 4)  # 1 + 3
         self.assertEqual(D.metadata.get_min_min(), 4)  # 1 + 3

+ 25 - 25
lib/python/temporal/unittests_temporal_raster_algebra.py

@@ -35,11 +35,11 @@ class TestRegisterFunctions(unittest.TestCase):
         ret += grass.script.run_command("r.mapcalc", overwrite=True, quiet=True, expression="c1 = 7")
         ret += grass.script.run_command("r.mapcalc", overwrite=True, quiet=True, expression="c1 = 7")
 
 
 
 
-        tgis.open_new_space_time_dataset(name="A", type="strds", temporaltype="absolute",
+        tgis.open_new_stds(name="A", type="strds", temporaltype="absolute",
                                          title="A", descr="A", semantic="field", overwrite=True)
                                          title="A", descr="A", semantic="field", overwrite=True)
-        tgis.open_new_space_time_dataset(name="B", type="strds", temporaltype="absolute",
+        tgis.open_new_stds(name="B", type="strds", temporaltype="absolute",
                                          title="B", descr="B", semantic="field", overwrite=True)
                                          title="B", descr="B", semantic="field", overwrite=True)
-        tgis.open_new_space_time_dataset(name="C", type="strds", temporaltype="absolute",
+        tgis.open_new_stds(name="C", type="strds", temporaltype="absolute",
                                          title="B", descr="C", semantic="field", overwrite=True)
                                          title="B", descr="C", semantic="field", overwrite=True)
 
 
         tgis.register_maps_in_space_time_dataset(type="rast", name="A", maps="a1,a2,a3,a4",
         tgis.register_maps_in_space_time_dataset(type="rast", name="A", maps="a1,a2,a3,a4",
@@ -58,7 +58,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression="D = if({contains}, B == 5,  A - 1,  A + 1)", basename="d", overwrite=True)
         tra.parse(expression="D = if({contains}, B == 5,  A - 1,  A + 1)", basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_min_min(), 0) # 1 - 1
         self.assertEqual(D.metadata.get_min_min(), 0) # 1 - 1
@@ -74,7 +74,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression='D = A + A{equal,=#}A', basename="d", overwrite=True)
         tra.parse(expression='D = A + A{equal,=#}A', basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_min_min(), 2)
         self.assertEqual(D.metadata.get_min_min(), 2)
@@ -89,7 +89,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression='D = A + td(A)', basename="d", overwrite=True)
         tra.parse(expression='D = A + td(A)', basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_min_min(), 2)
         self.assertEqual(D.metadata.get_min_min(), 2)
@@ -103,7 +103,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression='D = A / td(A)', basename="d", overwrite=True)
         tra.parse(expression='D = A / td(A)', basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_min_min(), 1)
         self.assertEqual(D.metadata.get_min_min(), 1)
@@ -117,7 +117,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression='D = A {equal,+} td(A)', basename="d", overwrite=True)
         tra.parse(expression='D = A {equal,+} td(A)', basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_min_min(), 2)
         self.assertEqual(D.metadata.get_min_min(), 2)
@@ -132,7 +132,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression='D = A {equal,/} td(A)', basename="d", overwrite=True)
         tra.parse(expression='D = A {equal,/} td(A)', basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_min_min(), 1)
         self.assertEqual(D.metadata.get_min_min(), 1)
@@ -147,7 +147,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression='D = if({equal}, start_date() >= "2001-01-02", A + A)', basename="d", overwrite=True)
         tra.parse(expression='D = if({equal}, start_date() >= "2001-01-02", A + A)', basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 3)
         self.assertEqual(D.metadata.get_number_of_maps(), 3)
         self.assertEqual(D.metadata.get_min_min(), 4)
         self.assertEqual(D.metadata.get_min_min(), 4)
@@ -161,7 +161,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression='D = if({equal}, A#A == 1, A - A)', basename="d", overwrite=True)
         tra.parse(expression='D = if({equal}, A#A == 1, A - A)', basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_min_min(), 0)
         self.assertEqual(D.metadata.get_min_min(), 0)
@@ -176,7 +176,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra.parse(expression='D = if(start_date() < "2001-01-03" && A#A == 1, A{starts,=+}C, A{finishes,=+}C)', \
         tra.parse(expression='D = if(start_date() < "2001-01-03" && A#A == 1, A{starts,=+}C, A{finishes,=+}C)', \
                   basename="d", overwrite=True)
                   basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_min_min(), 9)  # 2 + 7 a2 + c1
         self.assertEqual(D.metadata.get_min_min(), 9)  # 2 + 7 a2 + c1
@@ -190,7 +190,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression="D = A {equal,*} A {equal,+} A", basename="d", overwrite=True)
         tra.parse(expression="D = A {equal,*} A {equal,+} A", basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_min_min(), 2)  # 1*1 + 1
         self.assertEqual(D.metadata.get_min_min(), 2)  # 1*1 + 1
@@ -203,7 +203,7 @@ class TestRegisterFunctions(unittest.TestCase):
         """Simple arithmetic test that creates an empty strds"""
         """Simple arithmetic test that creates an empty strds"""
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression="D = A {during,*} A {during,+} A", basename="d", overwrite=True)
         tra.parse(expression="D = A {during,*} A {during,+} A", basename="d", overwrite=True)
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 0)
         self.assertEqual(D.metadata.get_number_of_maps(), 0)
 
 
@@ -212,7 +212,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression="D = A / A + A*A/A", basename="d", overwrite=True)
         tra.parse(expression="D = A / A + A*A/A", basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_min_min(), 2) # 1/1 + 1*1/1
         self.assertEqual(D.metadata.get_min_min(), 2) # 1/1 + 1*1/1
@@ -225,7 +225,7 @@ class TestRegisterFunctions(unittest.TestCase):
         """Simple temporal intersection test"""
         """Simple temporal intersection test"""
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression="D = A {equal,&+} B", basename="d", overwrite=True)
         tra.parse(expression="D = A {equal,&+} B", basename="d", overwrite=True)
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 0)
         self.assertEqual(D.metadata.get_number_of_maps(), 0)
 
 
@@ -234,7 +234,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression="D = A {during,&+} B", basename="d", overwrite=True)
         tra.parse(expression="D = A {during,&+} B", basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_min_min(), 6) # 1 + 5
         self.assertEqual(D.metadata.get_min_min(), 6) # 1 + 5
@@ -248,7 +248,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression="D = A {starts,&+} B", basename="d", overwrite=True)
         tra.parse(expression="D = A {starts,&+} B", basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_min_min(), 6) # 1 + 5
         self.assertEqual(D.metadata.get_min_min(), 6) # 1 + 5
@@ -262,7 +262,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression="D = A {finishes,&+} B", basename="d", overwrite=True)
         tra.parse(expression="D = A {finishes,&+} B", basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_min_min(), 7)  # 2 + 5
         self.assertEqual(D.metadata.get_min_min(), 7)  # 2 + 5
@@ -276,7 +276,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression="D = A {starts|finishes,&+} B", basename="d", overwrite=True)
         tra.parse(expression="D = A {starts|finishes,&+} B", basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_min_min(), 6)  # 1 + 5
         self.assertEqual(D.metadata.get_min_min(), 6)  # 1 + 5
@@ -290,7 +290,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression="D = B {overlaps,|+} C", basename="d", overwrite=True)
         tra.parse(expression="D = B {overlaps,|+} C", basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 1)
         self.assertEqual(D.metadata.get_number_of_maps(), 1)
         self.assertEqual(D.metadata.get_min_min(), 12) # 5 + 7
         self.assertEqual(D.metadata.get_min_min(), 12) # 5 + 7
@@ -304,7 +304,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra = tgis.TemporalRasterAlgebraParser(run = True, debug = True)
         tra.parse(expression="D = B {overlapped,|+} C", basename="d", overwrite=True)
         tra.parse(expression="D = B {overlapped,|+} C", basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 1)
         self.assertEqual(D.metadata.get_number_of_maps(), 1)
         self.assertEqual(D.metadata.get_min_min(), 13) # 6 + 7
         self.assertEqual(D.metadata.get_min_min(), 13) # 6 + 7
@@ -319,7 +319,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra.parse(expression='D = A {during,=+} buff_t(C, "1 day") ',
         tra.parse(expression='D = A {during,=+} buff_t(C, "1 day") ',
                   basename="d", overwrite=True)
                   basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_number_of_maps(), 4)
         self.assertEqual(D.metadata.get_min_min(), 8)  # 1 + 7  a1 + c1
         self.assertEqual(D.metadata.get_min_min(), 8)  # 1 + 7  a1 + c1
@@ -334,7 +334,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra.parse(expression='D = A[-1] + A[1]',
         tra.parse(expression='D = A[-1] + A[1]',
                   basename="d", overwrite=True)
                   basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_min_min(), 4)  # 1 + 3
         self.assertEqual(D.metadata.get_min_min(), 4)  # 1 + 3
@@ -349,7 +349,7 @@ class TestRegisterFunctions(unittest.TestCase):
         tra.parse(expression='D = A[0,0,-1] + A[0,0,1]',
         tra.parse(expression='D = A[0,0,-1] + A[0,0,1]',
                   basename="d", overwrite=True)
                   basename="d", overwrite=True)
 
 
-        D = tgis.open_old_space_time_dataset("D", type="strds")
+        D = tgis.open_old_stds("D", type="strds")
         D.select()
         D.select()
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_number_of_maps(), 2)
         self.assertEqual(D.metadata.get_min_min(), 4)  # 1 + 3
         self.assertEqual(D.metadata.get_min_min(), 4)  # 1 + 3

+ 1 - 1
lib/python/temporal/univar_statistics.py

@@ -44,7 +44,7 @@ def print_gridded_dataset_univar_statistics(type, input, where, extended,
     dbif = SQLDatabaseInterfaceConnection()
     dbif = SQLDatabaseInterfaceConnection()
     dbif.connect()
     dbif.connect()
 
 
-    sp = open_old_space_time_dataset(input, type, dbif)
+    sp = open_old_stds(input, type, dbif)
 
 
     rows = sp.get_registered_maps(
     rows = sp.get_registered_maps(
         "id,start_time,end_time", where, "start_time", dbif)
         "id,start_time,end_time", where, "start_time", dbif)

+ 1 - 1
temporal/t.create/t.create.py

@@ -75,7 +75,7 @@ def main():
 
 
     tgis.init()
     tgis.init()
     
     
-    tgis.open_new_space_time_dataset(name, type, temporaltype, title, descr, 
+    tgis.open_new_stds(name, type, temporaltype, title, descr, 
                                      semantic, None, grass.overwrite())
                                      semantic, None, grass.overwrite())
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":

+ 2 - 2
temporal/t.merge/t.merge.py

@@ -74,7 +74,7 @@ def main():
     first = None
     first = None
 
 
     for id in input_ids:
     for id in input_ids:
-        stds = tgis.open_old_space_time_dataset(id, type, dbif)
+        stds = tgis.open_old_stds(id, type, dbif)
         if first is None:
         if first is None:
             first = stds
             first = stds
 
 
@@ -100,7 +100,7 @@ def main():
                       (stds.get_new_map_instance(None).get_type(), output_id))
                       (stds.get_new_map_instance(None).get_type(), output_id))
 
 
     if not output_exists:
     if not output_exists:
-        output_stds = tgis.open_new_space_time_dataset(output, type,
+        output_stds = tgis.open_new_stds(output, type,
                                    first.get_temporal_type(),
                                    first.get_temporal_type(),
                                    "Merged space time dataset",
                                    "Merged space time dataset",
                                    "Merged space time dataset",
                                    "Merged space time dataset",

+ 3 - 3
temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py

@@ -97,8 +97,8 @@ def main():
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif.connect()
     dbif.connect()
 
 
-    sp = tgis.open_old_space_time_dataset(input, "strds", dbif)
-    sampler_sp = tgis.open_old_space_time_dataset(sampler, type, dbif)
+    sp = tgis.open_old_stds(input, "strds", dbif)
+    sampler_sp = tgis.open_old_stds(sampler, type, dbif)
 
 
     if sampler_sp.get_temporal_type() != sp.get_temporal_type():
     if sampler_sp.get_temporal_type() != sp.get_temporal_type():
         dbif.close()
         dbif.close()
@@ -112,7 +112,7 @@ def main():
                       "must have time intervals"))
                       "must have time intervals"))
 
 
     temporal_type, semantic_type, title, description = sp.get_initial_values()
     temporal_type, semantic_type, title, description = sp.get_initial_values()
-    new_sp = tgis.open_new_space_time_dataset(output, "strds", temporal_type,
+    new_sp = tgis.open_new_stds(output, "strds", temporal_type,
                                               title, description, semantic_type,
                                               title, description, semantic_type,
                                               dbif, grass.overwrite())
                                               dbif, grass.overwrite())
 
 

+ 2 - 2
temporal/t.rast.aggregate/t.rast.aggregate.py

@@ -99,9 +99,9 @@ def main():
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif.connect()
     dbif.connect()
 
 
-    sp = tgis.open_old_space_time_dataset(input, "strds", dbif)
+    sp = tgis.open_old_stds(input, "strds", dbif)
     temporal_type, semantic_type, title, description = sp.get_initial_values()
     temporal_type, semantic_type, title, description = sp.get_initial_values()
-    new_sp = tgis.open_new_space_time_dataset(output, "strds", temporal_type,
+    new_sp = tgis.open_new_stds(output, "strds", temporal_type,
                                               title, description, semantic_type,
                                               title, description, semantic_type,
                                               dbif, grass.overwrite())
                                               dbif, grass.overwrite())
 
 

+ 1 - 1
temporal/t.rast.colors/t.rast.colors.py

@@ -131,7 +131,7 @@ def main():
     # Make sure the temporal database exists
     # Make sure the temporal database exists
     tgis.init()
     tgis.init()
 
 
-    sp = tgis.open_old_space_time_dataset(input, "strds")
+    sp = tgis.open_old_stds(input, "strds")
 
 
     rows = sp.get_registered_maps("id", None, None, None)
     rows = sp.get_registered_maps("id", None, None, None)
 
 

+ 1 - 1
temporal/t.rast.gapfill/t.rast.gapfill.py

@@ -74,7 +74,7 @@ def main():
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif.connect()
     dbif.connect()
 
 
-    sp = tgis.open_old_space_time_dataset(input, "strds")
+    sp = tgis.open_old_stds(input, "strds")
 
 
     maps = sp.get_registered_maps_as_objects_with_gaps(where, dbif)
     maps = sp.get_registered_maps_as_objects_with_gaps(where, dbif)
 
 

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

@@ -101,7 +101,7 @@ def main():
 
 
     overwrite = grass.overwrite()
     overwrite = grass.overwrite()
 
 
-    sp = tgis.open_old_space_time_dataset(input, "strds", dbif)
+    sp = tgis.open_old_stds(input, "strds", dbif)
     maps = sp.get_registered_maps_as_objects(where=where, dbif=dbif)
     maps = sp.get_registered_maps_as_objects(where=where, dbif=dbif)
 
 
     if not maps:
     if not maps:
@@ -109,7 +109,7 @@ def main():
         grass.warning(_("Space time raster dataset <%s> is empty") % sp.get_id())
         grass.warning(_("Space time raster dataset <%s> is empty") % sp.get_id())
         return
         return
 
 
-    new_sp = tgis.check_new_space_time_dataset(input, "strds", dbif=dbif,
+    new_sp = tgis.check_new_stds(input, "strds", dbif=dbif,
                                                overwrite=overwrite)
                                                overwrite=overwrite)
     # Configure the r.neighbor module
     # Configure the r.neighbor module
     neighbor_module = pymod.Module("r.neighbors", input="dummy",
     neighbor_module = pymod.Module("r.neighbors", input="dummy",
@@ -144,7 +144,7 @@ def main():
 
 
     # Open the new space time raster dataset
     # Open the new space time raster dataset
     ttype, stype, title, descr = sp.get_initial_values()
     ttype, stype, title, descr = sp.get_initial_values()
-    new_sp = tgis.open_new_space_time_dataset(output, "strds", ttype, title,
+    new_sp = tgis.open_new_stds(output, "strds", ttype, title,
                                               descr, stype, dbif, overwrite)
                                               descr, stype, dbif, overwrite)
     num_maps = len(new_maps)
     num_maps = len(new_maps)
     # collect empty maps to remove them
     # collect empty maps to remove them

+ 1 - 1
temporal/t.rast.out.vtk/t.rast.out.vtk.py

@@ -91,7 +91,7 @@ def main():
 
 
     os.chdir(expdir)
     os.chdir(expdir)
 
 
-    sp = tgis.open_old_space_time_dataset(input, "strds")
+    sp = tgis.open_old_stds(input, "strds")
 
 
     if use_granularity:
     if use_granularity:
         # Attention: A list of lists of maps will be returned
         # Attention: A list of lists of maps will be returned

+ 1 - 1
temporal/t.rast.series/t.rast.series.py

@@ -81,7 +81,7 @@ def main():
     # Make sure the temporal database exists
     # Make sure the temporal database exists
     tgis.init()
     tgis.init()
 
 
-    sp = tgis.open_old_space_time_dataset(input, "strds")
+    sp = tgis.open_old_stds(input, "strds")
 
 
     rows = sp.get_registered_maps("id", where, order, None)
     rows = sp.get_registered_maps("id", where, order, None)
 
 

+ 1 - 1
temporal/t.rast.to.rast3/t.rast.to.rast3.py

@@ -46,7 +46,7 @@ def main():
 
 
     mapset = grass.gisenv()["MAPSET"]
     mapset = grass.gisenv()["MAPSET"]
 
 
-    sp = tgis.open_old_space_time_dataset(input, "strds")
+    sp = tgis.open_old_stds(input, "strds")
 
 
     grass.use_temp_region()
     grass.use_temp_region()
 
 

+ 1 - 1
temporal/t.remove/t.remove.py

@@ -111,7 +111,7 @@ def main():
 
 
     for name in dataset_list:
     for name in dataset_list:
         name = name.strip()
         name = name.strip()
-        sp = tgis.open_old_space_time_dataset(name, type, dbif)
+        sp = tgis.open_old_stds(name, type, dbif)
 
 
         if recursive and force:
         if recursive and force:
             grass.message(_("Removing registered maps"))
             grass.message(_("Removing registered maps"))

+ 1 - 1
temporal/t.shift/t.shift.py

@@ -61,7 +61,7 @@ def main():
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif.connect()
     dbif.connect()
 
 
-    stds = tgis.open_old_space_time_dataset(name, type, dbif)
+    stds = tgis.open_old_stds(name, type, dbif)
     check = stds.shift(gran=gran, dbif=dbif)
     check = stds.shift(gran=gran, dbif=dbif)
 
 
     if check == False:
     if check == False:

+ 1 - 1
temporal/t.snap/t.snap.py

@@ -52,7 +52,7 @@ def main():
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif.connect()
     dbif.connect()
 
 
-    stds = tgis.open_old_space_time_dataset(name, type, dbif)
+    stds = tgis.open_old_stds(name, type, dbif)
     stds.snap(dbif=dbif)
     stds.snap(dbif=dbif)
 
 
     stds.update_command_string(dbif=dbif)
     stds.update_command_string(dbif=dbif)

+ 1 - 1
temporal/t.support/t.support.py

@@ -86,7 +86,7 @@ def main():
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif.connect()
     dbif.connect()
 
 
-    stds = tgis.open_old_space_time_dataset(name, type, dbif)
+    stds = tgis.open_old_stds(name, type, dbif)
 
 
     update = False
     update = False
     if title:
     if title:

+ 1 - 1
temporal/t.topology/t.topology.py

@@ -59,7 +59,7 @@ def main():
     # Make sure the temporal database exists
     # Make sure the temporal database exists
     tgis.init()
     tgis.init()
 
 
-    sp = tgis.open_old_space_time_dataset(name, type)
+    sp = tgis.open_old_stds(name, type)
 
 
     # Get ordered map list
     # Get ordered map list
     maps = sp.get_registered_maps_as_objects(
     maps = sp.get_registered_maps_as_objects(

+ 2 - 2
temporal/t.unregister/t.unregister.py

@@ -72,7 +72,7 @@ def main():
 
 
     # In case a space time dataset is specified
     # In case a space time dataset is specified
     if input:
     if input:
-        sp = tgis.open_old_space_time_dataset(input, type, dbif)
+        sp = tgis.open_old_stds(input, type, dbif)
 
 
     maplist = []
     maplist = []
 
 
@@ -159,7 +159,7 @@ def main():
         count = 0
         count = 0
         for key in update_dict.keys():
         for key in update_dict.keys():
             id = update_dict[key]
             id = update_dict[key]
-            sp = tgis.open_old_space_time_dataset(id, type, dbif)
+            sp = tgis.open_old_stds(id, type, dbif)
             sp.update_from_registered_maps(dbif)
             sp.update_from_registered_maps(dbif)
             grass.percent(count, len(update_dict), 1)
             grass.percent(count, len(update_dict), 1)
             count += 1
             count += 1

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

@@ -68,7 +68,7 @@ def main():
     # Make sure the temporal database exists
     # Make sure the temporal database exists
     tgis.init()
     tgis.init()
 
 
-    sp = tgis.open_old_space_time_dataset(input, "stvds")
+    sp = tgis.open_old_stds(input, "stvds")
 
 
     rows = sp.get_registered_maps("name,layer,mapset,start_time,end_time",
     rows = sp.get_registered_maps("name,layer,mapset,start_time,end_time",
                                   tempwhere, "start_time", None)
                                   tempwhere, "start_time", None)

+ 4 - 4
temporal/t.vect.observe.strds/t.vect.observe.strds.py

@@ -101,11 +101,11 @@ def main():
 
 
     mapset = grass.gisenv()["MAPSET"]
     mapset = grass.gisenv()["MAPSET"]
 
 
-    out_sp = tgis.check_new_space_time_dataset(output, "stvds", dbif, overwrite)
+    out_sp = tgis.check_new_stds(output, "stvds", dbif, overwrite)
 
 
     samples = []
     samples = []
 
 
-    first_strds = tgis.open_old_space_time_dataset(strds_names[0], "strds", dbif)
+    first_strds = tgis.open_old_stds(strds_names[0], "strds", dbif)
 
 
     # Single space time raster dataset
     # Single space time raster dataset
     if len(strds_names) == 1:
     if len(strds_names) == 1:
@@ -127,7 +127,7 @@ def main():
     else:
     else:
         # Multiple space time raster datasets
         # Multiple space time raster datasets
         for name in strds_names[1:]:
         for name in strds_names[1:]:
-            dataset = tgis.open_old_space_time_dataset(name, "strds", dbif)
+            dataset = tgis.open_old_stds(name, "strds", dbif)
             if dataset.get_temporal_type() != first_strds.get_temporal_type():
             if dataset.get_temporal_type() != first_strds.get_temporal_type():
                 grass.fatal(_("Temporal type of space time raster datasets must be equal\n"
                 grass.fatal(_("Temporal type of space time raster datasets must be equal\n"
                               "<%(a)s> of type %(type_a)s do not match <%(b)s> of type %(type_b)s"%\
                               "<%(a)s> of type %(type_a)s do not match <%(b)s> of type %(type_b)s"%\
@@ -203,7 +203,7 @@ def main():
                    " with vector map <%s>") % (strds, input)
                    " with vector map <%s>") % (strds, input)
 
 
     # Create the output space time vector dataset
     # Create the output space time vector dataset
-    out_sp = tgis.open_new_space_time_dataset(output, "stvds",
+    out_sp = tgis.open_new_stds(output, "stvds",
                                               first_strds.get_temporal_type(),
                                               first_strds.get_temporal_type(),
                                               title, description,
                                               title, description,
                                               first_strds.get_semantic_type(),
                                               first_strds.get_semantic_type(),

+ 2 - 2
temporal/t.vect.what.strds/t.vect.what.strds.py

@@ -84,8 +84,8 @@ def main():
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif.connect()
     dbif.connect()
 
 
-    sp = tgis.open_old_space_time_dataset(input, "stvds", dbif)
-    strds_sp = tgis.open_old_space_time_dataset(strds, "strds", dbif)
+    sp = tgis.open_old_stds(input, "stvds", dbif)
+    strds_sp = tgis.open_old_stds(strds, "strds", dbif)
 
 
     if strds_sp.get_temporal_type() != sp.get_temporal_type():
     if strds_sp.get_temporal_type() != sp.get_temporal_type():
         dbif.close()
         dbif.close()