Ver código fonte

remove old_vector from element list

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63930 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 anos atrás
pai
commit
4fd9a5216f

+ 4 - 7
include/gis.h

@@ -360,13 +360,10 @@ enum
     G_ELEMENT_RASTER = 1,	/*!< raster */
     G_ELEMENT_RASTER3D = 2,	/*!< 3d raster */
     G_ELEMENT_VECTOR = 3,	/*!< vector */
-    G_ELEMENT_OLDVECTOR = 4,	/*!< GRASS < 5.7 vector */
-    G_ELEMENT_ASCIIVECTOR = 5,	/*!< ASCII vector */
-    G_ELEMENT_ICON = 6,		/*!< icon */
-    G_ELEMENT_LABEL = 7,	/*!< labels */
-    G_ELEMENT_SITE = 8,		/*!< sites */
-    G_ELEMENT_REGION = 9,	/*!< region */
-    G_ELEMENT_GROUP = 10,	/*!< group */
+    G_ELEMENT_ASCIIVECTOR = 4,	/*!< ASCII vector */
+    G_ELEMENT_LABEL = 5,	/*!< labels */
+    G_ELEMENT_REGION = 6,	/*!< region */
+    G_ELEMENT_GROUP = 7,	/*!< group */
 };
 
 /*=========================== Typedefs/Structures ==========================*/

+ 0 - 6
lib/manage/element_list

@@ -16,12 +16,6 @@ cell:raster:raster:raster map(s)
   g3dcell:g3dcell
 grid3:raster_3d:3D raster:3D raster map(s)
 vector:vector:vector:vector map(s)
-dig:old_vector: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:ascii_vector:ascii vector:ASCII vector map(s)
 paint/labels:labels:label:paint label file(s)
 windows:region:region definition:region definition(s)

+ 0 - 1
lib/manage/option.c

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

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

@@ -18,7 +18,6 @@ from grass.pygrass.errors import GrassError
 ETYPE = {'raster': libgis.G_ELEMENT_RASTER,
          'raster_3d': libgis.G_ELEMENT_RASTER3D,
          'vector': libgis.G_ELEMENT_VECTOR,
-         'old_vector': libgis.G_ELEMENT_OLDVECTOR,
          'ascii_vector': libgis.G_ELEMENT_ASCIIVECTOR,
          'icon': libgis.G_ELEMENT_ICON,
          'labels': libgis.G_ELEMENT_LABEL,
@@ -309,13 +308,10 @@ class Mapset(object):
 
             * 'ascii_vector',
             * 'group',
-            * 'icon',
             * 'labels',
-            * 'old_vector',
             * 'raster',
             * 'raster_3d',
             * 'region',
-            * 'sites',
             * 'vector',
 
         :param type: the type of element to query