remove sites element and library - https://trac.osgeo.org/grass/ticket/2440 (merge from trunk, https://trac.osgeo.org/grass/changeset/62179)

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

gui/wxpython/gui_core/gselect.py

@@ -429,10 +429,6 @@ class TreeCtrlComboPopup(ListCtrlComboPopup):
                        'labels':'labels',
                        'label':'labels',
                        'paint label files':'labels',
-                       'site_lists':'sites',
-                       'sites':'sites',
-                       'site list':'sites',
-                       'site list files':'sites',
                        'windows':'region',
                        'region':'region',
                        'region definition':'region',

lib/Makefile

@@ -27,7 +27,6 @@ SUBDIRS = \
 	cluster \
 	rowio \
 	segment \
-	sites \
 	rst \
 	lidar \
 	raster3d \

lib/manage/element_list

@@ -24,7 +24,6 @@ dig:oldvect:old vector:old (GRASS 5.0) vector map(s)
   reg:point registration
 dig_ascii:asciivect:asciivector:ASCII vector map(s)
 paint/labels:labels:label:paint label file(s)
-site_lists:sites:site list:site list file(s)
 windows:region:region definition:region definition(s)
 windows3d:region3d:region3D definition:3D region definition(s)
 group:group:imagery group:imagery group(s)

lib/manage/option.c

@@ -50,8 +50,7 @@ struct Option* M_define_option(int n, const char *desc, int multiple)
     if (strcmp(p->key, "rast") == 0 || strcmp(p->key, "rast3d") == 0)
 	p->guisection = _("Raster");
     else if (strcmp(p->key, "vect") == 0 || strcmp(p->key, "oldvect") == 0 ||
-	     strcmp(p->key, "asciivect") == 0 ||
-	     strcmp(p->key, "sites") == 0)
+	     strcmp(p->key, "asciivect") == 0)
 	p->guisection = _("Vector");
     else if (strcmp(p->key, "region") == 0 || strcmp(p->key, "region3d") == 0)
 	p->guisection = _("Region");

scripts/Makefile

@@ -65,7 +65,6 @@ SUBDIRS = \
 	v.in.gns \
 	v.in.lines \
 	v.in.mapgen \
-	v.in.sites.all \
 	v.in.wfs \
 	v.rast.stats \
 	v.report \

scripts/v.in.sites.all/Makefile

@@ -1,7 +0,0 @@
-MODULE_TOPDIR = ../..
-
-PGM = v.in.sites.all
-
-include $(MODULE_TOPDIR)/include/Make/Script.make
-
-default: script

scripts/v.in.sites.all/v.in.sites.all.html

@@ -1,38 +0,0 @@
-<h2>DESCRIPTION</h2>
-
-<em>v.in.sites.all</em> converts all GRASS 5.0/5.3/5.4 sites files in the current
-mapset into 6.0 vectors.
-
-<h2>NOTES</h2>
-
-Sites maps from 5.0/5.3/5.4 and vector maps from 6.0 do not interfere.
-They are stored in different directories, so you can use the same names.
-Old sites maps can be listed with <em>g.list sites</em>.
-<br>
-As this GRASS version uses SQL for attribute management, there are
-some <a href=sql.html>SQL restrictings concerning the file names</a>.
-This script changes dots (e.g. "foo.bar") in old vector map names into
-underline(s) (e.g. "foo_bar"). It also adds the extension '_points' to the
-new vector map name.
-
-<h2>EXAMPLE</h2>
-
-To convert all old vector maps in the current mapset to the new vector format:
-<br>
-<div class="code"><pre>
-v.in.sites.all
-</pre></div>
-
-<h2>SEE ALSO</h2>
-
-<em>
-<a href="g.list.html">g.list</a>,
-<a href="v.in.sites.html">v.in.sites</a>
-</em>
-
-
-<h2>AUTHOR</h2>
-
-Markus Neteler, ITC-Irst, Trento, Italy
-
-<p><i>Last changed: $Date$</i>

scripts/v.in.sites.all/v.in.sites.all.py

@@ -1,51 +0,0 @@
-#!/usr/bin/env python
-############################################################################
-#
-# MODULE:	v.in.sites.all
-# AUTHOR(S):	Markus Neteler, converted to Python by Glynn Clements
-# PURPOSE:	converts all old GRASS < V5.7 sites maps to vector maps
-#		in current mapset
-# COPYRIGHT:	(C) 2004, 2008 by the GRASS Development Team
-#
-#		This program is free software under the GNU General Public
-#		License (>=v2). Read the file COPYING that comes with GRASS
-#		for details.
-#
-#############################################################################
-
-#%module
-#% description: Converts all old GRASS < Ver5.7 sites maps in current mapset to vector maps.
-#% keywords: sites
-#% keywords: import
-#% keywords: vector
-#%end
-
-import sys
-from grass.script import core as grass
-
-def main():
-    env = grass.gisenv()
-    mapset = env['MAPSET']
-    converted = 0
-    ret = 0
-    for site in grass.list_grouped('sites')[mapset]:
-	inmap = "%s@%s" % (site, mapset)
-	outmap = site.replace(".", "_") + "_points"
-	grass.message(_("Processing %s -> %s") % (inmap, outmap))
-	if grass.run_command("v.in.sites", input = inmap, output = outmap) == 0:
-	    converted += 1
-	else:
-	    grass.warning(_("Error converting map %s to %s") % (inmap, outmap))
-	    ret = 1
-
-	if converted < 1:
-	    grass.warning(_("No sites maps converted as no old sites maps present in current mapset."))
-	else:
-	    grass.message(_("Total %u sites maps in current mapset converted to vector maps (original names extended by '_points')") % converted)
-	    grass.message(_("Please verify new vector map(s) before deleting old sites map(s)."))
-
-	sys.exit(ret)
-
-if __name__ == "__main__":
-    options, flags = grass.parser()
-    main()

vector/Makefile

@@ -28,7 +28,6 @@ SUBDIRS = \
 	v.in.db \
 	v.in.dxf \
 	v.in.region \
-	v.in.sites \
 	v.kcv \
 	v.kernel \
 	v.label \