Use dataset object factory. New temporal topology functions.

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@48795 15284696-431f-4ddb-bdfa-cd5b030d7da7

temporal/t.create/t.create.py

@@ -105,12 +105,7 @@ def main():
     mapset =  grass.gisenv()["MAPSET"]
     id = name + "@" + mapset
 
-    if type == "strds":
-        sp = tgis.space_time_raster_dataset(id)
-    if type == "str3ds":
-        sp = tgis.space_time_raster3d_dataset(id)
-    if type == "stvds":
-        sp = tgis.space_time_vector_dataset(id)
+    sp = tgis.dataset_factory(type, id)
 
     dbif = tgis.sql_database_interface()
     dbif.connect()

temporal/t.info/t.info.py

@@ -55,7 +55,6 @@ import grass.temporal as tgis
 
 def main():
 
-    # Get the options
     name = options["input"]
     type = options["type"]
     shellstyle = flags['g']
@@ -64,8 +63,6 @@ def main():
     # Make sure the temporal database exists
     tgis.create_temporal_database()
 
-    #Get the current mapset to create the id of the space time dataset
-
     if system:
         #      0123456789012345678901234567890
         print " +------------------- Temporal DBMI backend information ----------------------+"
@@ -84,26 +81,11 @@ def main():
         mapset =  grass.gisenv()["MAPSET"]
         id = name + "@" + mapset
 
-    if type == "strds":
-        sp = tgis.space_time_raster_dataset(id)
-    if type == "str3ds":
-        sp = tgis.space_time_raster3d_dataset(id)
-    if type == "stvds":
-        sp = tgis.space_time_vector_dataset(id)
-    if type == "rast":
-        sp = tgis.raster_dataset(id)
-        tmatrix = False
-    if type == "rast3d":
-        sp = tgis.raster3d_dataset(id)
-        tmatrix = False
-    if type == "vect":
-        sp = tgis.vector_dataset(id)
-        tmatrix = False
+    sp = tgis.dataset_factory(type, id)
 
     if sp.is_in_db() == False:
-        grass.fatal("Dataset <" + name + "> not found in temporal database")
+        grass.fatal(_("Dataset <%s> not found in temporal database") % name)
         
-    # Insert content from db
     sp.select()
 
     if shellstyle == True:

temporal/t.list/t.list.py

@@ -26,7 +26,7 @@
 #% type: string
 #% description: Type of the space time dataset, default is strds
 #% required: no
-#% options: strds, str3ds, stvds, raster, raster3d, vector
+#% options: strds, str3ds, stvds, rast, rast3d, vect
 #% answer: strds
 #%end
 
@@ -99,19 +99,7 @@ def main():
     tgis.create_temporal_database()
 
     id = None
-
-    if type == "strds":
-        sp = tgis.space_time_raster_dataset(id)
-    if type == "str3ds":
-        sp = tgis.space_time_raster3d_dataset(id)
-    if type == "stvds":
-        sp = tgis.space_time_vector_dataset(id)
-    if type == "rast":
-        sp = tgis.raster_dataset(id)
-    if type == "rast3d":
-        sp = tgis.raster3d_dataset(id)
-    if type == "vect":
-        sp = tgis.vector_dataset(id)
+    sp = tgis.dataset_factory(type, id)
 
     dbif = tgis.sql_database_interface()
     dbif.connect()

temporal/t.remove/t.remove.py

@@ -100,25 +100,13 @@ def main():
         else:
             id = name
 
-        if type == "strds":
-            ds = tgis.space_time_raster_dataset(id)
-        if type == "str3ds":
-            ds = tgis.space_time_raster3d_dataset(id)
-        if type == "stvds":
-            ds = tgis.space_time_vector_dataset(id)
-        if type == "rast":
-            ds = tgis.raster_dataset(id)
-        if type == "rast3d":
-            ds = tgis.raster3d_dataset(id)
-        if type == "vect":
-            ds = tgis.vector_dataset(id)
-
-        if ds.is_in_db(dbif) == False:
+        sp = tgis.dataset_factory(type, id)
+
+        if sp.is_in_db(dbif) == False:
             dbif.close()
-            grass.fatal(_("%s dataset <%s> not found in temporal database") % (ds.get_type(), name))
+            grass.fatal(_("%s dataset <%s> not found in temporal database") % (sp.get_type(), name))
 
-        # We need to read some data from the temporal database
-        ds.delete(dbif)
+        sp.delete(dbif)
 
     dbif.close()
 

temporal/t.support/t.support.py

@@ -100,12 +100,7 @@ def main():
     mapset =  grass.gisenv()["MAPSET"]
     id = name + "@" + mapset
 
-    if type == "strds":
-        sp = tgis.space_time_raster_dataset(id)
-    if type == "str3ds":
-        sp = tgis.space_time_raster3d_dataset(id)
-    if type == "stvds":
-        sp = tgis.space_time_vector_dataset(id)
+    sp = tgis.dataset_factory(type, id)
 
     if sp.is_in_db() == False:
         grass.fatal(_("%s dataset <%s> not found in temporal database") % (ds.get_type(), name))

temporal/t.topology/t.topology.py

@@ -38,6 +38,12 @@
 #%end
 
 #%flag
+#% key: c
+#% description: Check temporal topology
+#%end
+
+
+#%flag
 #% key: t
 #% description: Print temporal relation matrix and exit
 #%end
@@ -65,6 +71,7 @@ def main():
     tmatrix = flags['t']
     relation = flags['r']
     map_types = flags['m']
+    check_topo = flags['c']
 
     # Make sure the temporal database exists
     tgis.create_temporal_database()
@@ -76,12 +83,7 @@ def main():
         mapset =  grass.gisenv()["MAPSET"]
         id = name + "@" + mapset
 
-    if type == "strds":
-        sp = tgis.space_time_raster_dataset(id)
-    if type == "str3ds":
-        sp = tgis.space_time_raster3d_dataset(id)
-    if type == "stvds":
-        sp = tgis.space_time_vector_dataset(id)
+    sp = tgis.dataset_factory(type, id)
 
     if sp.is_in_db() == False:
         grass.fatal("Dataset <" + name + "> not found in temporal database")
@@ -91,28 +93,33 @@ def main():
 
     maps = sp.get_registered_maps_as_objects()
 
-    if tmatrix:
-        matrix = sp.get_temporal_relation_matrix(maps)
+    if check_topo:
+        check = sp.check_temporal_topology(maps)
+        if check:
+            print "Temporal topology is valid"
+        else:
+            print "Temporal topology is invalid"
 
-        for row in matrix:
-            for col in row:
-                print col,
-            print " "
-        print " "
-        return
+    if tmatrix:
+        matrix = sp.print_temporal_relation_matrix(maps)
 
     if relation:
-        dict = sp.get_temporal_relations_count(maps)
+        dict = sp.count_temporal_relations(maps)
 
         for key in dict.keys():
             print key, dict[key]
 
     if map_types:
-        dict = sp.get_temporal_map_type_count(maps)
+        dict = sp.count_temporal_types(maps)
         
         for key in dict.keys():
             print key, dict[key]
 
+        if dict["interval"] > 0 and dict["point"] == 0 and dict["invalid"] == 0:
+            print "Gaps", sp.count_gaps(maps, True)
+        else:
+            print "Gaps", sp.count_gaps(maps, False)
+
 if __name__ == "__main__":
     options, flags = grass.parser()
     main()

temporal/tr.register/tr.register.py

@@ -101,7 +101,7 @@ def main():
     # Make sure the temporal database exists
     tgis.create_temporal_database()
     # Register maps
-    tgis.register_maps_in_space_time_dataset(type="rast", name=name, maps=maps, file=file, start=start, end=end, \
+    tgis.register_maps_in_space_time_dataset(type="strds", name=name, maps=maps, file=file, start=start, end=end, \
                                              increment=increment, dbif=None, interval=interval, fs=fs)
     
 if __name__ == "__main__":

temporal/tr3.register/tr3.register.py

@@ -101,7 +101,7 @@ def main():
     # Make sure the temporal database exists
     tgis.create_temporal_database()
     # Register maps
-    tgis.register_maps_in_space_time_dataset(type="rast3d", name=name, maps=maps, file=file, start=start, end=end, \
+    tgis.register_maps_in_space_time_dataset(type="str3ds", name=name, maps=maps, file=file, start=start, end=end, \
                                              increment=increment, dbif=None, interval=interval, fs=fs)
     
 if __name__ == "__main__":

temporal/tr3.unregister/tr3.unregister.py

@@ -59,7 +59,7 @@ def main():
     # Make sure the temporal database exists
     tgis.create_temporal_database()
     # Unregister maps
-    tgis.unregister_maps_from_space_time_datasets(type="rast3d", name=name, maps=maps, file=file, dbif=None)
+    tgis.unregister_maps_from_space_time_datasets(type="str3ds", name=name, maps=maps, file=file, dbif=None)
 
 if __name__ == "__main__":
     options, flags = grass.parser()

temporal/tv.register/tv.register.py

@@ -101,7 +101,7 @@ def main():
     # Make sure the temporal database exists
     tgis.create_temporal_database()
     # Register maps
-    tgis.register_maps_in_space_time_dataset(type="vect", name=name, maps=maps, file=file, start=start, end=end, \
+    tgis.register_maps_in_space_time_dataset(type="stvds", name=name, maps=maps, file=file, start=start, end=end, \
                                              increment=increment, dbif=None, interval=interval, fs=fs)
     
 if __name__ == "__main__":

temporal/tv.unregister/tv.unregister.py

@@ -59,7 +59,7 @@ def main():
     # Make sure the temporal database exists
     tgis.create_temporal_database()
     # Unregister maps
-    tgis.unregister_maps_from_space_time_datasets(type="vect", name=name, maps=maps, file=file, dbif=None)
+    tgis.unregister_maps_from_space_time_datasets(type="stvds", name=name, maps=maps, file=file, dbif=None)
 
 if __name__ == "__main__":
     options, flags = grass.parser()