[GRASS-SVN] r63930 - in grass/trunk: include lib/manage lib/python/pygrass/gis

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-01-02 03:22:21 -0800 (Fri, 02 Jan 2015)
New Revision: 63930

Modified:
   grass/trunk/include/gis.h
   grass/trunk/lib/manage/element_list
   grass/trunk/lib/manage/option.c
   grass/trunk/lib/python/pygrass/gis/__init__.py
Log:
remove old_vector from element list


Modified: grass/trunk/include/gis.h
===================================================================
--- grass/trunk/include/gis.h	2015-01-02 08:37:51 UTC (rev 63929)
+++ grass/trunk/include/gis.h	2015-01-02 11:22:21 UTC (rev 63930)
@@ -360,13 +360,10 @@
     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 ==========================*/

Modified: grass/trunk/lib/manage/element_list
===================================================================
--- grass/trunk/lib/manage/element_list	2015-01-02 08:37:51 UTC (rev 63929)
+++ grass/trunk/lib/manage/element_list	2015-01-02 11:22:21 UTC (rev 63930)
@@ -16,12 +16,6 @@
   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)

Modified: grass/trunk/lib/manage/option.c
===================================================================
--- grass/trunk/lib/manage/option.c	2015-01-02 08:37:51 UTC (rev 63929)
+++ grass/trunk/lib/manage/option.c	2015-01-02 11:22:21 UTC (rev 63930)
@@ -50,7 +50,6 @@
     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)

Modified: grass/trunk/lib/python/pygrass/gis/__init__.py
===================================================================
--- grass/trunk/lib/python/pygrass/gis/__init__.py	2015-01-02 08:37:51 UTC (rev 63929)
+++ grass/trunk/lib/python/pygrass/gis/__init__.py	2015-01-02 11:22:21 UTC (rev 63930)
@@ -18,7 +18,6 @@
 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 @@
 
             * 'ascii_vector',
             * 'group',
-            * 'icon',
             * 'labels',
-            * 'old_vector',
             * 'raster',
             * 'raster_3d',
             * 'region',
-            * 'sites',
             * 'vector',
 
         :param type: the type of element to query