[GRASS-SVN] r63617 - in grass/branches/releasebranch_7_0: . display/d.legend general/g.list general/g.region general/g.remove gui/wxpython gui/wxpython/animation gui/wxpython/core gui/wxpython/gmodeler gui/wxpython/gui_core gui/wxpython/iclass gui/wxpython/iscatt gui/wxpython/lmgr gui/wxpython/mapdisp gui/wxpython/mapwin gui/wxpython/modules gui/wxpython/psmap gui/wxpython/rlisetup gui/wxpython/vnet gui/wxpython/web_services lib/gis lib/gpde/test lib/manage lib/python/script lib/python/temporal lib/python/temporal/testsuite raster/r.carve raster/r.reclass temporal temporal/t.connect/testsuite temporal/t.info temporal/t.info/testsuite temporal/t.list temporal/t.rast.accdetect temporal/t.rast.aggregate/testsuite temporal/t.rast.algebra/testsuite temporal/t.rast.extract/testsuite temporal/t.rast.to.rast3/testsuite temporal/t.rast3d.algebra/testsuite temporal/t.rast3d.extract/testsuite temporal/t.remove temporal/t.sample/testsuite temporal/t.select temporal/t.unregister/testsuite te mporal/t.vect.algebra/testsuite temporal/t.vect.db.select temporal/t.vect.export temporal/t.vect.extract temporal/t.vect.import/testsuite temporal/t.vect.list/testsuite temporal/t.vect.observe.strds/testsuite temporal/t.vect.what.strds vector/v.what.rast3
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Dec 19 10:21:24 PST 2014
Author: martinl
Date: 2014-12-19 10:21:24 -0800 (Fri, 19 Dec 2014)
New Revision: 63617
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/display/d.legend/main.c
grass/branches/releasebranch_7_0/general/g.list/main.c
grass/branches/releasebranch_7_0/general/g.region/main.c
grass/branches/releasebranch_7_0/general/g.remove/main.c
grass/branches/releasebranch_7_0/gui/wxpython/animation/dialogs.py
grass/branches/releasebranch_7_0/gui/wxpython/animation/g.gui.animation.py
grass/branches/releasebranch_7_0/gui/wxpython/animation/provider.py
grass/branches/releasebranch_7_0/gui/wxpython/animation/temporal_manager.py
grass/branches/releasebranch_7_0/gui/wxpython/core/layerlist.py
grass/branches/releasebranch_7_0/gui/wxpython/core/render.py
grass/branches/releasebranch_7_0/gui/wxpython/core/workspace.py
grass/branches/releasebranch_7_0/gui/wxpython/gis_set.py
grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/dialogs.py
grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py
grass/branches/releasebranch_7_0/gui/wxpython/gui_core/dialogs.py
grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py
grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
grass/branches/releasebranch_7_0/gui/wxpython/gui_core/prompt.py
grass/branches/releasebranch_7_0/gui/wxpython/gui_core/simplelmgr.py
grass/branches/releasebranch_7_0/gui/wxpython/iclass/frame.py
grass/branches/releasebranch_7_0/gui/wxpython/iscatt/iscatt_core.py
grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py
grass/branches/releasebranch_7_0/gui/wxpython/lmgr/layertree.py
grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py
grass/branches/releasebranch_7_0/gui/wxpython/mapwin/decorations.py
grass/branches/releasebranch_7_0/gui/wxpython/modules/mcalc_builder.py
grass/branches/releasebranch_7_0/gui/wxpython/psmap/dialogs.py
grass/branches/releasebranch_7_0/gui/wxpython/psmap/instructions.py
grass/branches/releasebranch_7_0/gui/wxpython/rlisetup/functions.py
grass/branches/releasebranch_7_0/gui/wxpython/rlisetup/sampling_frame.py
grass/branches/releasebranch_7_0/gui/wxpython/vnet/vnet_core.py
grass/branches/releasebranch_7_0/gui/wxpython/vnet/vnet_data.py
grass/branches/releasebranch_7_0/gui/wxpython/web_services/dialogs.py
grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
grass/branches/releasebranch_7_0/lib/gpde/test/test_arrays.c
grass/branches/releasebranch_7_0/lib/manage/do_copy.c
grass/branches/releasebranch_7_0/lib/manage/do_remove.c
grass/branches/releasebranch_7_0/lib/manage/do_rename.c
grass/branches/releasebranch_7_0/lib/manage/element_list
grass/branches/releasebranch_7_0/lib/manage/option.c
grass/branches/releasebranch_7_0/lib/python/script/core.py
grass/branches/releasebranch_7_0/lib/python/script/raster3d.py
grass/branches/releasebranch_7_0/lib/python/temporal/abstract_map_dataset.py
grass/branches/releasebranch_7_0/lib/python/temporal/aggregation.py
grass/branches/releasebranch_7_0/lib/python/temporal/extract.py
grass/branches/releasebranch_7_0/lib/python/temporal/factory.py
grass/branches/releasebranch_7_0/lib/python/temporal/list_stds.py
grass/branches/releasebranch_7_0/lib/python/temporal/mapcalc.py
grass/branches/releasebranch_7_0/lib/python/temporal/open_stds.py
grass/branches/releasebranch_7_0/lib/python/temporal/register.py
grass/branches/releasebranch_7_0/lib/python/temporal/space_time_datasets.py
grass/branches/releasebranch_7_0/lib/python/temporal/temporal_algebra.py
grass/branches/releasebranch_7_0/lib/python/temporal/temporal_raster3d_algebra.py
grass/branches/releasebranch_7_0/lib/python/temporal/temporal_raster_algebra.py
grass/branches/releasebranch_7_0/lib/python/temporal/temporal_vector_algebra.py
grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/test_register_function.py
grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_algebra.py
grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_algebra_grs.py
grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_conditionals.py
grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster3d_algebra.py
grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster_algebra.py
grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster_algebra_grs.py
grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster_conditionals.py
grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_vector_algebra.py
grass/branches/releasebranch_7_0/raster/r.carve/main.c
grass/branches/releasebranch_7_0/raster/r.reclass/reclass.c
grass/branches/releasebranch_7_0/temporal/
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py
grass/branches/releasebranch_7_0/temporal/t.info/t.info.py
grass/branches/releasebranch_7_0/temporal/t.info/testsuite/test.t.info.sh
grass/branches/releasebranch_7_0/temporal/t.list/t.list.py
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/t.rast.accdetect.py
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra.py
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity.py
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity_fails.py
grass/branches/releasebranch_7_0/temporal/t.rast.extract/testsuite/test_extract.py
grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test_extract.py
grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.py
grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh
grass/branches/releasebranch_7_0/temporal/t.select/test.t.select.sh
grass/branches/releasebranch_7_0/temporal/t.unregister/testsuite/test_unregister.py
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test_vector_algebra.py
grass/branches/releasebranch_7_0/temporal/t.vect.db.select/test.t.vect.db.select.sh
grass/branches/releasebranch_7_0/temporal/t.vect.export/test.t.vect.export.sh
grass/branches/releasebranch_7_0/temporal/t.vect.extract/test.t.vect.extract.layer.sh
grass/branches/releasebranch_7_0/temporal/t.vect.extract/test.t.vect.extract.sh
grass/branches/releasebranch_7_0/temporal/t.vect.import/testsuite/test.t.vect.import.sh
grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh
grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.sh
grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh
grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh
grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh
grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh
grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/test.t.vect.what.strds.sh
grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh
grass/branches/releasebranch_7_0/vector/v.what.rast3/main.c
Log:
sync element names with trunk (#2409)
(merge r63189, r63218,r63226,r63230,r63233,r63236-7,r63239,r63584,r63586-9,r63590-1 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,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,62831,62838,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,63302,63307,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,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,63592-63593,63602
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,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,62831,62838,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,63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63391,63393,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
Modified: grass/branches/releasebranch_7_0/display/d.legend/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.legend/main.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/display/d.legend/main.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -89,12 +89,12 @@
"of the graphics monitor.");
opt_rast2d = G_define_standard_option(G_OPT_R_MAP);
- opt_rast2d->key = "rast";
+ opt_rast2d->key = "raster";
opt_rast2d->required = NO;
opt_rast2d->guisection = _("Input");
opt_rast3d = G_define_standard_option(G_OPT_R3_MAP);
- opt_rast3d->key = "rast3d";
+ opt_rast3d->key = "raster_3d";
opt_rast3d->required = NO;
opt_rast3d->guisection = _("Input");
Modified: grass/branches/releasebranch_7_0/general/g.list/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.list/main.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/general/g.list/main.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -409,7 +409,7 @@
if (strcmp(alias, "raster") == 0)
type = TYPE_RAST;
- else if (strcmp(alias, "3draster") == 0)
+ else if (strcmp(alias, "raster_3d") == 0)
type = TYPE_RAST3D;
else if (strcmp(alias, "vector") == 0)
type = TYPE_VECT;
Modified: grass/branches/releasebranch_7_0/general/g.region/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.region/main.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/general/g.region/main.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -161,14 +161,14 @@
parm.region->guisection = _("Existing");
parm.raster = G_define_standard_option(G_OPT_R_MAP);
- parm.raster->key = "rast";
+ parm.raster->key = "raster";
parm.raster->required = NO;
parm.raster->multiple = YES;
parm.raster->description = _("Set region to match raster map(s)");
parm.raster->guisection = _("Existing");
parm.raster3d = G_define_standard_option(G_OPT_R3_MAP);
- parm.raster3d->key = "rast3d";
+ parm.raster3d->key = "raster_3d";
parm.raster3d->required = NO;
parm.raster3d->multiple = NO;
parm.raster3d->description =
@@ -177,7 +177,7 @@
parm.raster3d->guisection = _("Existing");
parm.vect = G_define_standard_option(G_OPT_V_MAP);
- parm.vect->key = "vect";
+ parm.vect->key = "vector";
parm.vect->required = NO;
parm.vect->multiple = YES;
parm.vect->label = _("Set region to match vector map(s)");
Modified: grass/branches/releasebranch_7_0/general/g.remove/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.remove/main.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/general/g.remove/main.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -235,7 +235,7 @@
if (access(path, 0) != 0)
continue;
- rast = !G_strcasecmp(elem->alias, "rast");
+ rast = !G_strcasecmp(elem->alias, "raster");
files = G__ls(path, &num_files);
for (j = 0; j < num_files; j++) {
Modified: grass/branches/releasebranch_7_0/gui/wxpython/animation/dialogs.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/animation/dialogs.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/animation/dialogs.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -1278,9 +1278,9 @@
self.addManyMapsButton = wx.BitmapButton(self, bitmap=bitmap)
self.addManyMapsButton.Bind(wx.EVT_BUTTON, self._onAddMaps)
- types = [('rast', _("Multiple raster maps")),
- ('vect', _("Multiple vector maps")),
- ('rast3d', _("Multiple 3D raster maps")),
+ types = [('raster', _("Multiple raster maps")),
+ ('vector', _("Multiple vector maps")),
+ ('raster_3d', _("Multiple 3D raster maps")),
('strds', _("Space time raster dataset")),
('stvds', _("Space time vector dataset")),
('str3ds', _("Space time 3D raster dataset"))]
@@ -1308,7 +1308,7 @@
if self.layer.mapType:
self._setType(self.layer.mapType)
else:
- self._setType('rast')
+ self._setType('raster')
if self.layer.name:
self.tselect.SetValue(self.layer.name)
if self.layer.cmd:
@@ -1377,14 +1377,14 @@
def _createDefaultCommand(self):
cmd = []
- if self._mapType in ('rast', 'strds'):
+ if self._mapType in ('raster', 'strds'):
cmd.append('d.rast')
- elif self._mapType in ('vect', 'stvds'):
+ elif self._mapType in ('vector', 'stvds'):
cmd.append('d.vect')
- elif self._mapType in ('rast3d', 'str3ds'):
+ elif self._mapType in ('raster_3d', 'str3ds'):
cmd.append('d.rast3d')
if self._name:
- if self._mapType in ('rast', 'vect', 'rast3d'):
+ if self._mapType in ('raster', 'vector', 'raster_3d'):
cmd.append('map={name}'.format(name=self._name.split(',')[0]))
else:
try:
@@ -1401,9 +1401,9 @@
dlg = MapLayersDialog(self, title=_("Select raster/vector maps."))
dlg.applyAddingMapLayers.connect(lambda mapLayers:
self.tselect.SetValue(','.join(mapLayers)))
- if self._mapType == 'rast':
+ if self._mapType == 'raster':
index = 0
- elif self._mapType == 'vect':
+ elif self._mapType == 'vector':
index = 2
else: # rast3d
index = 1
Modified: grass/branches/releasebranch_7_0/gui/wxpython/animation/g.gui.animation.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/animation/g.gui.animation.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/animation/g.gui.animation.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -67,8 +67,8 @@
def main():
- rast = options['rast']
- vect = options['vect']
+ rast = options['raster']
+ vect = options['vector']
strds = options['strds']
stvds = options['stvds']
@@ -86,7 +86,7 @@
if numInputs > 1:
grass.fatal(_("%s=, %s=, %s= and %s= are mutually exclusive.") %
- ("rast", "vect", "strds", "stvds"))
+ ("raster", "vector", "strds", "stvds"))
if numInputs > 0:
# We need to initialize the temporal framework in case
@@ -97,13 +97,13 @@
layerList = LayerList()
if rast:
layer = AnimLayer()
- layer.mapType = 'rast'
+ layer.mapType = 'raster'
layer.name = rast
layer.cmd = ['d.rast', 'map={name}'.format(name=rast.split(',')[0])]
layerList.AddLayer(layer)
if vect:
layer = AnimLayer()
- layer.mapType = 'vect'
+ layer.mapType = 'vector'
layer.name = vect
layer.cmd = ['d.vect', 'map={name=}'.format(name=vect.split(',')[0])]
layerList.AddLayer(layer)
Modified: grass/branches/releasebranch_7_0/gui/wxpython/animation/provider.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/animation/provider.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/animation/provider.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -757,7 +757,7 @@
layerList.AddLayer(layer)
layer = Layer()
- layer.mapType = 'vect'
+ layer.mapType = 'vector'
layer.name = 'buildings_2009_approx'
layer.cmd = ['d.vect', 'map=buildings_2009_approx',
'color=grey']
Modified: grass/branches/releasebranch_7_0/gui/wxpython/animation/temporal_manager.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/animation/temporal_manager.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/animation/temporal_manager.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -410,7 +410,7 @@
fd.close()
name1 = 'absinterval1'
name2 = 'absinterval2'
- grass.run_command('t.unregister', type='rast',
+ grass.run_command('t.unregister', type='raster',
maps='prec_1,prec_2,prec_3,prec_4,prec_5,prec_6,'
'temp_1,temp_2,temp_3,temp_4,temp_5,temp_6')
for name, fname in zip((name1, name2), (n1, n2)):
@@ -465,7 +465,7 @@
fd.close()
name1 = 'relinterval1'
name2 = 'relinterval2'
- grass.run_command('t.unregister', type='rast',
+ grass.run_command('t.unregister', type='raster',
maps='prec_1,prec_2,prec_3,prec_4,prec_5,prec_6,'
'temp_1,temp_2,temp_3,temp_4,temp_5,temp_6')
for name, fname in zip((name1, name2), (n1, n2)):
Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/layerlist.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/layerlist.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/layerlist.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -173,7 +173,7 @@
Traceback (most recent call last):
...
ValueError: To set layer name, the type of layer must be specified.
- >>> layer.mapType = 'rast'
+ >>> layer.mapType = 'raster'
>>> layer.name = 'blablabla'
Traceback (most recent call last):
...
@@ -191,10 +191,10 @@
self._hidden = False
self._initialized = False
- self._mapTypes = ['rast', 'vect', 'rast3d', 'rgb']
- self._internalTypes = {'rast': 'cell',
- 'vect': 'vector',
- 'rast3d': 'grid3',
+ self._mapTypes = ['raster', 'vector', 'raster_3d', 'rgb']
+ self._internalTypes = {'raster': 'cell',
+ 'vector': 'vector',
+ 'raster_3d': 'grid3',
'rgb': 'rgb'}
def GetName(self):
@@ -246,7 +246,7 @@
def SetMapType(self, mapType):
"""Sets map type of the layer.
- :param mapType: can be 'rast', 'vect', 'rast3'
+ :param mapType: can be 'raster', 'vector', 'raster_3d'
"""
if mapType not in self._mapTypes:
raise ValueError("Wrong map type used: {mtype}".format(mtype=mapType))
@@ -358,11 +358,11 @@
def AddLayer(self, index, layer):
"""Adds layer to renderer (prepends)."""
mapType = None
- if layer.mapType == 'rast':
+ if layer.mapType == 'raster':
mapType = 'raster'
- elif layer.mapType == 'vect':
+ elif layer.mapType == 'vector':
mapType = 'vector'
- elif layer.mapType == 'rast3d':
+ elif layer.mapType == 'raster_3d':
mapType = '3d-raster'
elif layer.mapType == 'rgb':
mapType = 'rgb'
Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/render.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/render.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/render.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -642,13 +642,13 @@
if zoom:
cmd['zoom'] = rast[0]
else:
- cmd['rast'] = ','.join(rast)
+ cmd['raster'] = ','.join(rast)
if vect:
- cmd['vect'] = ','.join(vect)
+ cmd['vector'] = ','.join(vect)
if rast3d:
- cmd['rast3d'] = rast3d
+ cmd['raster_3d'] = rast3d
ret, reg, msg = RunCommand('g.region',
read = True,
Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/workspace.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/workspace.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/workspace.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -1423,7 +1423,7 @@
"group" : self.inGroup,
"display" : 0})
- elif element == 'vect' and self.inVector:
+ elif element == 'vector' and self.inVector:
self.layers[-1]['cmd'].append('map=%s' % self._get_value(line))
elif element in ('display_shape',
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gis_set.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gis_set.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gis_set.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -540,9 +540,9 @@
message = _("Map <%s> not found.") % mapName)
else:
if mapName in vectors:
- args = {'vect' : mapName}
+ args = {'vector' : mapName}
else:
- args = {'rast' : mapName}
+ args = {'raster' : mapName}
RunCommand('g.region', flags = 's', parent = self, **args)
def OnManageLoc(self, event):
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/dialogs.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/dialogs.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/dialogs.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -115,9 +115,9 @@
self.shape.SetValue(self.element.GetValue())
if self.etype:
elem = self.GetType()
- if elem == 'rast':
+ if elem == 'raster':
self.shape.SetPrompt('raster')
- elif elem == 'vect':
+ elif elem == 'vector':
self.shape.SetPrompt('raster')
self.parent.canvas.Refresh()
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -729,7 +729,7 @@
rast.append(name)
elif prompt == 'vector':
vect.append(name)
- elif prompt == 'rast3d':
+ elif prompt == 'raster_3d':
rast3d.append(name)
msg = ''
@@ -2338,17 +2338,17 @@
""")
if rast:
self.fd.write(
-r""" run_command('g.remove', flags='f', type='rast',
+r""" run_command('g.remove', flags='f', type='raster',
name=%s)
"""% ','.join(map(lambda x: "'" + x + "'", rast)))
if vect:
self.fd.write(
-r""" run_command('g.remove', flags='f', type='vect',
+r""" run_command('g.remove', flags='f', type='vector',
name=%s)
"""% ','.join(map(lambda x: "'" + x + "'", vect)))
if rast3d:
self.fd.write(
-r""" run_command('g.remove', flags='f', type='rast3d',
+r""" run_command('g.remove', flags='f', type='raster_3d',
name=%s)
"""% ','.join(map(lambda x: "'" + x + "'", rast3d)))
if not rast and not vect and not rast3d:
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/dialogs.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/dialogs.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/dialogs.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -405,7 +405,7 @@
curMapset = grass.gisenv()['MAPSET']
if isNative:
- listOfVectors = grass.list_grouped('vect')[curMapset]
+ listOfVectors = grass.list_grouped('vector')[curMapset]
else:
listOfVectors = RunCommand('v.external',
quiet = True,
@@ -1521,11 +1521,11 @@
sel = self.layerType.GetSelection()
if sel == 0:
- ltype = 'rast'
+ ltype = 'raster'
elif sel == 1:
- ltype = 'rast3d'
+ ltype = 'raster_3d'
else:
- ltype = 'vect'
+ ltype = 'vector'
return ltype
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -206,7 +206,7 @@
maps_param = self.task.get_param('maps', element='name', raiseError=False)
if self.task.get_name().startswith('t') and maps_param is not None:
if maps_param['wxId'][0] != uid:
- element_dict = {'rast': 'strds', 'vect': 'stvds', 'rast3d': 'str3ds'}
+ element_dict = {'raster': 'strds', 'vector': 'stvds', 'raster_3d': 'str3ds'}
self.data[win.GetParent().SetType] = {'etype': element_dict[type_param.get('value')]}
map = layer = None
@@ -1195,7 +1195,7 @@
# for t.(un)register:
maps_param = self.task.get_param('maps', element = 'name', raiseError = False)
if maps_param and orig_elem == 'stds':
- element_dict = {'rast': 'strds', 'vect': 'stvds', 'rast3d': 'str3ds'}
+ element_dict = {'raster': 'strds', 'vector': 'stvds', 'raster_3d': 'str3ds'}
elem = element_dict[type_param.get('default')]
if self._giface and hasattr(self._giface, "_model"):
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -412,25 +412,23 @@
curr_mapset = grass.gisenv()['MAPSET']
# map element types to g.list types
- elementdict = {'cell':'rast',
- 'raster':'rast',
- 'rast':'rast',
- 'raster files':'rast',
- 'grid3':'rast3d',
- 'rast3d':'rast3d',
- '3d-raster':'rast3d',
- 'raster3D':'rast3d',
- 'raster3D files':'rast3d',
- 'vector':'vect',
- 'vect':'vect',
- 'binary vector files':'vect',
+ elementdict = {'cell':'raster',
+ 'raster': 'raster',
+ 'raster files':'raster',
+ 'grid3':'raster_3d',
+ '3draster':'raster_3d',
+ '3d-raster':'raster_3d',
+ 'raster3D':'raster_3d',
+ 'raster3D files':'raster_3d',
+ 'vector' : 'vector',
+ 'binary vector files':'vector',
'dig':'oldvect',
- 'oldvect':'oldvect',
- 'old vector':'oldvect',
- 'dig_ascii':'asciivect',
- 'asciivect':'asciivect',
- 'asciivector':'asciivect',
- 'ascii vector files':'asciivect',
+ 'oldvect':'oldvector',
+ 'old vector':'oldvector',
+ 'dig_ascii':'asciivector',
+ 'asciivect':'asciivector',
+ 'asciivector':'asciivector',
+ 'ascii vector files':'asciivector',
'icons':'icon',
'icon':'icon',
'paint icon files':'icon',
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/prompt.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/prompt.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/prompt.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -93,8 +93,8 @@
def _getListOfMaps(self):
"""Get list of maps"""
result = dict()
- result['raster'] = grass.list_strings('rast')
- result['vector'] = grass.list_strings('vect')
+ result['raster'] = grass.list_strings('raster')
+ result['vector'] = grass.list_strings('vector')
return result
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/simplelmgr.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/simplelmgr.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/simplelmgr.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -341,21 +341,21 @@
def AddRaster(self, name, cmd, hidden, dialog):
"""Ads new raster layer."""
- layer = self._layerList.AddNewLayer(name=name, mapType='rast',
+ layer = self._layerList.AddNewLayer(name=name, mapType='raster',
active=True,
cmd=cmd, hidden=hidden)
return layer
def AddRast3d(self, name, cmd, hidden, dialog):
"""Ads new raster3d layer."""
- layer = self._layerList.AddNewLayer(name=name, mapType='rast3d',
+ layer = self._layerList.AddNewLayer(name=name, mapType='raster_3d',
active=True,
cmd=cmd, hidden=hidden)
return layer
def AddVector(self, name, cmd, hidden, dialog):
"""Ads new vector layer."""
- layer = self._layerList.AddNewLayer(name=name, mapType='vect',
+ layer = self._layerList.AddNewLayer(name=name, mapType='vector',
active=True,
cmd=cmd, hidden=hidden)
return layer
Modified: grass/branches/releasebranch_7_0/gui/wxpython/iclass/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/iclass/frame.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/iclass/frame.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -255,7 +255,7 @@
ret = RunCommand(prog = 'g.remove',
parent = self,
flags = 'f',
- type = 'vect',
+ type = 'vector',
name = self.trainingAreaVector)
if ret != 0:
return False
@@ -268,7 +268,7 @@
ret = RunCommand(prog = 'g.remove',
parent = self,
flags = 'f',
- type = 'rast',
+ type = 'raster',
name = raster)
if ret != 0:
return False
Modified: grass/branches/releasebranch_7_0/gui/wxpython/iscatt/iscatt_core.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/iscatt/iscatt_core.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/iscatt/iscatt_core.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -284,7 +284,7 @@
ret = UpdateCatRast(patch_rast, region, self.scatts_dt.GetCatRastCond(cat))
if ret < 0:
GException(_("Patching category raster conditions file failed."))
- RunCommand("g.remove", flags='f', type='rast', name=patch_rast)
+ RunCommand("g.remove", flags='f', type='raster', name=patch_rast)
def _rasterize(self, grass_region, layer, cat, out_rast):
@@ -597,7 +597,7 @@
grass.try_remove(self.cats_rasts_conds[cat_id])
del self.cats_rasts_conds[cat_id]
- RunCommand("g.remove", flags='f', type='rast',
+ RunCommand("g.remove", flags='f', type='raster',
name=self.cats_rasts[cat_id])
del self.cats_rasts[cat_id]
@@ -709,7 +709,7 @@
grass.try_remove(tmp)
for tmp in self.cats_rasts.itervalues():
RunCommand("g.remove", flags='f',
- type='rast', name=tmp,
+ type='raster', name=tmp,
getErrorMsg=True)
self.cats_rasts = {}
Modified: grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -1566,7 +1566,7 @@
from animation.data import AnimLayer
layerList = LayerList()
layer = AnimLayer()
- layer.mapType = 'rast'
+ layer.mapType = 'raster'
layer.name = ','.join(rasters)
layer.cmd = ['d.rast', 'map=']
layerList.AddLayer(layer)
@@ -1817,7 +1817,7 @@
"""Add map layers to layer tree.
:param list mapLayers: list of map names
- :param str ltype: layer type ('rast', 'rast3d', 'vect')
+ :param str ltype: layer type ('raster', 'raster_3d', 'vector')
:param bool check: True if new layers should be checked in
layer tree False otherwise
"""
@@ -1828,13 +1828,13 @@
maptree = self.GetLayerTree()
for layerName in mapLayers:
- if ltype == 'rast':
+ if ltype == 'raster':
cmd = ['d.rast', 'map=%s' % layerName]
wxType = 'raster'
- elif ltype == 'rast3d':
+ elif ltype == 'raster_3d':
cmd = ['d.rast3d', 'map=%s' % layerName]
wxType = '3d-raster'
- elif ltype == 'vect':
+ elif ltype == 'vector':
cmd = ['d.vect', 'map=%s' % layerName] + GetDisplayVectSettings()
wxType = 'vector'
else:
@@ -1876,9 +1876,9 @@
# start new map display if no display is available
# TODO: standardize type identifiers
- convertType = {'raster': 'rast',
- '3d-raster': 'rast3d',
- 'vector': 'vect'}
+ convertType = {'raster': 'raster',
+ '3d-raster': 'raster_3d',
+ 'vector': 'vector'}
try:
grassType = convertType[ltype]
except KeyError:
Modified: grass/branches/releasebranch_7_0/gui/wxpython/lmgr/layertree.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/lmgr/layertree.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/lmgr/layertree.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -732,11 +732,11 @@
cmd = ['g.region']
if rast:
- cmd.append('rast=%s' % ','.join(rast))
+ cmd.append('raster=%s' % ','.join(rast))
if vect:
- cmd.append('vect=%s' % ','.join(vect))
+ cmd.append('vector=%s' % ','.join(vect))
if rast3d:
- cmd.append('rast3d=%s' % ','.join(rast3d))
+ cmd.append('raster_3d=%s' % ','.join(rast3d))
# print output to command log area
if len(cmd) > 1:
@@ -795,13 +795,13 @@
lnameSrc = self.GetLayerInfo(layer, key = 'maplayer').GetName()
if ltype == 'raster':
- key = 'rast'
+ key = 'raster'
label = _('Raster map')
elif ltype == 'vector':
- key = 'vect'
+ key = 'vector'
label = _('Vector map')
elif ltype == '3d-raster':
- key = 'rast3d'
+ key = 'raster_3d'
label = _('3D raster map')
else:
GError(_("Unsupported map type <%s>") % ltype, parent = self)
Modified: grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -693,7 +693,7 @@
output=outputRaster, quiet=True,
overwrite=overwrite, getErrorMsg=True)
grass.del_temp_region()
- RunCommand('g.remove', type='rast', flags='f', quiet=True,
+ RunCommand('g.remove', type='raster', flags='f', quiet=True,
name=[tmpName + '.red', tmpName + '.green', tmpName + '.blue'])
if not returncode == 0:
self._giface.WriteError(_('Failed to run d.to.rast:\n') + messages)
@@ -842,9 +842,9 @@
"""Activate query mode and set layers to query.
This method is used for querying in d.mon using d.what.rast/vect"""
self.toolbars['map'].SelectTool(self.toolbars['map'].query)
- if ltype == 'vect':
+ if ltype == 'vector':
self._vectQueryLayers = maps
- elif ltype == 'rast':
+ elif ltype == 'raster':
self._rastQueryLayers = maps
def QueryMap(self, east, north, qdist, rast, vect):
@@ -1171,7 +1171,7 @@
if len(param_val) != 2:
continue
param, val = param_val
- if param == 'rast':
+ if param == 'raster':
self.legend.cmd[idx] = 'rast={rast}'.format(rast=layer.maplayer.name)
isMap = True
elif param in ('use', 'range'):
Modified: grass/branches/releasebranch_7_0/gui/wxpython/mapwin/decorations.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/mapwin/decorations.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/mapwin/decorations.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -234,9 +234,9 @@
inputs = 0
for param in self._cmd:
param = param.split('=')
- if param[0] == 'rast' and len(param) == 2:
+ if param[0] == 'raster' and len(param) == 2:
inputs += 1
- elif param[0] == 'rast3d' and len(param) == 2:
+ elif param[0] == 'raster_3d' and len(param) == 2:
inputs += 1
if inputs == 1:
return True
Modified: grass/branches/releasebranch_7_0/gui/wxpython/modules/mcalc_builder.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/modules/mcalc_builder.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/modules/mcalc_builder.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -110,7 +110,7 @@
if self.rast3d:
self.funct_dict['z()'] = 'z()'
self.funct_dict['tbres()'] = 'tbres()'
- element = 'rast3d'
+ element = 'raster_3d'
else:
element = 'cell'
@@ -601,9 +601,9 @@
if returncode != 0:
return
name = self.newmaptxt.GetValue().strip(' "') + '@' + grass.gisenv()['MAPSET']
- ltype = 'rast'
+ ltype = 'raster'
if self.rast3d:
- ltype = 'rast3d'
+ ltype = 'raster_3d'
self._giface.mapCreated.emit(name=name, ltype=ltype, add=self.addbox.IsChecked())
def OnSaveExpression(self, event):
Modified: grass/branches/releasebranch_7_0/gui/wxpython/psmap/dialogs.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/psmap/dialogs.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/psmap/dialogs.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -2501,7 +2501,7 @@
rasterType = getRasterType(map = self.currRaster)
self.rasterCurrent = wx.StaticText(panel, id = wx.ID_ANY,
- label = _("%(rast)s: type %(type)s") % { 'rast' : self.currRaster,
+ label = _("%(rast)s: type %(type)s") % { 'raster' : self.currRaster,
'type' : rasterType })
self.rasterSelect = Select(panel, id = wx.ID_ANY, size = globalvar.DIALOG_GSELECT_SIZE,
type = 'raster', multiple = False,
@@ -3188,7 +3188,7 @@
rasterType = getRasterType(map = currRaster)
self.rasterCurrent.SetLabel(_("%(rast)s: type %(type)s") % \
- { 'rast' : currRaster, 'type' : str(rasterType) })
+ { 'raster' : currRaster, 'type' : str(rasterType) })
# vector legend
if 'rect' in self.vLegendDict:
Modified: grass/branches/releasebranch_7_0/gui/wxpython/psmap/instructions.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/psmap/instructions.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/psmap/instructions.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -443,14 +443,14 @@
# define scaleType
if len(cmd[1]) <= 3:
- if 'rast' in cmd[1]:
+ if 'raster' in cmd[1]:
map['scaleType'] = 0
map['mapType'] = 'raster'
- map['map'] = cmd[1]['rast']
- elif 'vect' in cmd[1]:
+ map['map'] = cmd[1]['raster']
+ elif 'vector' in cmd[1]:
map['scaleType'] = 0
map['mapType'] = 'vector'
- map['map'] = cmd[1]['vect']
+ map['map'] = cmd[1]['vector']
elif 'region' in cmd[1]:
map['scaleType'] = 1
map['region'] = cmd[1]['region']
Modified: grass/branches/releasebranch_7_0/gui/wxpython/rlisetup/functions.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/rlisetup/functions.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/rlisetup/functions.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -26,7 +26,7 @@
WHOLE = 'whole'
REGIONS = 'regions'
UNITS = 'units'
- VECT = 'vect'
+ VECT = 'vector'
MVWIN = 'moving'
KMVWINC = 'kmvwin_circle'
@@ -66,7 +66,7 @@
return rlipath
-def checkMapExists(name, typ='rast'):
+def checkMapExists(name, typ='raster'):
"""Check if a map already exist in the working mapset"""
env = grass.gisenv()
mapset = env['MAPSET']
@@ -85,7 +85,7 @@
grass.run_command('g.region', vect=tmp_vect, align=origrast)
grass.run_command('v.to.rast', input=vect, output=outrast, use='cat',
cats=cat, overwrite=True, quiet=True)
- grass.run_command('g.remove', type='vect', name=tmp_vect, quiet=True, flags='f')
+ grass.run_command('g.remove', type='vector', name=tmp_vect, quiet=True, flags='f')
def obtainAreaVector(outrast):
Modified: grass/branches/releasebranch_7_0/gui/wxpython/rlisetup/sampling_frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/rlisetup/sampling_frame.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/rlisetup/sampling_frame.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -263,8 +263,8 @@
marea = MaskedArea(region, rasterName)
- RunCommand('g.remove', flags='f', type='rast', name=tmpraster)
- RunCommand('g.remove', flags='f', type='vect', name=tmpvector)
+ RunCommand('g.remove', flags='f', type='raster', name=tmpraster)
+ RunCommand('g.remove', flags='f', type='vector', name=tmpvector)
os.unlink(polyfile.name)
return marea
Modified: grass/branches/releasebranch_7_0/gui/wxpython/vnet/vnet_core.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/vnet/vnet_core.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/vnet/vnet_core.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -121,7 +121,7 @@
# for case there is some map with same name
# (when analysis does not produce any map, this map would have been shown as result)
- RunCommand('g.remove', flags = 'f', type = 'vect',
+ RunCommand('g.remove', flags = 'f', type = 'vector',
name = self.results["vect_map"].GetVectMapName())
# save data from
Modified: grass/branches/releasebranch_7_0/gui/wxpython/vnet/vnet_data.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/vnet/vnet_data.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/vnet/vnet_data.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -611,8 +611,8 @@
# check vector map
if params["input"]:
mapName, mapSet = params["input"].split("@")
- if grass.list_grouped('vect').has_key(mapSet):
- vectMaps = grass.list_grouped('vect')[mapSet]
+ if grass.list_grouped('vector').has_key(mapSet):
+ vectMaps = grass.list_grouped('vector')[mapSet]
if not params["input"] or mapName not in vectMaps:
invParams = params.keys()[:]
@@ -938,7 +938,7 @@
"""
if vectMap:
vectMap.DeleteRenderLayer()
- RunCommand('g.remove', flags = 'f', type = 'vect',
+ RunCommand('g.remove', flags = 'f', type = 'vector',
name = vectMap.GetVectMapName())
self.RemoveFromTmpMaps(vectMap)
return True
@@ -948,7 +948,7 @@
"""Delete all temporary maps in the class"""
update = False
for tmpMap in self.tmpMaps:
- RunCommand('g.remove', flags = 'f', type = 'vect',
+ RunCommand('g.remove', flags = 'f', type = 'vector',
name = tmpMap.GetVectMapName())
if tmpMap.DeleteRenderLayer():
update = True
Modified: grass/branches/releasebranch_7_0/gui/wxpython/web_services/dialogs.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/web_services/dialogs.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/gui/wxpython/web_services/dialogs.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -792,7 +792,7 @@
self.labels['output'] = wx.StaticText(parent = self, id = wx.ID_ANY, label = _("Name for output raster map:"))
- self.params['output'] = Select(parent = self, type = 'rast', mapsets = [grass.gisenv()['MAPSET']],
+ self.params['output'] = Select(parent = self, type = 'raster', mapsets = [grass.gisenv()['MAPSET']],
size = globalvar.DIALOG_GSELECT_SIZE)
self.regionStBoxLabel = wx.StaticBox(parent = self, id = wx.ID_ANY,
Modified: grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -825,8 +825,8 @@
Opt->type = TYPE_STRING;
Opt->key_desc = "name";
Opt->required = NO;
- Opt->answer = "rast";
- Opt->options = "rast,vect,rast3d";
+ Opt->answer = "raster";
+ Opt->options = "raster,vector,raster_3d";
Opt->description = _("Type of the input map");
break;
case G_OPT_T_TYPE:
Modified: grass/branches/releasebranch_7_0/lib/gpde/test/test_arrays.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gpde/test/test_arrays.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/gpde/test/test_arrays.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -857,7 +857,7 @@
N_free_array_3d(tmp);
sprintf(buff,
- "g.remove -f type=rast3d name=gpde_lib_test_volume_1,gpde_lib_test_volume_2");
+ "g.remove -f type=raster_3d name=gpde_lib_test_volume_1,gpde_lib_test_volume_2");
system(buff);
N_free_array_3d(data1);
Modified: grass/branches/releasebranch_7_0/lib/manage/do_copy.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/do_copy.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/manage/do_copy.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -34,7 +34,7 @@
*/
int M_do_copy(int n, const char *old, const char *mapset, const char *new)
{
- int i, ret, len;
+ int i, ret;
char path[GPATH_MAX], path2[GPATH_MAX];
int result = 0;
@@ -43,10 +43,8 @@
G_message(_("Copy %s <%s> to current mapset as <%s>"),
list[n].maindesc, G_fully_qualified_name(old, mapset), new);
- len = M__get_description_len(n);
-
M__hold_signals(1);
- if (G_strcasecmp(list[n].alias, "vect") == 0) {
+ if (G_strcasecmp(list[n].alias, "vector") == 0) {
ret = Vect_copy(old, mapset, new);
if (ret == -1) {
G_warning(_("Unable to copy <%s> to current mapset as <%s>"),
Modified: grass/branches/releasebranch_7_0/lib/manage/do_remove.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/do_remove.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/manage/do_remove.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -52,7 +52,7 @@
old = xname;
}
- if (G_strcasecmp(list[n].alias, "vect") == 0) {
+ if (G_strcasecmp(list[n].alias, "vector") == 0) {
if ((mapset = G_find_vector2(old, "")) == NULL) {
G_warning(_("Vector map <%s> not found"), old);
}
@@ -68,12 +68,12 @@
}
}
else {
- if (G_strcasecmp(list[n].alias, "rast") == 0) {
+ if (G_strcasecmp(list[n].alias, "raster") == 0) {
if ((mapset = G_find_raster2(old, "")) == NULL)
G_warning(_("Raster map <%s> not found"), old);
}
- if (G_strcasecmp(list[n].alias, "rast3d") == 0) {
+ if (G_strcasecmp(list[n].alias, "raster_3d") == 0) {
if ((mapset = G_find_raster3d(old, "")) == NULL)
G_warning(_("3D raster map <%s> not found"), old);
}
Modified: grass/branches/releasebranch_7_0/lib/manage/do_rename.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/do_rename.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/manage/do_rename.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -49,7 +49,7 @@
M__hold_signals(1);
- if (G_strcasecmp(list[n].alias, "vect") == 0) {
+ if (G_strcasecmp(list[n].alias, "vector") == 0) {
if ((mapset = G_find_vector2(old, "")) == NULL) {
G_warning(_("Vector map <%s> not found"), old);
}
@@ -66,12 +66,12 @@
}
}
else {
- if (G_strcasecmp(list[n].alias, "rast") == 0) {
+ if (G_strcasecmp(list[n].alias, "raster") == 0) {
if ((mapset = G_find_raster2(old, "")) == NULL)
G_warning(_("Raster map <%s> not found"), old);
}
- if (G_strcasecmp(list[n].alias, "rast3d") == 0) {
+ if (G_strcasecmp(list[n].alias, "raster_3d") == 0) {
if ((mapset = G_find_raster3d(old, "")) == NULL)
G_warning(_("3D raster map <%s> not found"), old);
}
Modified: grass/branches/releasebranch_7_0/lib/manage/element_list
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/element_list 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/manage/element_list 2014-12-19 18:21:24 UTC (rev 63617)
@@ -6,7 +6,7 @@
# main_element:alias:description:menu text
# support_element:description
#
-cell:rast:raster:raster map(s)
+cell:raster:raster:raster map(s)
cellhd:header
cats:category
colr:color
@@ -14,16 +14,15 @@
cell_misc:misc
fcell:fcell
g3dcell:g3dcell
-grid3:rast3d:raster3D:3D raster map(s)
-vector:vect:vector:vector map(s)
-dig:oldvect:old vector:old (GRASS 5.0) vector map(s)
+grid3:raster_3d:3D raster:3D raster map(s)
+vector:vector:vector:vector map(s)
+dig:oldvector:old vector:old (GRASS 5.0) vector map(s)
dig_att:attributes
dig_plus:topology
dig_cats:category
dig_misc:misc
reg:point registration
-dig_ascii:asciivect:asciivector:ASCII vector map(s)
+dig_ascii:asciivector:ascii vector:ASCII vector map(s)
paint/labels:labels:label:paint label file(s)
windows:region:region definition:region definition(s)
-windows3d:region3d:region3D definition:3D region definition(s)
group:group:imagery group:imagery group(s)
Modified: grass/branches/releasebranch_7_0/lib/manage/option.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/option.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/manage/option.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -47,10 +47,11 @@
G_asprintf(&str, _("%s to be %s"),
list[n].text, desc);
p->description = str;
- if (strcmp(p->key, "rast") == 0 || strcmp(p->key, "rast3d") == 0)
+ if (strcmp(p->key, "raster") == 0 || strcmp(p->key, "raster_3d") == 0)
p->guisection = _("Raster");
- else if (strcmp(p->key, "vect") == 0 || strcmp(p->key, "oldvect") == 0 ||
- strcmp(p->key, "asciivect") == 0)
+ else if (strcmp(p->key, "vector") == 0 ||
+ strcmp(p->key, "oldvector") == 0 ||
+ strcmp(p->key, "asciivector") == 0)
p->guisection = _("Vector");
else if (strcmp(p->key, "region") == 0 || strcmp(p->key, "region3d") == 0)
p->guisection = _("Region");
Modified: grass/branches/releasebranch_7_0/lib/python/script/core.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/core.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/script/core.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -962,7 +962,7 @@
temporary region used for raster-based computation.
:param bool region3d: True to get 3D region
- :param kwargs: g.region's parameters like 'rast', 'vect' or 'region'
+ :param kwargs: g.region's parameters like 'raster', 'vector' or 'region'
::
@@ -1086,7 +1086,7 @@
Returns the output from running g.list, as a list of qualified
names.
- :param str type: element type (rast, vect, rast3d, region, ...)
+ :param str type: element type (raster, vector, raster_3d, region, ...)
:param str pattern: pattern string
:param str mapset: mapset name (if not given use search path)
:param str exclude: pattern string to exclude maps from the research
@@ -1095,9 +1095,9 @@
:return: list of elements
"""
- if type == 'raster' or type == 'cell':
- verbose(_('Element type should be "rast" and not "%s"') % type)
- type = 'rast'
+ if type == 'cell':
+ verbose(_('Element type should be "raster" and not "%s"') % type)
+
result = list()
for line in read_command("g.list",
quiet=True,
@@ -1117,7 +1117,7 @@
Returns the output from running g.list, as a list of
(name, mapset) pairs
- :param str type: element type (rast, vect, rast3d, region, ...)
+ :param str type: element type (raster, vector, raster_3d, region, ...)
:param str pattern: pattern string
:param str mapset: mapset name (if not given use search path)
:param str exclude: pattern string to exclude maps from the research
@@ -1142,7 +1142,7 @@
>>> list_grouped('vect', pattern='*roads*')['PERMANENT']
['railroads', 'roadsmajor']
- :param str type: element type (rast, vect, rast3d, region, ...) or list of elements
+ :param str type: element type (raster, vector, raster_3d, region, ...) or list of elements
:param str pattern: pattern string
:param str check_search_path: True to add mapsets for the search path
with no found elements
@@ -1160,9 +1160,9 @@
store_types = True
flag += 't'
for i in range(len(types)):
- if types[i] == 'raster' or types[i] == 'cell':
- verbose(_('Element type should be "rast" and not "%s"') % types[i])
- types[i] = 'rast'
+ if types[i] == 'cell':
+ verbose(_('Element type should be "raster" and not "%s"') % types[i])
+ types[i] = 'raster'
result = {}
if check_search_path:
for mapset in mapsets(search_path=True):
Modified: grass/branches/releasebranch_7_0/lib/python/script/raster3d.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/raster3d.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/script/raster3d.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -33,7 +33,7 @@
>>> mapcalc3d('volume = row() + col() + depth()')
>>> raster3d_info('volume') # doctest: +ELLIPSIS
{'vertical_units': '"units"', 'tbres': 1.0, ... 'south': 185000.0}
- >>> run_command('g.remove', flags='f', type='rast3d', name='volume')
+ >>> run_command('g.remove', flags='f', type='raster_3d', name='volume')
0
:param str map: map name
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/abstract_map_dataset.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/abstract_map_dataset.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/abstract_map_dataset.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -46,7 +46,7 @@
@abstractmethod
def get_new_stds_instance(self, ident):
"""Return a new space time dataset instance that store maps with the
- type of this map object (rast, rast3d or vect)
+ type of this map object (raster, raster_3d or vector)
:param ident The identifier of the space time dataset
:return: The new space time dataset instance
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/aggregation.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/aggregation.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/aggregation.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -228,7 +228,7 @@
r_series = pymod.Module("r.series", output="spam", method=[method],
overwrite=overwrite, quiet=True, run_=False,
finish_=False)
- g_copy = pymod.Module("g.copy", rast=['spam', 'spamspam'],
+ g_copy = pymod.Module("g.copy", raster=['spam', 'spamspam'],
quiet=True, run_=False, finish_=False)
output_list = []
count = 0
@@ -308,7 +308,7 @@
process_queue.put(mod)
else:
mod = copy.deepcopy(g_copy)
- mod(rast=[aggregation_list[0], output_name])
+ mod(raster=[aggregation_list[0], output_name])
process_queue.put(mod)
if connected:
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/extract.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/extract.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/extract.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -234,13 +234,13 @@
names += ",%s" % (map.get_name())
count += 1
if type == "raster":
- gscript.run_command("g.remove", flags='f', type='rast',
+ gscript.run_command("g.remove", flags='f', type='raster',
name=names, quiet=True)
elif type == "raster3d":
- gscript.run_command("g.remove", flags='f', type='rast3d',
+ gscript.run_command("g.remove", flags='f', type='raster_3d',
name=names, quiet=True)
elif type == "vector":
- gscript.run_command("g.remove", flags='f', type='vect',
+ gscript.run_command("g.remove", flags='f', type='vector',
name=names, quiet=True)
dbif.close()
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/factory.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/factory.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/factory.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -26,8 +26,8 @@
def dataset_factory(type, id):
"""A factory functions to create space time or map datasets
- :param type: the dataset type: rast or raster, rast3d,
- vect or vector, strds, str3ds, stvds
+ :param type: the dataset type: rast or raster; rast3d, raster3d or raster_3d;
+ vect or vector; strds; str3ds; stvds
:param id: The id of the dataset ("name at mapset")
"""
if type == "strds":
@@ -38,7 +38,7 @@
sp = SpaceTimeVectorDataset(id)
elif type == "rast" or type == "raster":
sp = RasterDataset(id)
- elif type == "rast3d":
+ elif type == "raster_3d" or type == "rast3d" or type == "raster3d":
sp = Raster3DDataset(id)
elif type == "vect" or type == "vector":
sp = VectorDataset(id)
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/list_stds.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/list_stds.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/list_stds.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -33,8 +33,8 @@
This method returns a dictionary, the keys are the available mapsets,
the values are the rows from the SQL database query.
- :param type: The type of the datasets (strds, str3ds, stvds, rast,
- rast3d, vect)
+ :param type: The type of the datasets (strds, str3ds, stvds, raster,
+ raster_3d, vector)
:param temporal_type: The temporal type of the datasets (absolute,
relative)
:param columns: A comma separated list of columns that will be selected
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/mapcalc.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/mapcalc.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/mapcalc.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -328,10 +328,10 @@
names += ",%s" % (map.get_name())
count += 1
if type == "raster":
- gscript.run_command("g.remove", flags='f', type='rast',
+ gscript.run_command("g.remove", flags='f', type='raster',
name=names, quiet=True)
elif type == "raster3d":
- gscript.run_command("g.remove", flags='f', type='rast3d',
+ gscript.run_command("g.remove", flags='f', type='raster_3d',
name=names, quiet=True)
dbif.close()
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/open_stds.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/open_stds.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/open_stds.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -52,7 +52,7 @@
if type == "strds" or type == "rast" or type == "raster":
sp = dataset_factory("strds", id)
- elif type == "str3ds" or type == "rast3d" or type == "raster3d":
+ elif type == "str3ds" or type == "raster3d" or type == "rast3d" or type == "raster_3d":
sp = dataset_factory("str3ds", id)
elif type == "stvds" or type == "vect" or type == "vector":
sp = dataset_factory("stvds", id)
@@ -108,7 +108,7 @@
if type == "strds" or type == "rast" or type == "raster":
sp = dataset_factory("strds", id)
- elif type == "str3ds" or type == "rast3d" or type == "raster3d":
+ elif type == "str3ds" or type == "raster3d" or type == "rast3d "or type == "raster_3d":
sp = dataset_factory("str3ds", id)
elif type == "stvds" or type == "vect" or type == "vector":
sp = dataset_factory("stvds", id)
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/register.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/register.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/register.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -35,17 +35,17 @@
It takes care of the correct update of the space time datasets from all
registered maps.
- :param type: The type of the maps rast, rast3d or vect
+ :param type: The type of the maps raster, raster_3d or vector
:param name: The name of the space time dataset. Maps will be
registered in the temporal database if the name was set
to None
:param maps: A comma separated list of map names
:param file: Input file, one map per line map with start and optional
end time
- :param start: The start date and time of the first raster map
+ :param start: The start date and time of the first map
(format absolute: "yyyy-mm-dd HH:MM:SS" or "yyyy-mm-dd",
format relative is integer 5)
- :param end: The end date and time of the first raster map
+ :param end: The end date and time of the first map
(format absolute: "yyyy-mm-dd HH:MM:SS" or "yyyy-mm-dd",
format relative is integer 5)
:param unit: The unit of the relative time: years, months, days,
@@ -117,7 +117,7 @@
row["id"] = mapid
maplist[count] = row
- # Read the map list from file
+ # Read the raster map list from file
if file:
fd = open(file, "r")
@@ -327,7 +327,7 @@
for dataset in datatsets_to_modify:
if type == "rast" or type == "raster":
ds = dataset_factory("strds", dataset)
- elif type == "rast3d":
+ elif type == "raster_3d" or type == "rast3d" or type == "raster3d":
ds = dataset_factory("str3ds", dataset)
elif type == "vect" or type == "vector":
ds = dataset_factory("stvds", dataset)
@@ -349,10 +349,10 @@
:param ttype: The temporal type which should be assigned
and which the time format is of
:param map: A map dataset object derived from abstract_map_dataset
- :param start: The start date and time of the first raster map
+ :param start: The start date and time of the first map
(format absolute: "yyyy-mm-dd HH:MM:SS" or "yyyy-mm-dd",
format relative is integer 5)
- :param end: The end date and time of the first raster map
+ :param end: The end date and time of the first map
(format absolute: "yyyy-mm-dd HH:MM:SS" or "yyyy-mm-dd",
format relative is integer 5)
:param unit: The unit of the relative time: years, months,
@@ -434,7 +434,7 @@
"""Register a list of AbstractMapDataset objects in the temporal database
and optional in a space time dataset.
- :param type: The type of the map layer (rast, rast3d, vect)
+ :param type: The type of the map layer (raster, raster_3d, vector)
:param map_list: List of AbstractMapDataset objects
:param output_stds: The output stds
:param delete_empty: Set True to delete empty map layer found in the map_list
@@ -452,7 +452,7 @@
empty_maps = []
for map_layer in map_list:
- # Read the raster map data
+ # Read the map data
map_layer.load()
# In case of a empty map continue, do not register empty maps
@@ -488,7 +488,12 @@
map.delete(dbif)
mod = copy.deepcopy(g_remove)
if map.get_name():
- mod(type='rast', name=map.get_name())
+ if map.get_type() == "raster":
+ mod(type='raster', name=map.get_name())
+ if map.get_type() == "raster3d":
+ mod(type='raster_3d', name=map.get_name())
+ if map.get_type() == "vector":
+ mod(type='vector', name=map.get_name())
mod.run()
if connected:
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/space_time_datasets.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/space_time_datasets.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/space_time_datasets.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -100,7 +100,7 @@
>>> rmap.is_time_relative()
False
- >>> grass.run_command("g.remove", flags="f", type="rast", name=name, quiet=True)
+ >>> grass.run_command("g.remove", flags="f", type="raster", name=name, quiet=True)
0
>>> grass.del_temp_region()
@@ -418,7 +418,7 @@
True
>>> r3map.is_time_relative()
False
- >>> grass.run_command("g.remove", flags="f", type="rast3d", name=name, quiet=True)
+ >>> grass.run_command("g.remove", flags="f", type="raster_3d", name=name, quiet=True)
0
>>> grass.del_temp_region()
@@ -746,7 +746,7 @@
True
>>> vmap.is_time_relative()
False
- >>> grass.run_command("g.remove", flags="f", type="vect", name=name, quiet=True)
+ >>> grass.run_command("g.remove", flags="f", type="vector", name=name, quiet=True)
0
>>> grass.del_temp_region()
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/temporal_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/temporal_algebra.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/temporal_algebra.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -1063,21 +1063,13 @@
"""Remove maps of specific type
:param namelist: List of map names to be removed
- :param map_type: The type of the maps (rast, rast3d or vect)
+ :param map_type: The type of the maps (raster, raster_3d or vector)
"""
max = 100
chunklist = [namelist[i:i + max] for i in range(0, len(namelist), max)]
for chunk in chunklist:
stringlist = ",".join(chunk)
- # Transform the map type
- if map_type == "raster":
- map_type = "rast"
- if map_type == "raster3d":
- map_type = "rast3d"
- if map_type == "vector":
- map_type = "vect"
-
if self.run:
m = copy.deepcopy(self.m_mremove)
m.inputs["type"].value = map_type
@@ -2068,17 +2060,17 @@
# Copy the map
if map_i.get_type() == 'raster':
m = copy.deepcopy(self.m_copy)
- m.inputs["rast"].value = map_i.get_id(), newident
+ m.inputs["raster"].value = map_i.get_id(), newident
m.flags["overwrite"].value = self.overwrite
process_queue.put(m)
elif map_i.get_type() == 'raster3d':
m = copy.deepcopy(self.m_copy)
- m.inputs["rast3d"].value = map_i.get_id(), newident
+ m.inputs["raster_3d"].value = map_i.get_id(), newident
m.flags["overwrite"].value = self.overwrite
process_queue.put(m)
elif map_i.get_type() == 'vector':
m = copy.deepcopy(self.m_copy)
- m.inputs["vect"].value = map_i.get_id(), newident
+ m.inputs["vector"].value = map_i.get_id(), newident
m.flags["overwrite"].value = self.overwrite
process_queue.put(m)
else:
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/temporal_raster3d_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/temporal_raster3d_algebra.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/temporal_raster3d_algebra.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -45,7 +45,7 @@
self.overwrite = overwrite
self.count = 0
self.stdstype = "str3ds"
- self.maptype = "rast3d"
+ self.maptype = "raster_3d"
self.mapclass = Raster3DDataset
self.basename = basename
self.expression = expression
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/temporal_raster_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/temporal_raster_algebra.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/temporal_raster_algebra.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -85,7 +85,7 @@
self.overwrite = overwrite
self.count = 0
self.stdstype = "strds"
- self.maptype = "rast"
+ self.maptype = "raster"
self.mapclass = RasterDataset
self.basename = basename
self.expression = expression
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/temporal_vector_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/temporal_vector_algebra.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/temporal_vector_algebra.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -140,7 +140,7 @@
self.overwrite = overwrite
self.count = 0
self.stdstype = "stvds"
- self.maptype = "vect"
+ self.maptype = "vector"
self.mapclass = VectorDataset
self.basename = basename
self.expression = expression
@@ -420,7 +420,7 @@
# Change map name to given basename.
newident = self.basename + "_" + str(count)
m = copy.deepcopy(self.m_rename)
- m.inputs["vect"].value = (map_i.get_name(),newident)
+ m.inputs["vector"].value = (map_i.get_name(),newident)
m.flags["overwrite"].value = self.overwrite
m.run()
map_i.set_id(newident + "@" + mapset)
@@ -451,7 +451,7 @@
# Copy the map
m = copy.deepcopy(self.m_copy)
- m.inputs["vect"].value = map_i.get_id(), newident
+ m.inputs["vector"].value = map_i.get_id(), newident
m.flags["overwrite"].value = self.overwrite
m.run()
else:
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/test_register_function.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/test_register_function.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/test_register_function.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -43,15 +43,17 @@
expression="register_map_2 = 2")
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",
+ overwrite=True)
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",
+ overwrite=True)
def tearDown(self):
"""Remove maps from temporal database
"""
self.runModule("t.unregister", maps="register_map_1,register_map_2", quiet=True)
- self.runModule("g.remove", flags='f', type="rast", name="register_map_1,register_map_2", quiet=True)
+ self.runModule("g.remove", flags='f', type="raster", name="register_map_1,register_map_2", quiet=True)
self.strds_abs.delete()
self.strds_rel.delete()
@@ -59,7 +61,7 @@
"""Test the registration of maps with absolute time in a
space time raster dataset
"""
- tgis.register_maps_in_space_time_dataset(type="rast", name=self.strds_abs.get_name(),
+ tgis.register_maps_in_space_time_dataset(type="raster", name=self.strds_abs.get_name(),
maps="register_map_1,register_map_2",
start="2001-01-01", increment="1 day", interval=True)
@@ -91,7 +93,7 @@
ciface.write_raster_timestamp("register_map_1", tgis.get_current_mapset(), "1 Jan 2001/2 Jan 2001")
ciface.write_raster_timestamp("register_map_2", tgis.get_current_mapset(), "2 Jan 2001/3 Jan 2001")
- tgis.register_maps_in_space_time_dataset(type="rast", name=self.strds_abs.get_name(),
+ tgis.register_maps_in_space_time_dataset(type="raster", name=self.strds_abs.get_name(),
maps="register_map_1,register_map_2")
map = tgis.RasterDataset("register_map_1@" + tgis.get_current_mapset())
@@ -114,7 +116,7 @@
def test_absolute_time_1(self):
"""Test the registration of maps with absolute time
"""
- tgis.register_maps_in_space_time_dataset(type="rast", name=None,
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None,
maps="register_map_1,register_map_2",
start="2001-01-01", increment="1 day", interval=True)
@@ -133,7 +135,7 @@
def test_absolute_time_2(self):
"""Test the registration of maps with absolute time
"""
- tgis.register_maps_in_space_time_dataset(type="rast", name=None,
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None,
maps="register_map_1,register_map_2",
start="2001-01-01 10:30:01", increment="8 hours", interval=False)
@@ -157,7 +159,7 @@
ciface.write_raster_timestamp("register_map_1", tgis.get_current_mapset(), "1 Jan 2001 10:30:01")
ciface.write_raster_timestamp("register_map_2", tgis.get_current_mapset(), "1 Jan 2001 18:30:01")
- tgis.register_maps_in_space_time_dataset(type="rast", name=None,
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None,
maps="register_map_1,register_map_2")
map = tgis.RasterDataset("register_map_1@" + tgis.get_current_mapset())
@@ -175,7 +177,7 @@
space time raster dataset
"""
- tgis.register_maps_in_space_time_dataset(type="rast", name=self.strds_rel.get_name(),
+ tgis.register_maps_in_space_time_dataset(type="raster", name=self.strds_rel.get_name(),
maps="register_map_1,register_map_2", start=0,
increment=1, unit="day", interval=True)
@@ -208,7 +210,7 @@
ciface.write_raster_timestamp("register_map_1", tgis.get_current_mapset(), "1000000 seconds/1500000 seconds")
ciface.write_raster_timestamp("register_map_2", tgis.get_current_mapset(), "1500000 seconds/2000000 seconds")
- tgis.register_maps_in_space_time_dataset(type="rast", name=self.strds_rel.get_name(),
+ tgis.register_maps_in_space_time_dataset(type="raster", name=self.strds_rel.get_name(),
maps="register_map_1,register_map_2")
map = tgis.RasterDataset("register_map_1@" + tgis.get_current_mapset())
@@ -234,7 +236,7 @@
def test_relative_time_1(self):
"""Test the registration of maps with relative time
"""
- tgis.register_maps_in_space_time_dataset(type="rast", name=None,
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None,
maps="register_map_1,register_map_2",
start=0, increment=1, unit="day", interval=True)
@@ -255,7 +257,7 @@
def test_relative_time_2(self):
"""Test the registration of maps with relative time
"""
- tgis.register_maps_in_space_time_dataset(type="rast", name=None,
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None,
maps="register_map_1,register_map_2",
start=1000000, increment=500000, unit="seconds", interval=True)
@@ -281,7 +283,7 @@
ciface.write_raster_timestamp("register_map_1", tgis.get_current_mapset(), "1000000 seconds/1500000 seconds")
ciface.write_raster_timestamp("register_map_2", tgis.get_current_mapset(), "1500000 seconds/2000000 seconds")
- tgis.register_maps_in_space_time_dataset(type="rast", name=None,
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None,
maps="register_map_1,register_map_2")
map = tgis.RasterDataset("register_map_1@" + tgis.get_current_mapset())
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_algebra.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_algebra.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -46,15 +46,15 @@
tgis.open_new_stds(name="D", type="strds", temporaltype="absolute",
title="D", descr="D", 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="raster", name="A", maps="a1,a2,a3,a4",
start="2001-01-01", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="B", maps="b1,b2",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="B", maps="b1,b2",
start="2001-01-01", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="C", maps="c1",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="C", maps="c1",
start="2001-01-02", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d1,d2,d3",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d1,d2,d3",
start="2001-01-03", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name=None, maps="singletmap",
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None, maps="singletmap",
start="2001-01-03", end="2001-01-04", interval=True)
def tearDown(self):
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_algebra_grs.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_algebra_grs.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_algebra_grs.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -48,19 +48,19 @@
tgis.open_new_stds(name="D", type="strds", temporaltype="absolute",
title="D", descr="D", semantic="field", overwrite=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="A", maps="a1,a2,a3,a4,a5,a6",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="A", maps="a1,a2,a3,a4,a5,a6",
start="2001-01-01", increment="1 month", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="B", maps="b1,b2",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="B", maps="b1,b2",
start="2001-01-01", increment="3 months", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="C", maps="c1",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="C", maps="c1",
start="2001-01-01", increment="1 year", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d1",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d1",
start="2001-01-01", increment="31 days", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d2",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d2",
start="2001-03-01", increment="31 days", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d3",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d3",
start="2001-05-01", increment="31 days", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name=None, maps="singletmap",
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None, maps="singletmap",
start="2001-01-03", end="2001-01-04", interval=True)
def tearDown(self):
@@ -85,7 +85,7 @@
ta.count = 0
ta.stdstype = "strds"
- ta.maptype = "rast"
+ ta.maptype = "raster"
ta.mapclass = tgis.RasterDataset
maplist = ta.check_stds("A")
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_conditionals.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_conditionals.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_conditionals.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -51,17 +51,17 @@
tgis.open_new_stds(name="E", type="strds", temporaltype="absolute",
title="E", descr="E", 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="raster", name="A", maps="a1,a2,a3,a4",
start="2001-01-01", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="B", maps="b1,b2",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="B", maps="b1,b2",
start="2001-01-01", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="C", maps="c1",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="C", maps="c1",
start="2001-01-02", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d1,d2,d3",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d1,d2,d3",
start="2001-01-03", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="E", maps="e1,e2,e3",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="E", maps="e1,e2,e3",
start="2000-12-31", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name=None, maps="singletmap",
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None, maps="singletmap",
start="2001-01-03", end="2001-01-04", interval=True)
def tearDown(self):
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster3d_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster3d_algebra.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster3d_algebra.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -33,7 +33,7 @@
tgis.open_new_stds(name="A", type="str3ds", temporaltype="absolute",
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="raster_3d", name="A", maps="a1,a2,a3,a4",
start="2001-01-01", increment="1 day", interval=True)
def tearDown(self):
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster_algebra.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster_algebra.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -46,15 +46,15 @@
tgis.open_new_stds(name="D", type="strds", temporaltype="absolute",
title="D", descr="D", 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="raster", name="A", maps="a1,a2,a3,a4",
start="2001-01-01", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="B", maps="b1,b2",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="B", maps="b1,b2",
start="2001-01-01", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="C", maps="c1",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="C", maps="c1",
start="2001-01-02", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d1,d2,d3",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d1,d2,d3",
start="2001-01-03", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name=None, maps="singletmap",
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None, maps="singletmap",
start="2001-01-03", end="2001-01-04", interval=True)
def tearDown(self):
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster_algebra_grs.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster_algebra_grs.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster_algebra_grs.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -47,19 +47,19 @@
tgis.open_new_stds(name="D", type="strds", temporaltype="absolute",
title="D", descr="D", semantic="field", overwrite=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="A", maps="a1,a2,a3,a4,a5,a6",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="A", maps="a1,a2,a3,a4,a5,a6",
start="2001-01-01", increment="1 month", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="B", maps="b1,b2",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="B", maps="b1,b2",
start="2001-01-01", increment="3 months", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="C", maps="c1",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="C", maps="c1",
start="2001-01-01", increment="1 year", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d1",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d1",
start="2001-01-01", increment="5 days", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d2",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d2",
start="2001-03-01", increment="5 days", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d3",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d3",
start="2001-05-01", increment="5 days", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name=None, maps="singletmap",
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None, maps="singletmap",
start="2001-03-01", end="2001-04-01", interval=True)
def tearDown(self):
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster_conditionals.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster_conditionals.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_raster_conditionals.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -45,13 +45,13 @@
tgis.open_new_stds(name="D", type="strds", temporaltype="absolute",
title="D", descr="D", 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="raster", name="A", maps="a1,a2,a3,a4",
start="2001-01-01", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="B", maps="b1,b2",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="B", maps="b1,b2",
start="2001-01-01", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="C", maps="c1",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="C", maps="c1",
start="2001-01-02", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d1,d2,d3,d4",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d1,d2,d3,d4",
start="2001-01-03", increment="1 day", interval=True)
def tearDown(self):
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_vector_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_vector_algebra.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/testsuite/unittests_temporal_vector_algebra.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -24,18 +24,18 @@
cls.runModule("g.region", n=80.0, s=0.0, e=120.0,
w=0.0, t=1.0, b=0.0, res=10.0)
- cls.runModule("v.random", overwrite=True, quiet=True, n=20, seed=1, output='a1')
- cls.runModule("v.random", overwrite=True, quiet=True, n=20, seed=1, output='a2')
- cls.runModule("v.random", overwrite=True, quiet=True, n=20, seed=1, output='a3')
- cls.runModule("v.random", overwrite=True, quiet=True, n=20, seed=1, output='a4')
- cls.runModule("v.random", overwrite=True, quiet=True, n=20, seed=2, output='b1')
- cls.runModule("v.random", overwrite=True, quiet=True, n=20, seed=2, output='b2')
- cls.runModule("v.random", overwrite=True, quiet=True, n=20, seed=3, output='c1')
- cls.runModule("v.random", overwrite=True, quiet=True, n=20, seed=4, output='d1')
- cls.runModule("v.random", overwrite=True, quiet=True, n=20, seed=4, output='d2')
- cls.runModule("v.random", overwrite=True, quiet=True, n=20, seed=4, output='d3')
- cls.runModule("v.random", overwrite=True, quiet=True, n=20, seed=5, output='singletmap')
- cls.runModule("v.random", overwrite=True, quiet=True, n=20, seed=6, output='singlemap')
+ cls.runModule("v.random", overwrite=True, quiet=True, npoints=20, seed=1, output='a1')
+ cls.runModule("v.random", overwrite=True, quiet=True, npoints=20, seed=1, output='a2')
+ cls.runModule("v.random", overwrite=True, quiet=True, npoints=20, seed=1, output='a3')
+ cls.runModule("v.random", overwrite=True, quiet=True, npoints=20, seed=1, output='a4')
+ cls.runModule("v.random", overwrite=True, quiet=True, npoints=20, seed=2, output='b1')
+ cls.runModule("v.random", overwrite=True, quiet=True, npoints=20, seed=2, output='b2')
+ cls.runModule("v.random", overwrite=True, quiet=True, npoints=20, seed=3, output='c1')
+ cls.runModule("v.random", overwrite=True, quiet=True, npoints=20, seed=4, output='d1')
+ cls.runModule("v.random", overwrite=True, quiet=True, npoints=20, seed=4, output='d2')
+ cls.runModule("v.random", overwrite=True, quiet=True, npoints=20, seed=4, output='d3')
+ cls.runModule("v.random", overwrite=True, quiet=True, npoints=20, seed=5, output='singletmap')
+ cls.runModule("v.random", overwrite=True, quiet=True, npoints=20, seed=6, output='singlemap')
tgis.open_new_stds(name="A", type="stvds", temporaltype="absolute",
title="A", descr="A", semantic="field", overwrite=True)
@@ -46,15 +46,15 @@
tgis.open_new_stds(name="D", type="stvds", temporaltype="absolute",
title="D", descr="D", semantic="field", overwrite=True)
- tgis.register_maps_in_space_time_dataset(type="vect", name="A", maps="a1,a2,a3,a4",
+ tgis.register_maps_in_space_time_dataset(type="vector", name="A", maps="a1,a2,a3,a4",
start="2001-01-01", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="vect", name="B", maps="b1,b2",
+ tgis.register_maps_in_space_time_dataset(type="vector", name="B", maps="b1,b2",
start="2001-01-01", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="vect", name="C", maps="c1",
+ tgis.register_maps_in_space_time_dataset(type="vector", name="C", maps="c1",
start="2001-01-02", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="vect", name="D", maps="d1,d2,d3",
+ tgis.register_maps_in_space_time_dataset(type="vector", name="D", maps="d1,d2,d3",
start="2001-01-03", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="vect", name=None, maps="singletmap",
+ tgis.register_maps_in_space_time_dataset(type="vector", name=None, maps="singletmap",
start="2001-01-03", end="2001-01-04", interval=True)
def tearDown(self):
Modified: grass/branches/releasebranch_7_0/raster/r.carve/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.carve/main.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/raster/r.carve/main.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -78,11 +78,11 @@
"to raster and subtracts depth from the output DEM.");
parm.inrast = G_define_standard_option(G_OPT_R_INPUT);
- parm.inrast->key = "rast";
+ parm.inrast->key = "raster";
parm.inrast->description = _("Name of input raster elevation map");
parm.invect = G_define_standard_option(G_OPT_V_INPUT);
- parm.invect->key = "vect";
+ parm.invect->key = "vector";
parm.invect->label =
_("Name of input vector map containing stream(s)");
Modified: grass/branches/releasebranch_7_0/raster/r.reclass/reclass.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.reclass/reclass.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/raster/r.reclass/reclass.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -230,7 +230,7 @@
if (G_find_file2("cell", new_name, G_mapset()) &&
Rast_map_type(new_name, G_mapset()) != CELL_TYPE) {
M_read_list(FALSE, NULL);
- if (M_do_remove(M_get_element("rast"), new_name) == 1)
+ if (M_do_remove(M_get_element("raster"), new_name) == 1)
G_fatal_error(_("Cannot overwrite existing raster map <%s>"),
new_name);
}
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,63345,63391,63393,63554,63556
+ /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
Modified: grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -31,7 +31,7 @@
cls.runModule("t.create", type="strds", temporaltype="absolute",
output="A", title="A test", description="A test")
- cls.runModule("t.register", flags="i", type="rast", input="A",
+ cls.runModule("t.register", flags="i", type="raster", input="A",
maps="a1,a2,a3",
start="2001-01-01", increment="%i months"%i)
@@ -56,7 +56,7 @@
cls.runModule("t.create", type="strds", temporaltype="absolute",
output="A", title="A test", description="A test")
- cls.runModule("t.register", flags="i", type="rast", input="A",
+ cls.runModule("t.register", flags="i", type="raster", input="A",
maps="a1,a2,a3",
start="2001-01-01", increment="%i months"%i)
@@ -220,7 +220,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-02-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test1")
+ info = SimpleModule("t.info", flags="g", type="raster", input="a1 at test1")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
tinfo_string="""id=a1 at test2
@@ -231,7 +231,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-03-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test2")
+ info = SimpleModule("t.info", flags="g", type="raster", input="a1 at test2")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
tinfo_string="""id=a1 at test3
@@ -242,7 +242,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-04-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test3")
+ info = SimpleModule("t.info", flags="g", type="raster", input="a1 at test3")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
tinfo_string="""id=a1 at test4
@@ -253,7 +253,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-05-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test4")
+ info = SimpleModule("t.info", flags="g", type="raster", input="a1 at test4")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
tinfo_string="""id=a1 at test5
@@ -263,7 +263,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-06-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test5")
+ info = SimpleModule("t.info", flags="g", type="raster", input="a1 at test5")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
if __name__ == '__main__':
Modified: grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -28,7 +28,7 @@
cls.runModule("t.create", type="str3ds", temporaltype="absolute",
output="A", title="A test3d", description="A test3d")
- cls.runModule("t.register", flags="i", type="rast3d", input="A",
+ cls.runModule("t.register", flags="i", type="raster_3d", input="A",
maps="a1,a2,a3",
start="2001-01-01", increment="%i months"%i)
@@ -166,7 +166,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-02-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="rast3d", input="a1 at test3d1")
+ info = SimpleModule("t.info", flags="g", type="raster_3d", input="a1 at test3d1")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
tinfo_string="""id=a1 at test3d2
@@ -177,7 +177,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-03-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="rast3d", input="a1 at test3d2")
+ info = SimpleModule("t.info", flags="g", type="raster_3d", input="a1 at test3d2")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
tinfo_string="""id=a1 at test3d3
@@ -188,7 +188,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-04-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="rast3d", input="a1 at test3d3")
+ info = SimpleModule("t.info", flags="g", type="raster_3d", input="a1 at test3d3")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
tinfo_string="""id=a1 at test3d4
@@ -199,7 +199,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-05-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="rast3d", input="a1 at test3d4")
+ info = SimpleModule("t.info", flags="g", type="raster_3d", input="a1 at test3d4")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
if __name__ == '__main__':
Modified: grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -14,7 +14,6 @@
from grass.gunittest.gmodules import SimpleModule
import os
-
mapset_count = 0
class TestRasterExtraction(TestCase):
@@ -25,13 +24,13 @@
cls.runModule("g.mapset", flags="c", mapset="testvect%i"%i)
cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
# Use always the current mapset as temporal database
- cls.runModule("v.random", output="a1", n=20)
- cls.runModule("v.random", output="a2", n=20)
- cls.runModule("v.random", output="a3", n=20)
+ cls.runModule("v.random", output="a1", npoints=20)
+ cls.runModule("v.random", output="a2", npoints=20)
+ cls.runModule("v.random", output="a3", npoints=20)
cls.runModule("t.create", type="stvds", temporaltype="absolute",
output="A", title="A testvect", description="A testvect")
- cls.runModule("t.register", flags="i", type="vect", input="A",
+ cls.runModule("t.register", flags="i", type="vector", input="A",
maps="a1,a2,a3",
start="2001-01-01", increment="%i months"%i)
@@ -177,7 +176,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-02-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="vect", input="a1 at testvect1")
+ info = SimpleModule("t.info", flags="g", type="vector", input="a1 at testvect1")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
tinfo_string="""id=a1 at testvect2
@@ -188,7 +187,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-03-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="vect", input="a1 at testvect2")
+ info = SimpleModule("t.info", flags="g", type="vector", input="a1 at testvect2")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
tinfo_string="""id=a1 at testvect3
@@ -199,7 +198,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-04-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="vect", input="a1 at testvect3")
+ info = SimpleModule("t.info", flags="g", type="vector", input="a1 at testvect3")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
tinfo_string="""id=a1 at testvect4
@@ -210,7 +209,7 @@
start_time=2001-01-01 00:00:00
end_time=2001-05-01 00:00:00 """
- info = SimpleModule("t.info", flags="g", type="vect", input="a1 at testvect4")
+ info = SimpleModule("t.info", flags="g", type="vector", input="a1 at testvect4")
self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
if __name__ == '__main__':
Modified: grass/branches/releasebranch_7_0/temporal/t.info/t.info.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.info/t.info.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.info/t.info.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -28,7 +28,7 @@
#%option G_OPT_STDS_TYPE
#% guidependency: input
#% guisection: Required
-#% options: strds, str3ds, stvds, rast, rast3d, vect
+#% options: strds, str3ds, stvds, raster, raster_3d, vector
#%end
#%flag
Modified: grass/branches/releasebranch_7_0/temporal/t.info/testsuite/test.t.info.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.info/testsuite/test.t.info.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.info/testsuite/test.t.info.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -29,51 +29,51 @@
t.create type=stvds temporaltype=absolute output=lidar_abs_ds1 title="A test" descr="A test"
t.create type=stvds temporaltype=absolute output=lidar_abs_ds2 title="A test" descr="A test"
-t.register type=rast -i input=precip_abs1 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
+t.register type=raster -i input=precip_abs1 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
t.info type=strds input=precip_abs1
t.info -g type=strds input=precip_abs1
-t.register type=rast -i input=precip_abs2 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
+t.register type=raster -i input=precip_abs2 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
t.info type=strds input=precip_abs2
t.info -g type=strds input=precip_abs2
t.info -h type=strds input=precip_abs2
-t.info type=rast input=prec_1
-t.info -g type=rast input=prec_1
-t.info type=rast input=prec_2
-t.info -g type=rast input=prec_2
+t.info type=raster input=prec_1
+t.info -g type=raster input=prec_1
+t.info type=raster input=prec_2
+t.info -g type=raster input=prec_2
-t.register type=rast3d -i input=precip_abs1 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
+t.register type=raster_3d -i input=precip_abs1 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
t.info type=str3ds input=precip_abs1
t.info -g type=str3ds input=precip_abs1
-t.register type=rast3d -i input=precip_abs2 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
+t.register type=raster_3d -i input=precip_abs2 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
t.info type=str3ds input=precip_abs2
t.info -g type=str3ds input=precip_abs2
t.info -h type=str3ds input=precip_abs2
-t.info type=rast3 input=prec_1
-t.info -g type=rast3 input=prec_1
-t.info type=rast3 input=prec_2
-t.info -g type=rast3 input=prec_2
+t.info type=raster_3d input=prec_1
+t.info -g type=raster_3d input=prec_1
+t.info type=raster_3d input=prec_2
+t.info -g type=raster_3d input=prec_2
-t.register type=vect --v -i input=lidar_abs_ds1 maps=lidar_abs_1,lidar_abs_2 start="2001-01-01" increment="20 years"
+t.register type=vector --v -i input=lidar_abs_ds1 maps=lidar_abs_1,lidar_abs_2 start="2001-01-01" increment="20 years"
t.info type=stvds input=lidar_abs_ds1
t.info -g type=stvds input=lidar_abs_ds1
-t.register type=vect --v -i input=lidar_abs_ds2 maps=lidar_abs_1,lidar_abs_2 start="2001-01-01" increment="20 years"
+t.register type=vector --v -i input=lidar_abs_ds2 maps=lidar_abs_1,lidar_abs_2 start="2001-01-01" increment="20 years"
t.info type=stvds input=lidar_abs_ds2
t.info -g type=stvds input=lidar_abs_ds2
-t.info type=vect input=lidar_abs_1
-t.info -g type=vect input=lidar_abs_1
-t.info type=vect input=lidar_abs_2
-t.info -g type=vect input=lidar_abs_2
+t.info type=vector input=lidar_abs_1
+t.info -g type=vector input=lidar_abs_1
+t.info type=vector input=lidar_abs_2
+t.info -g type=vector input=lidar_abs_2
-t.unregister type=vect maps=lidar_abs_1,lidar_abs_2
+t.unregister type=vector maps=lidar_abs_1,lidar_abs_2
t.remove type=stvds input=lidar_abs_ds1,lidar_abs_ds2
-t.unregister type=rast maps=prec_1,prec_2
+t.unregister type=raster maps=prec_1,prec_2
t.remove type=strds input=precip_abs1,precip_abs2
-t.unregister type=rast3 maps=prec_1,prec_2
+t.unregister type=raster_3d maps=prec_1,prec_2
t.remove type=str3ds input=precip_abs1,precip_abs2
Modified: grass/branches/releasebranch_7_0/temporal/t.list/t.list.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.list/t.list.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.list/t.list.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -27,7 +27,7 @@
#% description: Type of the space time dataset or map, default is strds
#% guisection: Selection
#% required: no
-#% options: strds, str3ds, stvds, rast, rast3d, vect
+#% options: strds, str3ds, stvds, raster, raster_3d, vector
#% answer: strds
#%end
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/t.rast.accdetect.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/t.rast.accdetect.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/t.rast.accdetect.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -419,7 +419,7 @@
# Remove empty maps
if len(empty_maps) > 0:
for map in empty_maps:
- grass.run_command("g.remove", flags='f', type="rast", name=map.get_name(), quiet=True)
+ grass.run_command("g.remove", flags='f', type="raster", name=map.get_name(), quiet=True)
############################################################################
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -36,7 +36,7 @@
output="A", title="A test",
description="A test", overwrite=True)
- cls.runModule("t.register", flags="i", type="rast", input="A",
+ cls.runModule("t.register", flags="i", type="raster", input="A",
maps="a1,a2,a3,a4,a5,a6,a7",
start="2001-01-15 12:05:45",
increment="14 days",
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -35,7 +35,7 @@
output="A", title="A test",
description="A test", overwrite=True)
- cls.runModule("t.register", flags="i", type="rast", input="A",
+ cls.runModule("t.register", flags="i", type="raster", input="A",
maps=name_list,
start="2001-01-01",
increment="4 hours",
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -36,7 +36,7 @@
output="A", title="A test",
description="A test", overwrite=True)
- cls.runModule("t.register", flags="i", type="rast", input="A",
+ cls.runModule("t.register", flags="i", type="raster", input="A",
maps="a1,a2,a3,a4,a5,a6,a7",
start=0, unit="days", increment=3,
overwrite=True)
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -47,15 +47,15 @@
tgis.open_new_stds(name="D", type="strds", temporaltype="absolute",
title="D", descr="D", semantic="field")
- tgis.register_maps_in_space_time_dataset(type="rast", name="A", maps="a1,a2,a3,a4",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="A", maps="a1,a2,a3,a4",
start="2001-01-01", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="B", maps="b1,b2",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="B", maps="b1,b2",
start="2001-01-01", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="C", maps="c1",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="C", maps="c1",
start="2001-01-02", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d1,d2,d3",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d1,d2,d3",
start="2001-01-03", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name=None, maps="singletmap",
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None, maps="singletmap",
start="2001-01-03", end="2001-01-04", interval=True)
def tearDown(self):
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -48,19 +48,19 @@
tgis.open_new_stds(name="D", type="strds", temporaltype="absolute",
title="D", descr="D", semantic="field", overwrite=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="A", maps="a1,a2,a3,a4,a5,a6",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="A", maps="a1,a2,a3,a4,a5,a6",
start="2001-01-01", increment="1 month", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="B", maps="b1,b2",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="B", maps="b1,b2",
start="2001-01-01", increment="3 months", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="C", maps="c1",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="C", maps="c1",
start="2001-01-01", increment="1 year", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d1",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d1",
start="2001-01-01", increment="5 days", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d2",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d2",
start="2001-03-01", increment="5 days", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d3",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="D", maps="d3",
start="2001-05-01", increment="5 days", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name=None, maps="singletmap",
+ tgis.register_maps_in_space_time_dataset(type="raster", name=None, maps="singletmap",
start="2001-03-01", end="2001-04-01", interval=True)
def tearDown(self):
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity_fails.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity_fails.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity_fails.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -32,9 +32,9 @@
tgis.open_new_stds(name="A", type="strds", temporaltype="absolute",
title="A", descr="A", semantic="field", overwrite=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="A", maps="a1",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="A", maps="a1",
start="2001-02-01", end="2001-04-01", interval=True)
- tgis.register_maps_in_space_time_dataset(type="rast", name="A", maps="a2",
+ tgis.register_maps_in_space_time_dataset(type="raster", name="A", maps="a2",
start="2001-03-01", end="2001-05-01", interval=True)
@classmethod
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.extract/testsuite/test_extract.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.extract/testsuite/test_extract.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.extract/testsuite/test_extract.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -42,7 +42,7 @@
self.runModule("t.create", type="strds", temporaltype="absolute",
output="precip_abs1", title="A test", description="A test", overwrite=True)
- self.runModule("t.register", flags="i", type="rast", input="precip_abs1",
+ self.runModule("t.register", flags="i", type="raster", input="precip_abs1",
maps="prec_1,prec_2,prec_3,prec_4,prec_5,prec_6",
start="2001-01-01", increment="3 months", overwrite=True)
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -46,21 +46,21 @@
self.runModule("t.create", type="strds", temporaltype="absolute",
output="precip_i", title="A test integer",
description="A test integer values")
- self.runModule("t.register", flags="i", type="rast", input="precip_i",
+ self.runModule("t.register", flags="i", type="raster", input="precip_i",
maps="prec_1i,prec_2i,prec_3i,prec_4i,prec_5i,prec_6i",
start="2001-01-01", increment="3 months")
self.runModule("t.create", type="strds", temporaltype="absolute",
output="precip_f", title="A test float",
description="A test float values")
- self.runModule("t.register", flags="i", type="rast", input="precip_f",
+ self.runModule("t.register", flags="i", type="raster", input="precip_f",
maps="prec_1f,prec_2f,prec_3f,prec_4f,prec_5f,prec_6f",
start="2001-01-01", increment="3 months")
self.runModule("t.create", type="strds", temporaltype="absolute",
output="precip_d", title="A test float",
description="A test float values")
- self.runModule("t.register", flags="i", type="rast", input="precip_d",
+ self.runModule("t.register", flags="i", type="raster", input="precip_d",
maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",
start="2001-01-01", increment="3 months")
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -34,7 +34,7 @@
tgis.open_new_stds(name="A", type="str3ds", temporaltype="absolute",
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="raster_3d", name="A", maps="a1,a2,a3,a4",
start="2001-01-01", increment="1 day", interval=True)
def tearDown(self):
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test_extract.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test_extract.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test_extract.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -41,7 +41,7 @@
self.runModule("t.create", type="str3ds", temporaltype="absolute",
output="A", title="A test", description="A test", overwrite=True)
- self.runModule("t.register", flags="i", type="rast3d", input="A",
+ self.runModule("t.register", flags="i", type="raster_3d", input="A",
maps="a1,a2,a3,a4,a5,a6",
start="2001-01-01", increment="3 months", overwrite=True)
Modified: grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -132,7 +132,12 @@
# Delete every 100 maps
if count%100 == 0:
dbif.execute_transaction(map_statement)
- remove(type="rast", name=name_list, run_=True)
+ if type == "strds":
+ remove(type="raster", name=name_list, run_=True)
+ if type == "stvds":
+ remove(type="vector", name=name_list, run_=True)
+ if type == "str3ds":
+ remove(type="raster_3d", name=name_list, run_=True)
map_statement = ""
name_list = []
@@ -140,11 +145,11 @@
dbif.execute_transaction(map_statement)
if name_list:
if type == "strds":
- remove(type="rast", name=",".join(name_list), run_=True)
+ remove(type="raster", name=name_list, run_=True)
if type == "stvds":
- remove(type="vect", name=",".join(name_list), run_=True)
+ remove(type="vector", name=name_list, run_=True)
if type == "str3ds":
- remove(type="rast3d", name=",".join(name_list), run_=True)
+ remove(type="raster_3d", name=name_list, run_=True)
statement += sp.delete(dbif=dbif, execute=False)
Modified: grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -16,15 +16,15 @@
r.mapcalc expr="prec_5 = rand(0, 300)" -s
r.mapcalc expr="prec_6 = rand(0, 650)" -s
-v.random -z output=pnts1 n=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts2 n=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts1 npoints=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts2 npoints=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts3 n=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts4 n=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts5 n=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts6 n=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts7 n=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts8 n=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts3 npoints=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts4 npoints=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts5 npoints=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts6 npoints=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts7 npoints=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts8 npoints=20 zmin=0 zmax=100 column=height
n1=`g.tempfile pid=1 -d`
n2=`g.tempfile pid=2 -d`
Modified: grass/branches/releasebranch_7_0/temporal/t.select/test.t.select.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.select/test.t.select.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.select/test.t.select.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -13,15 +13,15 @@
do
if [ "$i" -le 20 ]; then
echo testpoint1_$i >> ${n1}
- v.random -z output=testpoint1_$i n=3 seed=$i
+ v.random -z output=testpoint1_$i npoints=3 seed=$i
elif [ "$i" -gt 20 ] && [ "$i" -le 40 ]; then
echo testpoint2_$i >> ${n2}
- v.random -z output=testpoint2_$i n=3 seed=$i
+ v.random -z output=testpoint2_$i npoints=3 seed=$i
else
echo testpoint3_$i >> ${n3}
echo testpoint4_$i >> ${n4}
- v.random -z output=testpoint3_$i n=3 seed=$i
- v.random -z output=testpoint4_$i n=3 seed=$i
+ v.random -z output=testpoint3_$i npoints=3 seed=$i
+ v.random -z output=testpoint4_$i npoints=3 seed=$i
fi
done
Modified: grass/branches/releasebranch_7_0/temporal/t.unregister/testsuite/test_unregister.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.unregister/testsuite/test_unregister.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.unregister/testsuite/test_unregister.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -44,7 +44,7 @@
self.runModule("t.create", type="strds", temporaltype="absolute",
output="A", title="A test",
description="A test", overwrite=True)
- self.runModule("t.register", flags="i", type="rast", input="A",
+ self.runModule("t.register", flags="i", type="raster", input="A",
maps="a1,a2,a3,a4,a5,a6",
start="2001-01-01", increment="3 months",
overwrite=True)
@@ -52,14 +52,14 @@
self.runModule("t.create", type="strds", temporaltype="absolute",
output="B", title="B test",
description="B test", overwrite=True)
- self.runModule("t.register", flags="i", type="rast", input="B",
+ self.runModule("t.register", flags="i", type="raster", input="B",
maps="a1,a2,a3,a4,a5,a6",
start="2001-01-01", increment="3 months",
overwrite=True)
def tearDown(self):
"""Remove generated data"""
- self.runModule("g.remove", type="rast",
+ self.runModule("g.remove", type="raster",
name="a1,a2,a3,a4,a5,a6")
def test_1(self):
@@ -95,7 +95,7 @@
# Check if maps a1, a2 and a3 are still present in the temporal database
- lister = SimpleModule("t.list", type="rast", columns="name",
+ lister = SimpleModule("t.list", type="raster", columns="name",
where='mapset = "%s" AND (name = "a1" OR name = "a2" OR name = "a3")'%(tgis.get_current_mapset()))
self.runModule(lister)
self.assertEqual(a123, lister.outputs.stdout)
@@ -104,7 +104,7 @@
# Unregister maps a1, a2 and a3 from the temporal database
self.assertModule("t.unregister", maps="a1,a2,a3")
- lister = SimpleModule("t.list", type="rast", columns="name",
+ lister = SimpleModule("t.list", type="raster", columns="name",
where='mapset = "%s" AND (name = "a1" OR name = "a2" OR name = "a3")'%(tgis.get_current_mapset()))
self.runModule(lister)
self.assertEqual("", lister.outputs.stdout)
@@ -120,7 +120,7 @@
# Remove STRDS A and B and chceck if maps a4, a5 and a6 are still in the temporal database
self.assertModule("t.remove", type="strds", inputs="A,B")
- lister = SimpleModule("t.list", type="rast", columns="name",
+ lister = SimpleModule("t.list", type="raster", columns="name",
where='mapset = "%s" AND (name = "a4" OR name = "a5" OR name = "a6")'%(tgis.get_current_mapset()))
self.runModule(lister)
self.assertEqual(a456, lister.outputs.stdout)
@@ -129,7 +129,7 @@
# Unregister maps a4, a5 and a6 from the temporal database
self.assertModule("t.unregister", maps="a4,a5,a6")
- lister = SimpleModule("t.list", type="rast", columns="name",
+ lister = SimpleModule("t.list", type="raster", columns="name",
where='mapset = "%s" AND (name = "a4" OR name = "a5" OR name = "a6")'%(tgis.get_current_mapset()))
self.runModule(lister)
self.assertEqual("", lister.outputs.stdout)
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test_vector_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test_vector_algebra.py 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test_vector_algebra.py 2014-12-19 18:21:24 UTC (rev 63617)
@@ -25,18 +25,18 @@
cls.runModule("g.region", n=80.0, s=0.0, e=120.0,
w=0.0, t=1.0, b=0.0, res=10.0)
- cls.runModule("v.random", quiet=True, n=20, seed=1, output='a1')
- cls.runModule("v.random", quiet=True, n=20, seed=1, output='a2')
- cls.runModule("v.random", quiet=True, n=20, seed=1, output='a3')
- cls.runModule("v.random", quiet=True, n=20, seed=1, output='a4')
- cls.runModule("v.random", quiet=True, n=20, seed=2, output='b1')
- cls.runModule("v.random", quiet=True, n=20, seed=2, output='b2')
- cls.runModule("v.random", quiet=True, n=20, seed=3, output='c1')
- cls.runModule("v.random", quiet=True, n=20, seed=4, output='d1')
- cls.runModule("v.random", quiet=True, n=20, seed=4, output='d2')
- cls.runModule("v.random", quiet=True, n=20, seed=4, output='d3')
- cls.runModule("v.random", quiet=True, n=20, seed=5, output='singletmap')
- cls.runModule("v.random", quiet=True, n=20, seed=6, output='singlemap')
+ cls.runModule("v.random", quiet=True, npoints=20, seed=1, output='a1')
+ cls.runModule("v.random", quiet=True, npoints=20, seed=1, output='a2')
+ cls.runModule("v.random", quiet=True, npoints=20, seed=1, output='a3')
+ cls.runModule("v.random", quiet=True, npoints=20, seed=1, output='a4')
+ cls.runModule("v.random", quiet=True, npoints=20, seed=2, output='b1')
+ cls.runModule("v.random", quiet=True, npoints=20, seed=2, output='b2')
+ cls.runModule("v.random", quiet=True, npoints=20, seed=3, output='c1')
+ cls.runModule("v.random", quiet=True, npoints=20, seed=4, output='d1')
+ cls.runModule("v.random", quiet=True, npoints=20, seed=4, output='d2')
+ cls.runModule("v.random", quiet=True, npoints=20, seed=4, output='d3')
+ cls.runModule("v.random", quiet=True, npoints=20, seed=5, output='singletmap')
+ cls.runModule("v.random", quiet=True, npoints=20, seed=6, output='singlemap')
tgis.open_new_stds(name="A", type="stvds", temporaltype="absolute",
title="A", descr="A", semantic="field")
@@ -47,15 +47,15 @@
tgis.open_new_stds(name="D", type="stvds", temporaltype="absolute",
title="D", descr="D", semantic="field")
- tgis.register_maps_in_space_time_dataset(type="vect", name="A", maps="a1,a2,a3,a4",
+ tgis.register_maps_in_space_time_dataset(type="vector", name="A", maps="a1,a2,a3,a4",
start="2001-01-01", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="vect", name="B", maps="b1,b2",
+ tgis.register_maps_in_space_time_dataset(type="vector", name="B", maps="b1,b2",
start="2001-01-01", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="vect", name="C", maps="c1",
+ tgis.register_maps_in_space_time_dataset(type="vector", name="C", maps="c1",
start="2001-01-02", increment="2 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="vect", name="D", maps="d1,d2,d3",
+ tgis.register_maps_in_space_time_dataset(type="vector", name="D", maps="d1,d2,d3",
start="2001-01-03", increment="1 day", interval=True)
- tgis.register_maps_in_space_time_dataset(type="vect", name=None, maps="singletmap",
+ tgis.register_maps_in_space_time_dataset(type="vector", name=None, maps="singletmap",
start="2001-01-03", end="2001-01-04", interval=True)
def tearDown(self):
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.db.select/test.t.vect.db.select.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -37,8 +37,8 @@
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_abs1
t.remove type=stvds input=prec_observer
-t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
+t.unregister type=vector maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
-g.remove -f type=vect name=prec_observer,test_extract
+g.remove -f type=vector name=prec_observer,test_extract
g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
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-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.export/test.t.vect.export.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -19,7 +19,7 @@
EOF
t.create --o type=stvds temporaltype=absolute output=soil_abs1 title="A test" descr="A test"
-t.register -i type=vect input=soil_abs1 file="${n1}" start='2001-01-01' increment="1 months"
+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
@@ -30,7 +30,7 @@
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.unregister type=vect file="${n1}"
+t.unregister type=vector file="${n1}"
t.remove type=stvds input=soil_abs1
rm stvds_export_gml.tar.bz2
rm stvds_export_gml.tar.gz
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.extract/test.t.vect.extract.layer.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.extract/test.t.vect.extract.layer.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.extract/test.t.vect.extract.layer.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -37,11 +37,11 @@
# @postprocess
-t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.unregister type=raster maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_abs1
t.remove type=stvds input=prec_observer,test_extract_1,test_extract_2,test_extract_3
-t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
+t.unregister type=vector maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
-g.remove -f type=vect name=prec_observer
-g.remove -f type=vect pattern=test_*
-g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=vector name=prec_observer
+g.remove -f type=vector pattern=test_*
+g.remove -f type=raster name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.extract/test.t.vect.extract.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.extract/test.t.vect.extract.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.extract/test.t.vect.extract.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -27,7 +27,7 @@
EOF
t.create --o type=stvds temporaltype=absolute output=soil_abs1 title="A test" descr="A test"
-t.register -i type=vect input=soil_abs1 file="${n1}" start='2001-01-01' increment="1 months"
+t.register -i type=vector input=soil_abs1 file="${n1}" start='2001-01-01' increment="1 months"
t.info type=stvds input=soil_abs1
t.vect.list input=soil_abs1
@@ -42,7 +42,7 @@
t.vect.list input=soil_abs3 columns=name,start_time,end_time,primitives
# @postprocess
-t.unregister type=vect maps=soil_1,soil_2,soil_3,soil_4,soil_5,soil_6,soil_7,soil_8
+t.unregister type=vector maps=soil_1,soil_2,soil_3,soil_4,soil_5,soil_6,soil_7,soil_8
t.remove type=stvds input=soil_abs1,soil_abs2,soil_abs3
-g.remove -f type=vect name=soil_1,soil_2,soil_3,soil_4,soil_5,soil_6,soil_7,soil_8
-g.remove -f type=vect name=new_vect_1,new_vect_2,new_vect_3,new_vect_4,new_vect_5,new_vect_6
+g.remove -f type=vector name=soil_1,soil_2,soil_3,soil_4,soil_5,soil_6,soil_7,soil_8
+g.remove -f type=vector name=new_vect_1,new_vect_2,new_vect_3,new_vect_4,new_vect_5,new_vect_6
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-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.import/testsuite/test.t.vect.import.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -21,7 +21,7 @@
EOF
t.create --o type=stvds temporaltype=absolute output=soil_abs1 title="A test" descr="A test"
-t.register -i type=vect input=soil_abs1 file="${n1}" start='2001-01-01' increment="1 months"
+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
@@ -59,8 +59,8 @@
# Cleaning up
rm -rf test
-g.remove -f type=vect name=soil_1,soil_2,soil_3
-t.unregister type=vect file="${n1}"
+g.remove -f type=vector name=soil_1,soil_2,soil_3
+t.unregister type=vector file="${n1}"
t.remove type=stvds input=soil_abs1,soil_abs2
rm stvds_export_gml.tar.bz2
rm stvds_export_gml.tar.gz
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -87,38 +87,38 @@
t.create type=stvds temporaltype=absolute output=soils_abs5 title="A test with input files" descr="A test with input files"
# The first @test
-t.register type=vect input=soils_abs1 file="${n1}" start="2001-01-01" increment="1 months"
+t.register type=vector input=soils_abs1 file="${n1}" start="2001-01-01" increment="1 months"
t.vect.list separator=" | " method=comma input=soils_abs1
t.vect.list input=soils_abs1
t.vect.list separator=" | " method=cols input=soils_abs1
t.vect.list separator=" | " method=delta input=soils_abs1
t.vect.list separator=" | " method=deltagaps input=soils_abs1
-t.register type=vect -i input=soils_abs2 file="${n2}"
+t.register type=vector -i input=soils_abs2 file="${n2}"
t.vect.list separator=" | " method=comma input=soils_abs2
t.vect.list input=soils_abs2
t.vect.list separator=" | " method=cols input=soils_abs2
t.vect.list separator=" | " method=delta input=soils_abs2
t.vect.list separator=" | " method=deltagaps input=soils_abs2
-t.register type=vect -i input=soils_abs3 file="${n3}"
+t.register type=vector -i input=soils_abs3 file="${n3}"
t.vect.list separator=" | " method=comma input=soils_abs3
t.vect.list separator=" | " method=delta input=soils_abs3
t.vect.list separator=" | " method=deltagaps input=soils_abs3
-t.register type=vect -i input=soils_abs4 file="${n4}"
+t.register type=vector -i input=soils_abs4 file="${n4}"
t.vect.list separator=" | " method=comma input=soils_abs4
t.vect.list separator=" | " method=delta input=soils_abs4
t.vect.list separator=" | " method=deltagaps input=soils_abs4
-t.register type=vect -i input=soils_abs5 file="${n5}"
+t.register type=vector -i input=soils_abs5 file="${n5}"
t.vect.list separator=" | " method=comma input=soils_abs5
t.vect.list input=soils_abs5
t.vect.list separator=" | " method=cols input=soils_abs5
t.vect.list separator=" | " method=delta input=soils_abs5
t.vect.list separator=" | " method=deltagaps input=soils_abs5
-t.unregister type=vect maps=soils:1,soils:2,soils:3,soils:4,soils:5,soils:6
+t.unregister type=vector maps=soils:1,soils:2,soils:3,soils:4,soils:5,soils:6
t.remove type=stvds input=soils_abs1,soils_abs2,soils_abs3,soils_abs4,soils_abs5
-g.remove -f type=vect name=soil_orig,soils
+g.remove -f type=vector name=soil_orig,soils
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -73,37 +73,37 @@
t.create type=stvds temporaltype=absolute output=lidar_abs5 title="A test with input files" descr="A test with input files"
# The first @test
-t.register type=vect input=lidar_abs1 file="${n1}" start="2001-01-01" increment="1 months"
+t.register type=vector input=lidar_abs1 file="${n1}" start="2001-01-01" increment="1 months"
t.vect.list separator=" | " method=comma input=lidar_abs1
t.vect.list input=lidar_abs1
t.vect.list separator=" | " method=cols input=lidar_abs1
t.vect.list separator=" | " method=delta input=lidar_abs1
t.vect.list separator=" | " method=deltagaps input=lidar_abs1
-t.register type=vect -i input=lidar_abs2 file="${n2}"
+t.register type=vector -i input=lidar_abs2 file="${n2}"
t.vect.list separator=" | " method=comma input=lidar_abs2
t.vect.list input=lidar_abs2
t.vect.list separator=" | " method=cols input=lidar_abs2
t.vect.list separator=" | " method=delta input=lidar_abs2
t.vect.list separator=" | " method=deltagaps input=lidar_abs2
-t.register type=vect -i input=lidar_abs3 file="${n3}"
+t.register type=vector -i input=lidar_abs3 file="${n3}"
t.vect.list separator=" | " method=comma input=lidar_abs3
t.vect.list separator=" | " method=delta input=lidar_abs3
t.vect.list separator=" | " method=deltagaps input=lidar_abs3
-t.register type=vect -i input=lidar_abs4 file="${n4}"
+t.register type=vector -i input=lidar_abs4 file="${n4}"
t.vect.list separator=" | " method=comma input=lidar_abs4
t.vect.list separator=" | " method=delta input=lidar_abs4
t.vect.list separator=" | " method=deltagaps input=lidar_abs4
-t.register type=vect -i input=lidar_abs5 file="${n5}"
+t.register type=vector -i input=lidar_abs5 file="${n5}"
t.vect.list separator=" | " method=comma input=lidar_abs5
t.vect.list input=lidar_abs5
t.vect.list separator=" | " method=cols input=lidar_abs5
t.vect.list separator=" | " method=delta input=lidar_abs5
t.vect.list separator=" | " method=deltagaps input=lidar_abs5
-#t.unregister type=vect maps=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
+#t.unregister type=vector maps=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
#t.remove type=stvds input=lidar_abs1,lidar_abs2,lidar_abs3,lidar_abs4,lidar_abs5
-#g.remove -f type=vect name=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
+#g.remove -f type=vector name=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -32,9 +32,9 @@
t.vect.db.select input=prec_observer
# @postprocess
-t.unregister type=rast file=${MAP_LIST}
+t.unregister type=raster file=${MAP_LIST}
t.remove type=strds input=precip_abs1
t.remove type=stvds input=prec_observer
-#g.remove -f type=vect name=prec_observer
-#g.remove -f type=rast pattern="test_prec_*"
+#g.remove -f type=vector name=prec_observer
+#g.remove -f type=raster pattern="test_prec_*"
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -26,10 +26,10 @@
t.vect.db.select input=prec_observer
# @postprocess
-t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.unregister type=raster maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_abs1
t.remove type=stvds input=prec_observer
-t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
+t.unregister type=vector maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
-#g.remove -f type=vect name=prec_observer,test_extract
-#g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+#g.remove -f type=vector name=prec_observer,test_extract
+#g.remove -f type=raster name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -19,7 +19,7 @@
r.mapcalc expr="prec_9 = 600.0"
-v.random output=prec n=5 seed=1
+v.random output=prec npoints=5 seed=1
v.random -z output=test_1 column=test n=5 seed=1
t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -41,15 +41,15 @@
EOF
t.create --o type=stvds temporaltype=absolute output=soil_abs title="A test" descr="A test"
-t.register -i type=vect input=soil_abs file="${n1}" start="2001-03-01 00:00:00" increment="1 months"
+t.register -i type=vector input=soil_abs file="${n1}" start="2001-03-01 00:00:00" increment="1 months"
t.vect.list input=soil_abs columns=name,layer,start_time,end_time
t.create --o type=strds temporaltype=absolute output=sand_frac_abs_1 title="A test" descr="A test"
-t.register -i type=rast input=sand_frac_abs_1 maps=sand_frac start="2001-01-01 00:00:00" increment="12 months"
+t.register -i type=raster input=sand_frac_abs_1 maps=sand_frac start="2001-01-01 00:00:00" increment="12 months"
t.rast.list input=sand_frac_abs_1 columns=name,start_time,end_time
t.create --o type=strds temporaltype=absolute output=sand_frac_abs_2 title="A test" descr="A test"
-t.register -i type=rast input=sand_frac_abs_2 maps=sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6 \
+t.register -i type=raster input=sand_frac_abs_2 maps=sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6 \
start="2001-03-01 00:00:00" increment="1 months"
t.rast.list input=sand_frac_abs_2 columns=name,start_time,end_time
@@ -71,11 +71,11 @@
v.db.select map=soils layer=6
# @postprocess
-t.unregister type=vect maps=soils:1,soils:2,soils:3,soils:4,soils:5,soils:6
+t.unregister type=vector maps=soils:1,soils:2,soils:3,soils:4,soils:5,soils:6
t.remove type=stvds input=soil_abs
-t.unregister type=rast maps=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6
+t.unregister type=raster maps=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6
t.remove type=strds input=sand_frac_abs_1,sand_frac_abs_2
-g.remove -f type=rast name=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6
-g.remove -f type=vect name=soils,soil_orig
+g.remove -f type=raster name=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6
+g.remove -f type=vector name=soils,soil_orig
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/test.t.vect.what.strds.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/test.t.vect.what.strds.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/test.t.vect.what.strds.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -25,10 +25,10 @@
EOF
t.create --o type=stvds temporaltype=absolute output=soil_abs1 title="A test" descr="A test"
-t.register type=vect input=soil_abs1 file="${n1}"
+t.register type=vector input=soil_abs1 file="${n1}"
t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-03-01 00:00:00" increment="1 months"
+t.register -i type=raster input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-03-01 00:00:00" increment="1 months"
# The @test
@@ -48,11 +48,11 @@
v.db.select map=soil_3
# @postprocess
-t.unregister type=vect maps=soil_1,soil_2,soil_3
+t.unregister type=vector maps=soil_1,soil_2,soil_3
t.remove type=stvds input=soil_abs1
-t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.unregister type=raster maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_abs1
-g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove -f type=vect name=soil_1,soil_2,soil_3
+g.remove -f type=raster name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=vector name=soil_1,soil_2,soil_3
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh 2014-12-19 18:21:24 UTC (rev 63617)
@@ -12,9 +12,9 @@
r.mapcalc --o expr="prec_5 = 500.0"
r.mapcalc --o expr="prec_6 = 600.0"
-v.random --o -z output=soil_1 n=5 zmin=0 zmax=100 column=heigh seed=1
-v.random --o -z output=soil_2 n=5 zmin=0 zmax=100 column=height seed=2
-v.random --o -z output=soil_3 n=5 zmin=0 zmax=100 column=height seed=3
+v.random --o -z output=soil_1 npoints=5 zmin=0 zmax=100 column=heigh seed=1
+v.random --o -z output=soil_2 npoints=5 zmin=0 zmax=100 column=height seed=2
+v.random --o -z output=soil_3 npoints=5 zmin=0 zmax=100 column=height seed=3
n1=`g.tempfile pid=1 -d`
@@ -25,11 +25,11 @@
EOF
t.create --o type=stvds temporaltype=relative output=soil_rel1 title="A test" descr="A test"
-t.register type=vect input=soil_rel1 file="${n1}" unit=minutes
+t.register type=vector input=soil_rel1 file="${n1}" unit=minutes
t.info type=stvds input=soil_rel1
t.create --o type=strds temporaltype=relative output=precip_rel1 title="A test" descr="A test"
-t.register type=rast input=precip_rel1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start=0 increment=5 unit=minutes
+t.register type=raster input=precip_rel1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start=0 increment=5 unit=minutes
# The @test
@@ -49,11 +49,11 @@
v.db.select map=soil_3
# @postprocess
-t.unregister type=vect maps=soil_1,soil_2,soil_3
+t.unregister type=vector maps=soil_1,soil_2,soil_3
t.remove type=stvds input=soil_rel1
-t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.unregister type=raster maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_rel1
-g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove -f type=vect name=soil_1,soil_2,soil_3
+g.remove -f type=raster name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=vector name=soil_1,soil_2,soil_3
Modified: grass/branches/releasebranch_7_0/vector/v.what.rast3/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.what.rast3/main.c 2014-12-19 18:16:45 UTC (rev 63616)
+++ grass/branches/releasebranch_7_0/vector/v.what.rast3/main.c 2014-12-19 18:21:24 UTC (rev 63617)
@@ -77,7 +77,7 @@
opt.field = G_define_standard_option(G_OPT_V_FIELD);
opt.rast3d = G_define_standard_option(G_OPT_R3_MAP);
- opt.rast3d->key = "raster3d";
+ opt.rast3d->key = "raster_3d";
opt.rast3d->description = _("Name of existing 3D raster map to be queried");
opt.col = G_define_standard_option(G_OPT_DB_COLUMN);
More information about the grass-commit
mailing list