#722 remove Centroid and Dump, #949 more additons to uninstall (Centroid, Dump, addbb...

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 6db1cb1719d657f10bdcf41d8537b934bb88cef8..e07b2cf4e12c2d5de5b8ad6b2d4b410419d5ca81 100644 (file)
--- 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 a557b17782382b74caf9e7d5c1960e28b2ff7693..faf40e8f3a11478d4289d56ea6762be70ab0d537 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -1389,12 +1389,6 @@ CREATE OR REPLACE FUNCTION ST_LineMerge(geometry)
 \r
 CREATE TYPE geometry_dump AS (path integer[], geom geometry);\r
 \r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION Dump(geometry)\r
-       RETURNS SETOF geometry_dump\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_dump'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_Dump(geometry)\r
        RETURNS SETOF geometry_dump\r
@@ -3682,12 +3676,6 @@ CREATE OR REPLACE FUNCTION ST_IsValid(geometry)
        LANGUAGE 'C' IMMUTABLE STRICT\r
        COST 100;\r
 \r
--- This is also available w/out GEOS\r
-CREATE OR REPLACE FUNCTION Centroid(geometry)\r
-       RETURNS geometry\r
-       AS 'MODULE_PATHNAME'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-       \r
 -- PostGIS equivalent function: Centroid(geometry)\r
 CREATE OR REPLACE FUNCTION ST_Centroid(geometry)\r
        RETURNS geometry\r

diff --git a/postgis/uninstall_legacy.sql.in.c b/postgis/uninstall_legacy.sql.in.c
index 5af3de885766e6e945380f54c972b875d6fd513c..3cf8a42a77d95b7490d9b6ca37d7e121aba9ef05 100644 (file)
--- 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);