Moved the temporal GIS code from grass.script into a separate library structure named grass.temporal.

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

lib/python/Makefile

@@ -8,16 +8,17 @@ PYDIR = $(ETC)/python
 GDIR = $(PYDIR)/grass
 DSTDIR = $(GDIR)/script
 
-MODULES = core db raster raster3d vector array setup task tgis_base tgis_core tgis_abstract_datasets tgis_space_time_datasets tgis_metadata tgis_spatial_extent tgis_temporal_extent
+MODULES = core db raster raster3d vector array setup task 
 
 PYFILES := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__)
 PYCFILES := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__)
 
-CLEAN_SUBDIRS = ctypes
+CLEAN_SUBDIRS = ctypes temporal
 EXTRA_CLEAN_FILES = setup.py
 
 default: $(PYFILES) $(PYCFILES) $(GDIR)/__init__.py $(GDIR)/__init__.pyc
 	-$(MAKE) -C ctypes || echo $(CURDIR)/ctypes >> $(ERRORLOG)
+	-$(MAKE) -C temporal || echo $(CURDIR)/temporal >> $(ERRORLOG)
 
 $(PYDIR):
 	$(MKDIR) $@

lib/python/tgis_abstract_datasets.py

@@ -20,9 +20,9 @@ for details.
 @author Soeren Gebbert
 """
 import uuid
-from tgis_temporal_extent import *
-from tgis_spatial_extent import *
-from tgis_metadata import *
+from temporal_extent import *
+from spatial_extent import *
+from metadata import *
 
 class abstract_dataset(object):
     """This is the base class for all datasets (raster, vector, raster3d, strds, stvds, str3ds)"""

lib/python/tgis_base.py

@@ -26,7 +26,7 @@ for details.
 @author Soeren Gebbert
 """
 
-from tgis_core import *
+from core import *
 
 ###############################################################################
 

lib/python/tgis_core.py

@@ -22,7 +22,7 @@ for details.
 """
 import os
 import sqlite3
-import core
+import grass.script.core as core
 import copy
 from datetime import datetime, date, time, timedelta
 

lib/python/tgis_metadata.py

@@ -20,7 +20,7 @@ for details.
 
 @author Soeren Gebbert
 """
-from tgis_base import *
+from base import *
 
 ###############################################################################
 

lib/python/tgis_space_time_datasets.py

@@ -22,10 +22,10 @@ for details.
 @author Soeren Gebbert
 """
 import getpass
-import raster
-import vector
-import raster3d
-from tgis_abstract_datasets import *
+import grass.script.raster as raster
+import grass.script.vector as vector
+import grass.script.raster3d as raster3d
+from abstract_datasets import *
 
 
 ###############################################################################

lib/python/tgis_spatial_extent.py

@@ -20,7 +20,7 @@ for details.
 
 @author Soeren Gebbert
 """
-from tgis_base import *
+from base import *
 
 class spatial_extent(sql_database_interface):
     """This is the spatial extent base class for all maps and spacetime datasets"""

lib/python/tgis_temporal_extent.py

@@ -20,7 +20,7 @@ for details.
 
 @author Soeren Gebbert
 """
-from tgis_base import *
+from base import *
 
 ###############################################################################
 

lib/temporal/Makefile

@@ -6,10 +6,9 @@ SQLDIR = $(ETC)/sql
 
 SQLFILES:= $(wildcard *.sql)
 
-default: copy_sql_files
+DSTFILES := $(patsubst %.sql,$(SQLDIR)/%.sql,$(SQLFILES))
 
-copy_sql_files: $(SQLDIR)
-	for i in $(SQLFILES); do $(INSTALL_DATA) $$i $(SQLDIR)/; done
+default: $(DSTFILES)
 
-$(SQLDIR): 
-	$(MKDIR) $@
+$(SQLDIR)/%.sql: %.sql | $(SQLDIR)
+	$(INSTALL_DATA) $< $@

temporal/t.create/t.create.py

@@ -81,6 +81,7 @@
 #% multiple: no
 #%end
 
+import grass.temporal as tgis
 import grass.script as grass
 
 ############################################################################
@@ -97,7 +98,7 @@ def main():
     gran = options["granularity"]
 
     # Make sure the temporal database exists
-    grass.create_temporal_database()
+    tgis.create_temporal_database()
 
     #Get the current mapset to create the id of the space time dataset
 
@@ -105,13 +106,13 @@ def main():
     id = name + "@" + mapset
 
     if type == "strds":
-        sp = grass.space_time_raster_dataset(id)
+        sp = tgis.space_time_raster_dataset(id)
     if type == "str3ds":
-        sp = grass.space_time_raster3d_dataset(id)
+        sp = tgis.space_time_raster3d_dataset(id)
     if type == "stvds":
-        sp = grass.space_time_vector_dataset(id)
+        sp = tgis.space_time_vector_dataset(id)
 
-    dbif = grass.sql_database_interface()
+    dbif = tgis.sql_database_interface()
     dbif.connect()
 
     if sp.is_in_db(dbif) and grass.overwrite() == False:
@@ -130,6 +131,6 @@ def main():
     dbif.close()
 
 if __name__ == "__main__":
-    options, flags = grass.core.parser()
+    options, flags = grass.parser()
     main()
 

temporal/t.info/t.info.py

@@ -43,6 +43,7 @@
 #%end
 
 import grass.script as grass
+import grass.temporal as tgis
 
 ############################################################################
 
@@ -54,7 +55,7 @@ def main():
     shellstyle = flags['g']
 
   # Make sure the temporal database exists
-    grass.create_temporal_database()
+    tgis.create_temporal_database()
 
     #Get the current mapset to create the id of the space time dataset
 
@@ -65,17 +66,17 @@ def main():
         id = name + "@" + mapset
 
     if type == "strds":
-        sp = grass.space_time_raster_dataset(id)
+        sp = tgis.space_time_raster_dataset(id)
     if type == "str3ds":
-        sp = grass.space_time_raster3d_dataset(id)
+        sp = tgis.space_time_raster3d_dataset(id)
     if type == "stvds":
-        sp = grass.space_time_vector_dataset(id)
+        sp = tgis.space_time_vector_dataset(id)
     if type == "raster":
-        sp = grass.raster_dataset(id)
+        sp = tgis.raster_dataset(id)
     if type == "raster3d":
-        sp = grass.raster3d_dataset(id)
+        sp = tgis.raster3d_dataset(id)
     if type == "vector":
-        sp = grass.vector_dataset(id)
+        sp = tgis.vector_dataset(id)
 
     if sp.is_in_db() == False:
         grass.fatal("Dataset <" + name + "> not found in temporal database")
@@ -89,6 +90,6 @@ def main():
         sp.print_info()
 
 if __name__ == "__main__":
-    options, flags = grass.core.parser()
+    options, flags = grass.parser()
     main()
 

temporal/t.list/t.list.py

@@ -80,6 +80,7 @@
 #%end
 
 import grass.script as grass
+import grass.temporal as tgis
 
 ############################################################################
 
@@ -95,24 +96,24 @@ def main():
     colhead = flags['c']
 
     # Make sure the temporal database exists
-    grass.create_temporal_database()
+    tgis.create_temporal_database()
 
     id = None
 
     if type == "strds":
-        sp = grass.space_time_raster_dataset(id)
+        sp = tgis.space_time_raster_dataset(id)
     if type == "str3ds":
-        sp = grass.space_time_raster3d_dataset(id)
+        sp = tgis.space_time_raster3d_dataset(id)
     if type == "stvds":
-        sp = grass.space_time_vector_dataset(id)
+        sp = tgis.space_time_vector_dataset(id)
     if type == "raster":
-        sp = grass.raster_dataset(id)
+        sp = tgis.raster_dataset(id)
     if type == "raster3d":
-        sp = grass.raster3d_dataset(id)
+        sp = tgis.raster3d_dataset(id)
     if type == "vector":
-        sp = grass.vector_dataset(id)
+        sp = tgis.vector_dataset(id)
 
-    dbif = grass.sql_database_interface()
+    dbif = tgis.sql_database_interface()
     dbif.connect()
 
     # Insert content from db
@@ -170,5 +171,5 @@ def main():
             print output
 
 if __name__ == "__main__":
-    options, flags = grass.core.parser()
+    options, flags = grass.parser()
     main()

temporal/t.remove/t.remove.py

@@ -39,6 +39,7 @@
 #%end
 
 import grass.script as grass
+import grass.temporal as tgis
 
 ############################################################################
 
@@ -49,11 +50,11 @@ def main():
     type = options["type"]
 
     # Make sure the temporal database exists
-    grass.create_temporal_database()
+    tgis.create_temporal_database()
     
     mapset =  grass.gisenv()["MAPSET"]
 
-    dbif = grass.sql_database_interface()
+    dbif = tgis.sql_database_interface()
     dbif.connect()
 
     for name in names.split(","):
@@ -65,17 +66,17 @@ def main():
             id = name
 
         if type == "strds":
-            ds = grass.space_time_raster_dataset(id)
+            ds = tgis.space_time_raster_dataset(id)
         if type == "str3ds":
-            ds = grass.space_time_raster3d_dataset(id)
+            ds = tgis.space_time_raster3d_dataset(id)
         if type == "stvds":
-            ds = grass.space_time_vector_dataset(id)
+            ds = tgis.space_time_vector_dataset(id)
         if type == "raster":
-            ds = grass.raster_dataset(id)
+            ds = tgis.raster_dataset(id)
         if type == "raster3d":
-            ds = grass.raster3d_dataset(id)
+            ds = tgis.raster3d_dataset(id)
         if type == "vector":
-            ds = grass.vector_dataset(id)
+            ds = tgis.vector_dataset(id)
 
         if ds.is_in_db(dbif) == False:
             grass.fatal(ds.get_type() + " dataset <" + name + "> not found in temporal database")
@@ -87,6 +88,6 @@ def main():
     dbif.close()
 
 if __name__ == "__main__":
-    options, flags = grass.core.parser()
+    options, flags = grass.parser()
     main()
 

temporal/t.time.abs/t.time.abs.py

@@ -56,6 +56,7 @@
 #%end
 
 import grass.script as grass
+import grass.temporal as tgis
 
 ############################################################################
 
@@ -68,12 +69,12 @@ def main():
     increment = options["increment"]
 
     # Make sure the temporal database exists
-    grass.create_temporal_database()
+    tgis.create_temporal_database()
     # Set valid absolute time to maps
-    grass.assign_valid_time_to_maps(type="raster", maps=maps, ttype="absolute", \
-                                    start=start, end=end, increment=increment, dbif=None)
+    tgis.assign_valid_time_to_maps(type="raster", maps=maps, ttype="absolute", \
+                                   start=start, end=end, increment=increment, dbif=None)
     
 if __name__ == "__main__":
-    options, flags = grass.core.parser()
+    options, flags = grass.parser()
     main()
 

temporal/t.time.rel/t.time.rel.py

@@ -56,6 +56,7 @@
 #%end
 
 import grass.script as grass
+import grass.temporal as tgis
 
 ############################################################################
 
@@ -68,12 +69,12 @@ def main():
     increment = options["increment"]
 
     # Make sure the temporal database exists
-    grass.create_temporal_database()
+    tgis.create_temporal_database()
     # Set valid relative time to maps
-    grass.assign_valid_time_to_maps(type="raster", maps=maps, ttype="relative", \
+    tgis.assign_valid_time_to_maps(type="raster", maps=maps, ttype="relative", \
                                     start=start, end=end, increment=increment, dbif=None)
 
 if __name__ == "__main__":
-    options, flags = grass.core.parser()
+    options, flags = grass.parser()
     main()
 

temporal/tr.register/tr.register.py

@@ -53,6 +53,7 @@
 #%end
 
 import grass.script as grass
+import grass.temporal as tgis
 
 ############################################################################
 
@@ -65,11 +66,11 @@ def main():
     increment = options["increment"]
 
     # Make sure the temporal database exists
-    grass.create_temporal_database()
+    tgis.create_temporal_database()
     # Register maps
-    grass.register_maps_in_space_time_dataset("raster", name, maps, start, increment)
+    tgis.register_maps_in_space_time_dataset("raster", name, maps, start, increment)
     
 if __name__ == "__main__":
-    options, flags = grass.core.parser()
+    options, flags = grass.parser()
     main()
 

temporal/tr.unregister/tr.unregister.py

@@ -37,6 +37,8 @@
 #%end
 
 import grass.script as grass
+import grass.temporal as tgis
+
 ############################################################################
 
 def main():
@@ -46,11 +48,11 @@ def main():
     maps = options["maps"]
 
     # Make sure the temporal database exists
-    grass.create_temporal_database()
+    tgis.create_temporal_database()
     # Unregister maps
-    grass.unregister_maps_from_space_time_datasets("raster", name, maps)
+    tgis.unregister_maps_from_space_time_datasets("raster", name, maps)
 
 if __name__ == "__main__":
-    options, flags = grass.core.parser()
+    options, flags = grass.parser()
     main()
 

temporal/tr3.register/tr3.register.py

@@ -53,6 +53,7 @@
 #%end
 
 import grass.script as grass
+import grass.temporal as tgis
 
 ############################################################################
 
@@ -65,11 +66,11 @@ def main():
     increment = options["increment"]
 
     # Make sure the temporal database exists
-    grass.create_temporal_database()
+    tgis.create_temporal_database()
     # Register maps
-    grass.register_maps_in_space_time_dataset("raster3d", name, maps, start, increment)
+    tgis.register_maps_in_space_time_dataset("raster3d", name, maps, start, increment)
     
 if __name__ == "__main__":
-    options, flags = grass.core.parser()
+    options, flags = grass.parser()
     main()
 

temporal/tr3.unregister/tr3.unregister.py

@@ -37,6 +37,8 @@
 #%end
 
 import grass.script as grass
+import grass.temporal as tgis
+
 ############################################################################
 
 def main():
@@ -46,11 +48,11 @@ def main():
     maps = options["maps"]
 
     # Make sure the temporal database exists
-    grass.create_temporal_database()
+    tgis.create_temporal_database()
     # Unregister maps
-    grass.unregister_maps_from_space_time_datasets("raster3d", name, maps)
+    tgis.unregister_maps_from_space_time_datasets("raster3d", name, maps)
 
 if __name__ == "__main__":
-    options, flags = grass.core.parser()
+    options, flags = grass.parser()
     main()
 

temporal/tv.register/tv.register.py

@@ -53,6 +53,7 @@
 #%end
 
 import grass.script as grass
+import grass.temporal as tgis
 
 ############################################################################
 
@@ -65,11 +66,11 @@ def main():
     increment = options["increment"]
 
     # Make sure the temporal database exists
-    grass.create_temporal_database()
+    tgis.create_temporal_database()
     # Register maps
-    grass.register_maps_in_space_time_dataset("vector", name, maps, start, increment)
+    tgis.register_maps_in_space_time_dataset("vector", name, maps, start, increment)
     
 if __name__ == "__main__":
-    options, flags = grass.core.parser()
+    options, flags = grass.parser()
     main()
 

temporal/tv.unregister/tv.unregister.py

@@ -37,6 +37,8 @@
 #%end
 
 import grass.script as grass
+import grass.temporal as tgis
+
 ############################################################################
 
 def main():
@@ -46,11 +48,11 @@ def main():
     maps = options["maps"]
 
     # Make sure the temporal database exists
-    grass.create_temporal_database()
+    tgis.create_temporal_database()
     # Unregister maps
-    grass.unregister_maps_from_space_time_datasets("vector", name, maps)
+    tgis.unregister_maps_from_space_time_datasets("vector", name, maps)
 
 if __name__ == "__main__":
-    options, flags = grass.core.parser()
+    options, flags = grass.parser()
     main()