[GRASS-SVN] r63651 - in grass/branches/releasebranch_7_0: . lib/gis lib/python/temporal temporal temporal/t.rast.export temporal/t.rast.import temporal/t.vect.export temporal/t.vect.import temporal/t.vect.import/testsuite
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Dec 20 09:03:16 PST 2014
Author: neteler
Date: 2014-12-20 09:03:16 -0800 (Sat, 20 Dec 2014)
New Revision: 63651
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/lib/gis/renamed_options
grass/branches/releasebranch_7_0/lib/python/temporal/stds_export.py
grass/branches/releasebranch_7_0/lib/python/temporal/stds_import.py
grass/branches/releasebranch_7_0/temporal/
grass/branches/releasebranch_7_0/temporal/t.rast.export/t.rast.export.py
grass/branches/releasebranch_7_0/temporal/t.rast.export/test.t.rast.export.sh
grass/branches/releasebranch_7_0/temporal/t.rast.import/t.rast.import.py
grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.relative.sh
grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.sh
grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import_locations.sh
grass/branches/releasebranch_7_0/temporal/t.vect.export/t.vect.export.py
grass/branches/releasebranch_7_0/temporal/t.vect.export/test.t.vect.export.sh
grass/branches/releasebranch_7_0/temporal/t.vect.import/t.vect.import.html
grass/branches/releasebranch_7_0/temporal/t.vect.import/t.vect.import.py
grass/branches/releasebranch_7_0/temporal/t.vect.import/testsuite/test.t.vect.import.sh
Log:
temporal: renamed parameters extrdir/workdir -> directory for consistency (trac #2409) (trunk, r63650)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63616,63624,63626,63628,63630,63634,63644
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63616,63624,63626,63628,63630,63634,63644,63650
Modified: grass/branches/releasebranch_7_0/lib/gis/renamed_options
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/renamed_options 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/lib/gis/renamed_options 2014-12-20 17:03:16 UTC (rev 63651)
@@ -385,6 +385,17 @@
# r3.out.vtk
r3.out.vtk|elevscale:zscale
#########################
+### Temporal module changes
+#########################
+# t.rast.import
+t.rast.import|extrdir:directory
+# t.rast.export
+t.rast.export|extrdir:directory
+# t.vect.import
+t.vect.import|extrdir:directory
+# t.vect.export
+t.vect.export|extrdir:directory
+#########################
### Vector module changes
#########################
# v.clean
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/stds_export.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/stds_export.py 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/stds_export.py 2014-12-20 17:03:16 UTC (rev 63651)
@@ -10,11 +10,11 @@
input="temp_1950_2012 at PERMANENT"
output="/tmp/temp_1950_2012.tar.gz"
compression="gzip"
- workdir="/tmp"
+ directory="/tmp"
where=None
format_="GTiff"
type_="strds"
- tgis.export_stds(input, output, compression, workdir, where, format_, type_)
+ tgis.export_stds(input, output, compression, directory, where, format_, type_)
(C) 2012-2013 by the GRASS Development Team
@@ -226,7 +226,7 @@
############################################################################
-def export_stds(input, output, compression, workdir, where, format_="pack",
+def export_stds(input, output, compression, directory, where, format_="pack",
type_="strds"):
"""Export space time datasets as tar archive with optional compression
@@ -242,7 +242,7 @@
- "gzip" GNU zip compression
- "bzip2" Bzip compression
- :param workdir: The working directory used for extraction and packing
+ :param directory: The working directory used for extraction and packing
:param where: The temporal WHERE SQL statement to select a subset
of maps from the space time dataset
:param format_: The export format:
@@ -265,7 +265,7 @@
old_cwd = os.getcwd()
# Create the temporary directory and jump into it
- new_cwd = tempfile.mkdtemp(dir=workdir)
+ new_cwd = tempfile.mkdtemp(dir=directory)
os.chdir(new_cwd)
if type_ == "strds":
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/stds_import.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/stds_import.py 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/stds_import.py 2014-12-20 17:03:16 UTC (rev 63651)
@@ -9,7 +9,7 @@
input="/tmp/temp_1950_2012.tar.gz"
output="temp_1950_2012"
- extrdir="/tmp"
+ directory="/tmp"
title="My new dataset"
descr="May new shiny dataset"
location=None
@@ -17,7 +17,7 @@
exp=True
overr=False
create=False
- tgis.import_stds(input, output, extrdir, title, descr, location,
+ tgis.import_stds(input, output, directory, title, descr, location,
link, exp, overr, create, "strds")
@@ -171,14 +171,14 @@
############################################################################
-def import_stds(input, output, extrdir, title=None, descr=None, location=None,
+def import_stds(input, output, directory, title=None, descr=None, location=None,
link=False, exp=False, overr=False, create=False,
stds_type="strds", base=None, set_current_region=False):
"""Import space time datasets of type raster and vector
:param input: Name of the input archive file
:param output: The name of the output space time dataset
- :param extrdir: The extraction directory
+ :param directory: The extraction directory
:param title: The title of the new created space time dataset
:param descr: The description of the new created
space time dataset
@@ -204,8 +204,8 @@
if not os.path.exists(input):
gscript.fatal(_("Space time raster dataset archive <%s> not found")
% input)
- if not create and not os.path.exists(extrdir):
- gscript.fatal(_("Extraction directory <%s> not found") % extrdir)
+ if not create and not os.path.exists(directory):
+ gscript.fatal(_("Extraction directory <%s> not found") % directory)
tar = tarfile.open(name=input, mode='r')
@@ -219,7 +219,7 @@
if proj_file_name not in members:
gscript.fatal(_("Unable to find projection file <%s>") % proj_file_name)
- tar.extractall(path=extrdir)
+ tar.extractall(path=directory)
tar.close()
# We use a new list file name for map registration
@@ -228,7 +228,7 @@
old_cwd = os.getcwd()
# Switch into the data directory
- os.chdir(extrdir)
+ os.chdir(directory)
# Check projection information
if not location:
Property changes on: grass/branches/releasebranch_7_0/temporal
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873,62875,62904,63035,63085,63087,63
089,63091,63093,63170,63327,63345,63391,63393,63554,63556,63590,63616,63628,63644
+ /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873,62875,62904,63035,63085,63087,63
089,63091,63093,63170,63327,63345,63391,63393,63554,63556,63590,63616,63628,63644,63650
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.export/t.rast.export.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.export/t.rast.export.py 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.export/t.rast.export.py 2014-12-20 17:03:16 UTC (rev 63651)
@@ -29,7 +29,7 @@
#%end
#%option G_OPT_M_DIR
-#% key: workdir
+#% key: directory
#% description: Path to the work directory, default is /tmp
#% required: no
#% answer: /tmp
@@ -70,7 +70,7 @@
_input = options["input"]
output = options["output"]
compression = options["compression"]
- workdir = options["workdir"]
+ directory = options["directory"]
where = options["where"]
_format = options["format"]
@@ -78,7 +78,7 @@
tgis.init()
# Export the space time raster dataset
tgis.export_stds(
- _input, output, compression, workdir, where, _format, "strds")
+ _input, output, compression, directory, where, _format, "strds")
############################################################################
if __name__ == "__main__":
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.export/test.t.rast.export.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.export/test.t.rast.export.sh 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.export/test.t.rast.export.sh 2014-12-20 17:03:16 UTC (rev 63651)
@@ -29,13 +29,13 @@
# The first @test
t.register -i type=rast input=precip_abs1 file="${n1}" start="2001-01-01" increment="1 months"
-t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar.bz2 compression=bzip2 workdir=/tmp
-t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar.gz compression=gzip workdir=/tmp
-t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar compression=no workdir=/tmp
+t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar.bz2 compression=bzip2 directory=/tmp
+t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar.gz compression=gzip directory=/tmp
+t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar compression=no directory=/tmp
-t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar.bz2 compression=bzip2 workdir=/tmp
-t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip workdir=/tmp
-t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar compression=no workdir=/tmp
+t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar.bz2 compression=bzip2 directory=/tmp
+t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip directory=/tmp
+t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar compression=no directory=/tmp
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_abs1
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.import/t.rast.import.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.import/t.rast.import.py 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.import/t.rast.import.py 2014-12-20 17:03:16 UTC (rev 63651)
@@ -38,7 +38,7 @@
#%end
#%option G_OPT_M_DIR
-#% key: extrdir
+#% key: directory
#% description: Path to the extraction directory
#%end
@@ -100,7 +100,7 @@
# Get the options
input = options["input"]
output = options["output"]
- extrdir = options["extrdir"]
+ directory = options["directory"]
title = options["title"]
descr = options["description"]
location = options["location"]
@@ -113,7 +113,7 @@
tgis.init()
- tgis.import_stds(input, output, extrdir, title, descr, location,
+ tgis.import_stds(input, output, directory, title, descr, location,
link, exp, overr, create, "strds", base,
set_current_region)
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.relative.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.relative.sh 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.relative.sh 2014-12-20 17:03:16 UTC (rev 63651)
@@ -38,37 +38,37 @@
# The first @test
t.register type=rast input=precip_rel file="${n1}" unit="years"
-t.rast.export input=precip_rel output=strds_export.tar.bz2 compression=bzip2 format=GTiff workdir=test
-t.rast.export input=precip_rel output=strds_export.tar.gz compression=gzip format=GTiff workdir=test
-t.rast.export input=precip_rel output=strds_export.tar compression=no format=GTiff workdir=test
-t.rast.export input=precip_rel output=strds_export_pack.tar compression=no format=pack workdir=test
-t.rast.export input=precip_rel output=strds_export_pack.tar.gz compression=gzip format=pack workdir=test
-t.rast.export input=precip_rel output=strds_export_pack.tar.bz2 compression=bzip2 format=pack workdir=test
+t.rast.export input=precip_rel output=strds_export.tar.bz2 compression=bzip2 format=GTiff directory=test
+t.rast.export input=precip_rel output=strds_export.tar.gz compression=gzip format=GTiff directory=test
+t.rast.export input=precip_rel output=strds_export.tar compression=no format=GTiff directory=test
+t.rast.export input=precip_rel output=strds_export_pack.tar compression=no format=pack directory=test
+t.rast.export input=precip_rel output=strds_export_pack.tar.gz compression=gzip format=pack directory=test
+t.rast.export input=precip_rel output=strds_export_pack.tar.bz2 compression=bzip2 format=pack directory=test
# Checking different flags
-t.rast.import --o input=strds_export.tar.bz2 output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_rel directory=test\
-oe title="A test" description="Description of a test"
-t.rast.import --o input=strds_export.tar.bz2 output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_rel directory=test\
-loe title="A test" description="Description of a test"
-t.rast.import --o input=strds_export.tar.bz2 output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_rel directory=test\
title="A test" description="Description of a test"
-t.rast.import --o input=strds_export.tar.bz2 output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_rel directory=test\
-l title="A test" description="Description of a test"
# Import using different compression and formats
-t.rast.import --o input=strds_export.tar.gz output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export.tar.gz output=precip_rel directory=test\
title="A test" description="Description of a test"
r.info prec_1
-t.rast.import --o input=strds_export.tar output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export.tar output=precip_rel directory=test\
title="A test" description="Description of a test"
r.info prec_1
-t.rast.import --o input=strds_export_pack.tar output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export_pack.tar output=precip_rel directory=test\
title="A test" description="Description of a test"
r.info prec_1
-t.rast.import --o input=strds_export_pack.tar.gz output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export_pack.tar.gz output=precip_rel directory=test\
title="A test" description="Description of a test"
r.info prec_1
-t.rast.import --o input=strds_export_pack.tar.bz2 output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export_pack.tar.bz2 output=precip_rel directory=test\
title="A test" description="Description of a test"
r.info prec_1
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.sh 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.sh 2014-12-20 17:03:16 UTC (rev 63651)
@@ -37,37 +37,37 @@
# The first @test
t.register -i type=rast input=precip_abs1 file="${n1}"
-t.rast.export input=precip_abs1 output=strds_export.tar.bz2 compression=bzip2 format=AAIGrid workdir=test
-t.rast.export input=precip_abs1 output=strds_export.tar.gz compression=gzip format=GTiff workdir=test
-t.rast.export input=precip_abs1 output=strds_export.tar compression=no format=GTiff workdir=test
-t.rast.export input=precip_abs1 output=strds_export_pack.tar compression=no format=pack workdir=test
-t.rast.export input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip format=pack workdir=test
-t.rast.export input=precip_abs1 output=strds_export_pack.tar.bz2 compression=bzip2 format=pack workdir=test
+t.rast.export input=precip_abs1 output=strds_export.tar.bz2 compression=bzip2 format=AAIGrid directory=test
+t.rast.export input=precip_abs1 output=strds_export.tar.gz compression=gzip format=GTiff directory=test
+t.rast.export input=precip_abs1 output=strds_export.tar compression=no format=GTiff directory=test
+t.rast.export input=precip_abs1 output=strds_export_pack.tar compression=no format=pack directory=test
+t.rast.export input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip format=pack directory=test
+t.rast.export input=precip_abs1 output=strds_export_pack.tar.bz2 compression=bzip2 format=pack directory=test
# Checking different flags
-t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 directory=test\
-oe title="A test" description="Description of a test"
-t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 directory=test\
-loe title="A test" description="Description of a test"
-t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 directory=test\
title="A test" description="Description of a test"
-t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 directory=test\
-l title="A test" description="Description of a test"
# Import using different compression and formats
-t.rast.import --o input=strds_export.tar.gz output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export.tar.gz output=precip_abs1 directory=test\
title="A test" description="Description of a test"
r.info prec_1
-t.rast.import --o input=strds_export.tar output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export.tar output=precip_abs1 directory=test\
title="A test" description="Description of a test"
r.info prec_1
-t.rast.import --o input=strds_export_pack.tar output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export_pack.tar output=precip_abs1 directory=test\
title="A test" description="Description of a test"
r.info prec_1
-t.rast.import --o input=strds_export_pack.tar.gz output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export_pack.tar.gz output=precip_abs1 directory=test\
title="A test" description="Description of a test"
r.info prec_1
-t.rast.import --o input=strds_export_pack.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export_pack.tar.bz2 output=precip_abs1 directory=test\
title="A test" description="Description of a test"
r.info prec_1
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import_locations.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import_locations.sh 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import_locations.sh 2014-12-20 17:03:16 UTC (rev 63651)
@@ -35,25 +35,25 @@
# The first @test
t.register -i type=rast input=precip_abs1 file="${n1}" start="2001-01-01" increment="1 months"
-t.rast.export input=precip_abs1 output=strds_export.tar.bz2 compression=bzip2 format=GTiff workdir=test
-t.rast.export input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip format=pack workdir=test
+t.rast.export input=precip_abs1 output=strds_export.tar.bz2 compression=bzip2 format=GTiff directory=test
+t.rast.export input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip format=pack directory=test
g.proj -p
# Import the data into a new location
-t.rast.import --o location=new_test_1 input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o location=new_test_1 input=strds_export.tar.bz2 output=precip_abs1 directory=test\
title="A test" description="Description of a test"
ls -la $GISDBASE/new_test_1/PERMANENT
-t.rast.import --o location=new_test_2 input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o location=new_test_2 input=strds_export.tar.bz2 output=precip_abs1 directory=test\
-l title="A test" description="Description of a test"
ls -la $GISDBASE/new_test_2/PERMANENT
-t.rast.import --o location=new_test_3 input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o location=new_test_3 input=strds_export.tar.bz2 output=precip_abs1 directory=test\
-c title="A test" description="Description of a test"
ls -la $GISDBASE/new_test_3/PERMANENT
-t.rast.import --o location=new_test_4 input=strds_export_pack.tar.gz output=precip_abs1 extrdir=test\
+t.rast.import --o location=new_test_4 input=strds_export_pack.tar.gz output=precip_abs1 directory=test\
title="A test" description="Description of a test"
ls -la $GISDBASE/new_test_4/PERMANENT
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.export/t.vect.export.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.export/t.vect.export.py 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.export/t.vect.export.py 2014-12-20 17:03:16 UTC (rev 63651)
@@ -70,7 +70,7 @@
_input = options["input"]
output = options["output"]
compression = options["compression"]
- workdir = options["directory"]
+ directory = options["directory"]
where = options["where"]
_format = options["format"]
@@ -78,7 +78,7 @@
tgis.init()
# Export the space time raster dataset
tgis.export_stds(
- _input, output, compression, workdir, where, _format, "stvds")
+ _input, output, compression, directory, where, _format, "stvds")
############################################################################
if __name__ == "__main__":
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.export/test.t.vect.export.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.export/test.t.vect.export.sh 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.export/test.t.vect.export.sh 2014-12-20 17:03:16 UTC (rev 63651)
@@ -22,13 +22,13 @@
t.register -i type=vector input=soil_abs1 file="${n1}" start='2001-01-01' increment="1 months"
# The first @test
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.bz2 compression=bzip2 workdir=/tmp
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.gz compression=gzip workdir=/tmp
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar compression=no workdir=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.bz2 compression=bzip2 directory=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.gz compression=gzip directory=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar compression=no directory=/tmp
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.bz2 compression=bzip2 workdir=/tmp
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.gz compression=gzip workdir=/tmp
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar compression=no workdir=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.bz2 compression=bzip2 directory=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.gz compression=gzip directory=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar compression=no directory=/tmp
t.unregister type=vector file="${n1}"
t.remove type=stvds input=soil_abs1
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.import/t.vect.import.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.import/t.vect.import.html 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.import/t.vect.import.html 2014-12-20 17:03:16 UTC (rev 63651)
@@ -35,7 +35,7 @@
compression=gzip
t.vect.import input=random_locations.tar.gz output=new_random_locations \
- base=new_map extrdir=/tmp
+ base=new_map directory=/tmp
t.vect.list new_random_locations
id|name|layer|mapset|start_time|end_time
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.import/t.vect.import.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.import/t.vect.import.py 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.import/t.vect.import.py 2014-12-20 17:03:16 UTC (rev 63651)
@@ -89,7 +89,7 @@
# Get the options
input = options["input"]
output = options["output"]
- extrdir = options["extrdir"]
+ directory = options["directory"]
title = options["title"]
descr = options["description"]
location = options["location"]
@@ -100,7 +100,7 @@
tgis.init()
- tgis.import_stds(input, output, extrdir, title, descr, location,
+ tgis.import_stds(input, output, directory, title, descr, location,
None, exp, overr, create, "stvds", base)
if __name__ == "__main__":
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.import/testsuite/test.t.vect.import.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.import/testsuite/test.t.vect.import.sh 2014-12-20 17:00:03 UTC (rev 63650)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.import/testsuite/test.t.vect.import.sh 2014-12-20 17:03:16 UTC (rev 63651)
@@ -24,36 +24,36 @@
t.register -i type=vector input=soil_abs1 file="${n1}" start='2001-01-01' increment="1 months"
# The first @test
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.bz2 compression=bzip2 workdir=/tmp
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.gz compression=gzip workdir=/tmp
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar compression=no workdir=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.bz2 compression=bzip2 directory=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.gz compression=gzip directory=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar compression=no directory=/tmp
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.bz2 compression=bzip2 workdir=/tmp
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.gz compression=gzip workdir=/tmp
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar compression=no workdir=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.bz2 compression=bzip2 directory=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.gz compression=gzip directory=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar compression=no directory=/tmp
# Checking different flags
-t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 extrdir=test\
+t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 directory=test\
-oe title="A test" description="Description of a test"
-t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 extrdir=test\
+t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 directory=test\
-o title="A test" description="Description of a test"
-t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 extrdir=test\
+t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 directory=test\
title="A test" description="Description of a test"
# Import using different compression and formats
-t.vect.import --o input=stvds_export_gml.tar.gz output=soil_abs2 extrdir=test\
+t.vect.import --o input=stvds_export_gml.tar.gz output=soil_abs2 directory=test\
title="A test" description="Description of a test"
v.info soil_1
-t.vect.import --o input=stvds_export_gml.tar output=soil_abs2 extrdir=test\
+t.vect.import --o input=stvds_export_gml.tar output=soil_abs2 directory=test\
title="A test" description="Description of a test"
v.info soil_1
-t.vect.import --o input=stvds_export_pack.tar output=soil_abs2 extrdir=test\
+t.vect.import --o input=stvds_export_pack.tar output=soil_abs2 directory=test\
title="A test" description="Description of a test"
v.info soil_1
-t.vect.import --o input=stvds_export_pack.tar.gz output=soil_abs2 extrdir=test\
+t.vect.import --o input=stvds_export_pack.tar.gz output=soil_abs2 directory=test\
title="A test" description="Description of a test"
v.info soil_1
-t.vect.import --o input=stvds_export_pack.tar.bz2 output=soil_abs2 extrdir=test\
+t.vect.import --o input=stvds_export_pack.tar.bz2 output=soil_abs2 directory=test\
title="A test" description="Description of a test"
v.info soil_1
More information about the grass-commit
mailing list