Browse Source

remove ascii_vector from element_list https://trac.osgeo.org/grass/ticket/2440
(merge r64004:64005 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@64104 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 10 years ago
parent
commit
dfe6030e0a

+ 0 - 2
general/g.rename/g.rename.html

@@ -23,8 +23,6 @@ choose for possible renaming:
        raster   raster map(s) to be renamed
        raster   raster map(s) to be renamed
     raster_3d   3D raster map(s) to be renamed
     raster_3d   3D raster map(s) to be renamed
        vector   vector map(s) to be renamed
        vector   vector map(s) to be renamed
-   old_vector   old  (GRASS 5.0) vector map(s) to be renamed
- ascii_vector   ASCII vector map(s) to be renamed
        labels   paint label file(s) to be renamed
        labels   paint label file(s) to be renamed
        region   region definition(s) to be renamed
        region   region definition(s) to be renamed
         group   imagery group(s) to be renamed
         group   imagery group(s) to be renamed

+ 0 - 1
lib/manage/element_list

@@ -16,7 +16,6 @@ cell:raster:raster:raster map(s)
   g3dcell:g3dcell
   g3dcell:g3dcell
 grid3:raster_3d:3D raster:3D raster map(s)
 grid3:raster_3d:3D raster:3D raster map(s)
 vector:vector:vector:vector map(s)
 vector:vector:vector:vector map(s)
-dig_ascii:ascii_vector:ascii vector:ASCII vector map(s)
 paint/labels:label:label:paint label file(s)
 paint/labels:label:label:paint label file(s)
 windows:region:region definition:region definition(s)
 windows:region:region definition:region definition(s)
 group:group:imagery group:imagery group(s)
 group:group:imagery group:imagery group(s)

+ 1 - 2
lib/manage/option.c

@@ -49,8 +49,7 @@ struct Option* M_define_option(int n, const char *desc, int multiple)
     p->description = str;
     p->description = str;
     if (strcmp(p->key, "raster") == 0 || strcmp(p->key, "raster_3d") == 0)
     if (strcmp(p->key, "raster") == 0 || strcmp(p->key, "raster_3d") == 0)
 	p->guisection = _("Raster");
 	p->guisection = _("Raster");
-    else if (strcmp(p->key, "vector") == 0 ||
-	     strcmp(p->key, "ascii_vector") == 0)
+    else if (strcmp(p->key, "vector") == 0)
 	p->guisection = _("Vector");
 	p->guisection = _("Vector");
     else if (strcmp(p->key, "region") == 0)
     else if (strcmp(p->key, "region") == 0)
 	p->guisection = _("Region");
 	p->guisection = _("Region");

+ 0 - 2
lib/python/pygrass/gis/__init__.py

@@ -18,7 +18,6 @@ from grass.pygrass.errors import GrassError
 ETYPE = {'raster': libgis.G_ELEMENT_RASTER,
 ETYPE = {'raster': libgis.G_ELEMENT_RASTER,
          'raster_3d': libgis.G_ELEMENT_RASTER3D,
          'raster_3d': libgis.G_ELEMENT_RASTER3D,
          'vector': libgis.G_ELEMENT_VECTOR,
          'vector': libgis.G_ELEMENT_VECTOR,
-         'ascii_vector': libgis.G_ELEMENT_ASCIIVECTOR,
          'label': libgis.G_ELEMENT_LABEL,
          'label': libgis.G_ELEMENT_LABEL,
          'region': libgis.G_ELEMENT_REGION,
          'region': libgis.G_ELEMENT_REGION,
          'group': libgis.G_ELEMENT_GROUP}
          'group': libgis.G_ELEMENT_GROUP}
@@ -304,7 +303,6 @@ class Mapset(object):
     def glist(self, type, pattern=None):
     def glist(self, type, pattern=None):
         """Return a list of grass types like:
         """Return a list of grass types like:
 
 
-            * 'ascii_vector',
             * 'group',
             * 'group',
             * 'label',
             * 'label',
             * 'raster',
             * 'raster',