wxGUI: update to the new element names

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

gui/wxpython/animation/dialogs.py

@@ -1278,9 +1278,9 @@ class AddTemporalLayerDialog(wx.Dialog):
         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")),
+                 ('3draster', _("Multiple 3D raster maps")),
                  ('strds', _("Space time raster dataset")),
                  ('stvds', _("Space time vector dataset")),
                  ('str3ds', _("Space time 3D raster dataset"))]
@@ -1308,7 +1308,7 @@ class AddTemporalLayerDialog(wx.Dialog):
         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 @@ class AddTemporalLayerDialog(wx.Dialog):
 
     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 ('3draster', 'str3ds'):
             cmd.append('d.rast3d')
         if self._name:
-            if self._mapType in ('rast', 'vect', 'rast3d'):
+            if self._mapType in ('raster', 'vector', '3draster'):
                 cmd.append('map={name}'.format(name=self._name.split(',')[0]))
             else:
                 try:
@@ -1401,9 +1401,9 @@ class AddTemporalLayerDialog(wx.Dialog):
         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

gui/wxpython/animation/g.gui.animation.py

@@ -66,8 +66,8 @@ from animation.data import AnimLayer
 
 
 def main():
-    rast = options['rast']
-    vect = options['vect']
+    rast = options['raster']
+    vect = options['vector']
     strds = options['strds']
     stvds = options['stvds']
 
@@ -96,13 +96,13 @@ def main():
     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)

gui/wxpython/animation/provider.py

@@ -757,7 +757,7 @@ def test():
     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']

gui/wxpython/animation/temporal_manager.py

@@ -410,7 +410,7 @@ def createAbsoluteInterval():
     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 @@ def createRelativeInterval():
     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)):

gui/wxpython/core/layerlist.py

@@ -173,7 +173,7 @@ class Layer(object):
         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 @@ class Layer(object):
         self._hidden = False
         self._initialized = False
 
-        self._mapTypes = ['rast', 'vect', 'rast3d', 'rgb']
-        self._internalTypes = {'rast': 'cell',
-                               'vect': 'vector',
-                               'rast3d': 'grid3',
+        self._mapTypes = ['raster', 'vector', '3draster', 'rgb']
+        self._internalTypes = {'raster': 'cell',
+                               'vector': 'vector',
+                               '3draster': 'grid3',
                                'rgb': 'rgb'}
 
     def GetName(self):
@@ -246,7 +246,7 @@ class Layer(object):
     def SetMapType(self, mapType):
         """Sets map type of the layer.
 
-        :param mapType: can be 'rast', 'vect', 'rast3'
+        :param mapType: can be 'raster', 'vector', 'rast3'
         """
         if mapType not in self._mapTypes:
             raise ValueError("Wrong map type used: {mtype}".format(mtype=mapType))
@@ -358,11 +358,11 @@ class LayerListToRendererConverter:
     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 == '3draster':
             mapType = '3d-raster'
         elif layer.mapType == 'rgb':
             mapType = 'rgb'

gui/wxpython/core/render.py

@@ -644,13 +644,13 @@ class Map(object):
             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['3draster'] = rast3d
 
         ret, reg, msg = RunCommand('g.region',
                                    read = True,

gui/wxpython/core/workspace.py

@@ -1423,7 +1423,7 @@ class ProcessGrcFile(object):
                     "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',

gui/wxpython/gis_set.py

@@ -540,9 +540,9 @@ class GRASSStartup(wx.Frame):
                        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):

gui/wxpython/gmodeler/dialogs.py

@@ -115,9 +115,9 @@ class ModelDataDialog(SimpleDialog):
         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()

gui/wxpython/gmodeler/model.py

@@ -729,7 +729,7 @@ class Model(object):
                 rast.append(name)
             elif prompt == 'vector':
                 vect.append(name)
-            elif prompt == 'rast3d':
+            elif prompt == '3draster':
                 rast3d.append(name)
         
         msg = ''
@@ -2338,17 +2338,17 @@ def cleanup():
 """)
         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='3draster',
                       name=%s)
 """% ','.join(map(lambda x: "'" + x + "'", rast3d)))
         if not rast and not vect and not rast3d:

gui/wxpython/gui_core/dialogs.py

@@ -405,7 +405,7 @@ def CreateNewVector(parent, cmd, title = _('Create new vector map'),
         
     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 @@ class MapLayersDialogBase(wx.Dialog):
         
         sel = self.layerType.GetSelection()
         if sel == 0:
-            ltype = 'rast'
+            ltype = 'raster'
         elif sel == 1:
-            ltype = 'rast3d'
+            ltype = '3draster'
         else:
-            ltype = 'vect'
+            ltype = 'vector'
         
         return ltype
 

gui/wxpython/gui_core/forms.py

@@ -206,7 +206,7 @@ class UpdateThread(Thread):
                 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', '3draster': 'str3ds'}
                         self.data[win.GetParent().SetType] = {'etype': element_dict[type_param.get('value')]}
 
             map = layer = None
@@ -1195,7 +1195,7 @@ class CmdPanel(wx.Panel):
                                 # 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', '3draster': 'str3ds'}
                                     elem = element_dict[type_param.get('default')]
                         
                         if self._giface and hasattr(self._giface, "_model"):

gui/wxpython/gui_core/gselect.py

@@ -428,25 +428,23 @@ class TreeCtrlComboPopup(ListCtrlComboPopup):
         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':'3draster',
+                       '3draster':'3draster',
+                       '3d-raster':'3draster',
+                       'raster3D':'3draster',
+                       'raster3D files':'3draster',
+                       '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',

gui/wxpython/gui_core/prompt.py

@@ -93,8 +93,8 @@ class GPrompt(object):
     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
     

gui/wxpython/gui_core/simplelmgr.py

@@ -341,21 +341,21 @@ class SimpleLayerManager(wx.Panel):
 
     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='3draster',
                                             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

gui/wxpython/iclass/frame.py

@@ -256,7 +256,7 @@ class IClassMapFrame(DoubleMapFrame):
         ret = RunCommand(prog = 'g.remove',
                          parent = self,
                          flags = 'f',
-                         type = 'vect',
+                         type = 'vector',
                          name = self.trainingAreaVector)
         if ret != 0:
             return False
@@ -269,7 +269,7 @@ class IClassMapFrame(DoubleMapFrame):
         ret = RunCommand(prog = 'g.remove',
                          parent = self,
                          flags = 'f',
-                         type = 'rast',
+                         type = 'raster',
                          name = raster)
         if ret != 0:
             return False

gui/wxpython/iscatt/iscatt_core.py

@@ -284,7 +284,7 @@ class CatRastUpdater:
             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 @@ class ScattPlotsData(ScattPlotsCondsData):
         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 @@ class ScattPlotsData(ScattPlotsCondsData):
             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 = {}

gui/wxpython/lmgr/datacatalog.py

@@ -351,9 +351,9 @@ class DataCatalogTree(LocationMapTree):
             renamed = 0
             label = _("Renaming") + " " + string + " ..."
             self.showNotification.emit(message=label)
-            if (self.GetItemText(self.selected_type)=='vect'):
+            if (self.GetItemText(self.selected_type)=='vector'):
                 renamed = RunCommand('g.rename', vect=string)
-            elif (self.GetItemText(self.selected_type)=='rast'):
+            elif (self.GetItemText(self.selected_type)=='raster'):
                 renamed = RunCommand('g.rename', rast=string)
             else:
                 renamed = RunCommand('g.rename', rast3d=string)
@@ -387,15 +387,15 @@ class DataCatalogTree(LocationMapTree):
             type = None
             label = _("Copying") + " " + string + " ..."
             self.showNotification.emit(message=label)
-            if (self.GetItemText(self.copy_type)=='vect'):
+            if (self.GetItemText(self.copy_type)=='vector'):
                 pasted = RunCommand('g.copy', vect=string)
-                node = 'vect'     
-            elif (self.GetItemText(self.copy_type)=='rast'):
+                node = 'vector'     
+            elif (self.GetItemText(self.copy_type)=='raster'):
                 pasted = RunCommand('g.copy', rast=string)
-                node = 'rast'
+                node = 'raster'
             else:
                 pasted = RunCommand('g.copy', rast3d=string)
-                node = 'rast3d'
+                node = '3draster'
             if pasted == 0:
                 if self.selected_type == None:
                     self.selected_type = self.getItemByName(node, self.selected_mapset)
@@ -429,14 +429,14 @@ class DataCatalogTree(LocationMapTree):
                                     title=_('Delete map')) == wx.ID_YES):
                 label = _("Deleting") + " " + string + " ..."
                 self.showNotification.emit(message=label)
-                if (self.GetItemText(self.selected_type)=='vect'):
-                    removed = RunCommand('g.remove', flags='f', type='vect',
+                if (self.GetItemText(self.selected_type)=='vector'):
+                    removed = RunCommand('g.remove', flags='f', type='vector',
                                          name=string)
-                elif (self.GetItemText(self.selected_type)=='rast'):
-                    removed = RunCommand('g.remove', flags='f', type='rast',
+                elif (self.GetItemText(self.selected_type)=='raster'):
+                    removed = RunCommand('g.remove', flags='f', type='raster',
                                          name=string)
                 else:
-                    removed = RunCommand('g.remove', flags='f', type='rast3d',
+                    removed = RunCommand('g.remove', flags='f', type='3draster',
                                          name=string)
                 if (removed==0):
                     self.Delete(self.selected_layer)
@@ -454,12 +454,12 @@ class DataCatalogTree(LocationMapTree):
             label = _("Displaying") + " " + string + " ..."
             self.showNotification.emit(message=label)
             label = "d."+self.GetItemText(self.selected_type)+" --q map="+string+"    -- completed. Go to Map layers for further operations."
-            if (self.GetItemText(self.selected_type)=='vect'):
-                self.parent.parent.AddMaps(layerName, 'vect', True)
-            elif (self.GetItemText(self.selected_type)=='rast'):
-                self.parent.parent.AddMaps(layerName, 'rast', True)     
+            if (self.GetItemText(self.selected_type)=='vector'):
+                self.parent.parent.AddMaps(layerName, 'vector', True)
+            elif (self.GetItemText(self.selected_type)=='raster'):
+                self.parent.parent.AddMaps(layerName, 'raster', True)     
             else:
-                self.parent.parent.AddMaps(layerName, 'rast3d', True)
+                self.parent.parent.AddMaps(layerName, '3draster', True)
                 label = "d.rast --q map="+string+"    -- completed. Go to 'Map layers' for further operations." # generate this message (command) automatically?
             self.showNotification.emit(message=label)
             Debug.msg(1,"LAYER "+self.GetItemText(self.selected_layer)+" DISPLAYED")

gui/wxpython/lmgr/frame.py

@@ -1591,7 +1591,7 @@ class GMFrame(wx.Frame):
                 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)
@@ -1840,7 +1840,7 @@ class GMFrame(wx.Frame):
         """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', '3draster', 'vector')
         :param bool check: True if new layers should be checked in
                            layer tree False otherwise
         """
@@ -1851,13 +1851,13 @@ class GMFrame(wx.Frame):
         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 == '3draster':
                 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:
@@ -1899,9 +1899,9 @@ class GMFrame(wx.Frame):
         # 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': '3draster',
+                       'vector': 'vector'}
         try:
             grassType = convertType[ltype]
         except KeyError:

gui/wxpython/lmgr/layertree.py

@@ -795,13 +795,13 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
         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 = '3draster'
             label = _('3D raster map')
         else:
             GError(_("Unsupported map type <%s>") % ltype, parent = self)

gui/wxpython/mapdisp/frame.py

@@ -691,7 +691,7 @@ class MapFrame(SingleMapFrame):
                                           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 @@ class MapFrame(SingleMapFrame):
         """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 @@ class MapFrame(SingleMapFrame):
                         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'):

gui/wxpython/mapwin/decorations.py

@@ -234,9 +234,9 @@ class LegendController(OverlayController):
         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] == '3draster' and len(param) == 2:
                 inputs += 1
             if inputs == 1:
                 return True

gui/wxpython/modules/mcalc_builder.py

@@ -110,7 +110,7 @@ class MapCalcFrame(wx.Frame):
         if self.rast3d:
             self.funct_dict['z()'] = 'z()'
             self.funct_dict['tbres()'] = 'tbres()'
-            element = 'rast3d'
+            element = '3draster'
         else:
             element = 'cell'
 
@@ -601,9 +601,9 @@ class MapCalcFrame(wx.Frame):
         if returncode != 0:
             return
         name = self.newmaptxt.GetValue().strip(' "') + '@' + grass.gisenv()['MAPSET']
-        ltype = 'rast'
+        ltype = 'raster'
         if self.rast3d:
-            ltype = 'rast3d'
+            ltype = '3draster'
         self._giface.mapCreated.emit(name=name, ltype=ltype, add=self.addbox.IsChecked())
 
     def OnSaveExpression(self, event):

gui/wxpython/psmap/dialogs.py

@@ -2501,7 +2501,7 @@ class LegendDialog(PsmapDialog):
         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 @@ class LegendDialog(PsmapDialog):
             
         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:

gui/wxpython/psmap/instructions.py

@@ -443,14 +443,14 @@ class Instruction:
             
             # 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']

gui/wxpython/rdigit/controller.py

@@ -304,7 +304,7 @@ class RDigitController(wx.EvtHandler):
         :param restore: if restore previous cursor, mouse['use']
         """
         try:
-            gcore.run_command('g.remove', type='rast', flags='f', name=self._backupRasterName, quiet=True)
+            gcore.run_command('g.remove', type='raster', flags='f', name=self._backupRasterName, quiet=True)
         except CalledModuleError:
             pass
 
@@ -465,7 +465,7 @@ class RDigitController(wx.EvtHandler):
 
         gcore.run_command('r.patch', input=rastersToPatch[::-1] + [self._backupRasterName],
                           output=self._editedRaster, overwrite=True, quiet=True)
-        gcore.run_command('g.remove', type='rast', flags='f', name=rastersToPatch + [tempRaster],
+        gcore.run_command('g.remove', type='raster', flags='f', name=rastersToPatch + [tempRaster],
                           quiet=True)
         try:
             # setting the right color table

gui/wxpython/rdigit/dialogs.py

@@ -35,8 +35,8 @@ class NewRasterDialog(wx.Dialog):
         self._type = None
 
         # create widgets
-        self._mapSelect = Select(parent=self, type='rast')
-        self._backgroundSelect = Select(parent=self, type='rast')
+        self._mapSelect = Select(parent=self, type='raster')
+        self._backgroundSelect = Select(parent=self, type='raster')
         self._typeChoice = wx.Choice(self, choices=['CELL', 'FCELL', 'DCELL'])
         self._typeChoice.SetSelection(0)
         self._mapSelect.SetFocus()

gui/wxpython/rlisetup/functions.py

@@ -27,7 +27,7 @@ class SamplingType:
     WHOLE = 'whole'
     REGIONS = 'regions'
     UNITS = 'units'
-    VECT = 'vect'
+    VECT = 'vector'
     MVWIN = 'moving'
 
     KMVWINC = 'kmvwin_circle'
@@ -67,7 +67,7 @@ def retRLiPath():
         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']
@@ -90,7 +90,7 @@ def convertFeature(vect, outrast, cat, origrast, layer='1', overwrite=False):
     grass.run_command('v.to.rast', input=tmp_vect, type='area',
                       layer=layer, use='val', value=cat, output=outrast,
                       overwrite=overwrite, quiet=True)
-    grass.run_command('g.remove', flags='f', type='vect',
+    grass.run_command('g.remove', flags='f', type='vector',
                       name=tmp_vect, quiet=True)
 
 
@@ -133,7 +133,7 @@ def sampleAreaVector(vect, rast, vect_cats, layer='1', overwrite=False,
         rast_name = "{pref}{cat}".format(pref=outpref, cat=cat)
         # check if raster already axist
 
-        if len(grass.list_strings('rast', pattern=rast_name, mapset='.')) == 1 \
+        if len(grass.list_strings('raster', pattern=rast_name, mapset='.')) == 1 \
            and not overwrite:
             GError(message=_("The raster map <%s> already exists."
                              " Please remove or rename the maps "

gui/wxpython/rlisetup/sampling_frame.py

@@ -263,8 +263,8 @@ class RLiSetupMapPanel(wx.Panel):
 
         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

gui/wxpython/rlisetup/wizard.py

@@ -1573,7 +1573,7 @@ class VectorAreasPage(TitledPage):
         self.outname = "{pref}{cat}".format(pref=self.outpref, cat=cat)
         # check if raster already axist
 
-        if len(grass.list_strings('rast', pattern=self.outname, mapset='.')) == 1 \
+        if len(grass.list_strings('raster', pattern=self.outname, mapset='.')) == 1 \
            and not self.parent.samplingareapage.overwriteTemp:
             GError(parent=self, message=_("The raster map <%s> already exists."
                                           " Please remove or rename the maps "

gui/wxpython/vnet/vnet_core.py

@@ -121,7 +121,7 @@ class VNETManager:
 
         # 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 

gui/wxpython/vnet/vnet_data.py

@@ -611,8 +611,8 @@ class VNETAnalysisParameters:
         # 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 @@ class VNETTmpVectMaps:
         """
         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 @@ class VNETTmpVectMaps:
         """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

gui/wxpython/web_services/dialogs.py

@@ -792,7 +792,7 @@ class SaveWMSLayerDialog(wx.Dialog):
 
         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,