gislib: remove G_ELEMENT_3DVIEW and G_ELEMENT_REGION3D

remove references to region3d and view3d
       (merge https://trac.osgeo.org/grass/changeset/63639, https://trac.osgeo.org/grass/changeset/63642 from trunk)


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

gui/wxpython/gui_core/gselect.py

@@ -459,10 +459,6 @@ class TreeCtrlComboPopup(ListCtrlComboPopup):
                        'region':'region',
                        'region definition':'region',
                        'region definition files':'region',
-                       'windows3d':'region3d',
-                       'region3d':'region3d',
-                       'region3D definition':'region3d',
-                       'region3D definition files':'region3d',
                        'group':'group',
                        'imagery group':'group',
                        'imagery group files':'group',

include/gis.h

@@ -357,8 +357,8 @@ enum rule_type {
 */
 enum
 {				/* Dir */
-    G_ELEMENT_RASTER = 1,	/*!< cell */
-    G_ELEMENT_RASTER3D = 2,	/*!< 3dcell */
+    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 */
@@ -366,9 +366,7 @@ enum
     G_ELEMENT_LABEL = 7,	/*!< labels */
     G_ELEMENT_SITE = 8,		/*!< sites */
     G_ELEMENT_REGION = 9,	/*!< region */
-    G_ELEMENT_REGION3D = 10,	/*!< 3dregion */
-    G_ELEMENT_GROUP = 11,	/*!< group */
-    G_ELEMENT_3DVIEW = 12	/*!< 3dview */
+    G_ELEMENT_GROUP = 10,	/*!< group */
 };
 
 /*=========================== Typedefs/Structures ==========================*/

lib/manage/option.c

@@ -53,7 +53,7 @@ struct Option* M_define_option(int n, const char *desc, int multiple)
              strcmp(p->key, "old_vector") == 0 ||
 	     strcmp(p->key, "ascii_vector") == 0)
 	p->guisection = _("Vector");
-    else if (strcmp(p->key, "region") == 0 || strcmp(p->key, "region3d") == 0)
+    else if (strcmp(p->key, "region") == 0)
 	p->guisection = _("Region");
     else if (strcmp(p->key, "group") == 0)
 	p->guisection = _("Group");

lib/python/pygrass/gis/__init__.py

@@ -24,9 +24,7 @@ ETYPE = {'raster': libgis.G_ELEMENT_RASTER,
          'labels': libgis.G_ELEMENT_LABEL,
          'sites': libgis.G_ELEMENT_SITE,
          'region': libgis.G_ELEMENT_REGION,
-         'region3d': libgis.G_ELEMENT_REGION3D,
-         'group': libgis.G_ELEMENT_GROUP,
-         'view3d': libgis.G_ELEMENT_3DVIEW}
+         'group': libgis.G_ELEMENT_GROUP}
 
 
 CHECK_IS = {"GISBASE": libgis.G_is_gisbase,
@@ -317,10 +315,8 @@ class Mapset(object):
             * 'raster',
             * 'raster_3d',
             * 'region',
-            * 'region3d',
             * 'sites',
             * 'vector',
-            * 'view3d'
 
         :param type: the type of element to query
         :type type: str