[GRASS-SVN] r64007 - in grass/branches/releasebranch_7_0: . include lib/manage lib/python/pygrass/gis vector
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jan 8 11:08:36 PST 2015
Author: martinl
Date: 2015-01-08 11:08:36 -0800 (Thu, 08 Jan 2015)
New Revision: 64007
Removed:
grass/branches/releasebranch_7_0/vector/v.convert/
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/include/gis.h
grass/branches/releasebranch_7_0/lib/manage/element_list
grass/branches/releasebranch_7_0/lib/manage/option.c
grass/branches/releasebranch_7_0/lib/python/pygrass/gis/__init__.py
grass/branches/releasebranch_7_0/vector/Makefile
Log:
remove old_vector from element list
remove v.convert
(merge r63930:63931 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63736,63740-63742,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914,63927,63940-63941,63945,63954-63955,63960,63965,63976-63983,63995
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63736,63740-63742,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914,63927,63930-63931,63940-63941,63945,63954-63955,63960,63965,63976-63983,63995
Modified: grass/branches/releasebranch_7_0/include/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/gis.h 2015-01-08 19:07:06 UTC (rev 64006)
+++ grass/branches/releasebranch_7_0/include/gis.h 2015-01-08 19:08:36 UTC (rev 64007)
@@ -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/branches/releasebranch_7_0/lib/manage/element_list
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/element_list 2015-01-08 19:07:06 UTC (rev 64006)
+++ grass/branches/releasebranch_7_0/lib/manage/element_list 2015-01-08 19:08:36 UTC (rev 64007)
@@ -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/branches/releasebranch_7_0/lib/manage/option.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/option.c 2015-01-08 19:07:06 UTC (rev 64006)
+++ grass/branches/releasebranch_7_0/lib/manage/option.c 2015-01-08 19:08:36 UTC (rev 64007)
@@ -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/branches/releasebranch_7_0/lib/python/pygrass/gis/__init__.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/pygrass/gis/__init__.py 2015-01-08 19:07:06 UTC (rev 64006)
+++ grass/branches/releasebranch_7_0/lib/python/pygrass/gis/__init__.py 2015-01-08 19:08:36 UTC (rev 64007)
@@ -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
Modified: grass/branches/releasebranch_7_0/vector/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/vector/Makefile 2015-01-08 19:07:06 UTC (rev 64006)
+++ grass/branches/releasebranch_7_0/vector/Makefile 2015-01-08 19:08:36 UTC (rev 64007)
@@ -12,7 +12,6 @@
v.clean \
v.colors \
v.colors.out \
- v.convert \
v.db.connect \
v.db.select \
v.delaunay \
More information about the grass-commit
mailing list