From: Regina Obe <lr@pcorp.us>
Date: Tue, 24 May 2011 05:48:47 +0000 (+0000)
Subject: #722 remove Centroid and Dump, #949 more additons to uninstall (Centroid, Dump, addbb... 
X-Git-Tag: 2.0.0alpha1~1594
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f8a8a0550dc707ec59d0fe648d83932e1990546;p=postgis

#722 remove Centroid and Dump, #949 more additons to uninstall (Centroid, Dump, addbbox,dropbbox)

git-svn-id: http://svn.osgeo.org/postgis/trunk@7219 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index 6db1cb171..e07b2cf4e 100644
--- a/postgis/legacy.sql.in.c
+++ b/postgis/legacy.sql.in.c
@@ -583,6 +583,12 @@ CREATE OR REPLACE FUNCTION boundary(geometry)
 	AS 'MODULE_PATHNAME','boundary'
 	LANGUAGE 'C' IMMUTABLE STRICT;
 	
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION buffer(geometry,float8,integer)
+	RETURNS geometry
+	AS 'SELECT ST_Buffer($1, $2, $3)'
+	LANGUAGE 'SQL' IMMUTABLE STRICT;
+	
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION buffer(geometry,float8)
 	RETURNS geometry
@@ -597,12 +603,12 @@ CREATE OR REPLACE FUNCTION BuildArea(geometry)
 	LANGUAGE 'C' IMMUTABLE STRICT
 	COST 100;
 	
--- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION buffer(geometry,float8,integer)
+-- This is also available w/out GEOS
+CREATE OR REPLACE FUNCTION Centroid(geometry)
 	RETURNS geometry
-	AS 'SELECT ST_Buffer($1, $2, $3)'
-	LANGUAGE 'SQL' IMMUTABLE STRICT;
-	
+	AS 'MODULE_PATHNAME'
+	LANGUAGE 'C' IMMUTABLE STRICT;
+		
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION Contains(geometry,geometry)
 	RETURNS boolean
@@ -661,6 +667,12 @@ CREATE OR REPLACE FUNCTION distance_spheroid(geometry,geometry,spheroid)
 	LANGUAGE 'C' IMMUTABLE STRICT
 	COST 100;
 	
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION Dump(geometry)
+	RETURNS SETOF geometry_dump
+	AS 'MODULE_PATHNAME', 'LWGEOM_dump'
+	LANGUAGE 'C' IMMUTABLE STRICT;
+	
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION DumpRings(geometry)
 	RETURNS SETOF geometry_dump
diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index a557b1778..faf40e8f3 100644
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -1389,12 +1389,6 @@ CREATE OR REPLACE FUNCTION ST_LineMerge(geometry)
 
 CREATE TYPE geometry_dump AS (path integer[], geom geometry);
 
--- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION Dump(geometry)
-	RETURNS SETOF geometry_dump
-	AS 'MODULE_PATHNAME', 'LWGEOM_dump'
-	LANGUAGE 'C' IMMUTABLE STRICT;
-
 -- Availability: 1.2.2
 CREATE OR REPLACE FUNCTION ST_Dump(geometry)
 	RETURNS SETOF geometry_dump
@@ -3682,12 +3676,6 @@ CREATE OR REPLACE FUNCTION ST_IsValid(geometry)
 	LANGUAGE 'C' IMMUTABLE STRICT
 	COST 100;
 
--- This is also available w/out GEOS
-CREATE OR REPLACE FUNCTION Centroid(geometry)
-	RETURNS geometry
-	AS 'MODULE_PATHNAME'
-	LANGUAGE 'C' IMMUTABLE STRICT;
-	
 -- PostGIS equivalent function: Centroid(geometry)
 CREATE OR REPLACE FUNCTION ST_Centroid(geometry)
 	RETURNS geometry
diff --git a/postgis/uninstall_legacy.sql.in.c b/postgis/uninstall_legacy.sql.in.c
index 5af3de885..3cf8a42a7 100644
--- a/postgis/uninstall_legacy.sql.in.c
+++ b/postgis/uninstall_legacy.sql.in.c
@@ -17,6 +17,7 @@ DROP FUNCTION IF EXISTS Translate(geometry,float8,float8);
 DROP FUNCTION IF EXISTS TransScale(geometry,float8,float8,float8,float8);
 
 -- Other functions --
+DROP FUNCTION IF EXISTS AddBBox(geometry);
 DROP FUNCTION IF EXISTS AddPoint(geometry,geometry);
 DROP FUNCTION IF EXISTS AddPoint(geometry,geometry, integer);
 DROP FUNCTION IF EXISTS Area(geometry);
@@ -30,9 +31,30 @@ DROP FUNCTION IF EXISTS AsGML(geometry);
 DROP FUNCTION IF EXISTS AsGML(geometry,int4);
 DROP FUNCTION IF EXISTS AsKML(geometry);
 DROP FUNCTION IF EXISTS AsKML(geometry,int4);
+DROP FUNCTION IF EXISTS AsKML(int4,geometry,int4);
 DROP FUNCTION IF EXISTS AsHEXEWKB(geometry);
 DROP FUNCTION IF EXISTS AsHEXEWKB(geometry,text);
 DROP FUNCTION IF EXISTS AsSVG(geometry);
 DROP FUNCTION IF EXISTS AsSVG(geometry,int4);
 DROP FUNCTION IF EXISTS AsSVG(geometry,int4,int4);
 DROP FUNCTION IF EXISTS AsText(geometry);
+DROP FUNCTION IF EXISTS AZimuth(geometry,geometry);
+DROP FUNCTION IF EXISTS BdPolyFromText(text, integer);
+DROP FUNCTION IF EXISTS BdMPolyFromText(text, integer);
+DROP FUNCTION IF EXISTS Boundary(geometry);
+DROP FUNCTION IF EXISTS Buffer(geometry,float8,integer);
+DROP FUNCTION IF EXISTS Buffer(geometry,float8);
+DROP FUNCTION IF EXISTS BuildArea(geometry);
+DROP FUNCTION IF EXISTS Centroid(geometry);
+DROP FUNCTION IF EXISTS Contains(geometry,geometry);
+DROP FUNCTION IF EXISTS ConvexHull(geometry);
+DROP FUNCTION IF EXISTS Crosses(geometry,geometry);
+DROP FUNCTION IF EXISTS Distance(geometry,geometry);
+DROP FUNCTION IF EXISTS Difference(geometry,geometry);
+DROP FUNCTION IF EXISTS Dimension(geometry);
+DROP FUNCTION IF EXISTS Disjoint(geometry,geometry);
+DROP FUNCTION IF EXISTS Distance_Sphere(geometry,geometry);
+DROP FUNCTION IF EXISTS Distance_Spheroid(geometry,geometry,spheroid);
+DROP FUNCTION IF EXISTS DropBBox(geometry);
+DROP FUNCTION IF EXISTS Dump(geometry);
+DROP FUNCTION IF EXISTS DumpRings(geometry);