get rid of more functions

git-svn-id: http://svn.osgeo.org/postgis/trunk@6510 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Regina Obe 2010-12-27 01:40:48 +00:00
parent 904fba80cb
commit 00164fc719
2 changed files with 30 additions and 33 deletions

View file

@ -116,8 +116,8 @@ CREATE OR REPLACE FUNCTION st_geometry(box3d_extent)
--- end functions that in theory should never have been used
-- begin old ogc (and non-ST) names that have been replaced with new SQL-MM and SQL Like names --
-- begin old ogc (and non-ST) names that have been replaced with new SQL-MM and SQL ST_ Like names --
-- AFFINE Functions --
-- Availability: 1.1.2
-- Deprecation in 1.2.3
CREATE OR REPLACE FUNCTION Affine(geometry,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8)
@ -194,6 +194,32 @@ CREATE OR REPLACE FUNCTION transscale(geometry,float8,float8,float8,float8)
0, 0, 1, $2 * $4, $3 * $5, 0)'
LANGUAGE 'SQL' IMMUTABLE STRICT;
-- END Affine functions
-- Deprecation in 1.2.3
CREATE OR REPLACE FUNCTION combine_bbox(box2d,geometry)
RETURNS box2d
AS 'MODULE_PATHNAME', 'BOX2DFLOAT4_combine'
LANGUAGE 'C' IMMUTABLE;
-- Deprecation in 1.2.3
CREATE OR REPLACE FUNCTION expand(box2d,float8)
RETURNS box2d
AS 'MODULE_PATHNAME', 'BOX2DFLOAT4_expand'
LANGUAGE 'C' IMMUTABLE STRICT;
-- Availability: 1.5.0 -- replaced with postgis_getbbox
CREATE OR REPLACE FUNCTION getbbox(geometry)
RETURNS box2d
AS 'MODULE_PATHNAME','LWGEOM_to_BOX2DFLOAT4'
LANGUAGE 'C' IMMUTABLE STRICT;
-- Deprecation in 1.2.3
CREATE OR REPLACE FUNCTION length3d_spheroid(geometry, spheroid)
RETURNS FLOAT8
AS 'MODULE_PATHNAME','LWGEOM_length_ellipsoid_linestring'
LANGUAGE 'C' IMMUTABLE STRICT;
-- Availability: 1.1.0
-- Deprecation in 1.2.3
CREATE OR REPLACE FUNCTION shift_longitude(geometry)

View file

@ -370,24 +370,12 @@ CREATE TYPE box2d (
storage = plain
);
-- Deprecation in 1.2.3
CREATE OR REPLACE FUNCTION expand(box2d,float8)
RETURNS box2d
AS 'MODULE_PATHNAME', 'BOX2DFLOAT4_expand'
LANGUAGE 'C' IMMUTABLE STRICT;
-- Availability: 1.2.2
CREATE OR REPLACE FUNCTION ST_expand(box2d,float8)
RETURNS box2d
AS 'MODULE_PATHNAME', 'BOX2DFLOAT4_expand'
LANGUAGE 'C' IMMUTABLE STRICT;
-- Availability: 1.5.0
CREATE OR REPLACE FUNCTION getbbox(geometry)
RETURNS box2d
AS 'MODULE_PATHNAME','LWGEOM_to_BOX2DFLOAT4'
LANGUAGE 'C' IMMUTABLE STRICT;
-- Availability: 1.5.0
CREATE OR REPLACE FUNCTION postgis_getbbox(geometry)
RETURNS box2d
@ -411,11 +399,6 @@ CREATE OR REPLACE FUNCTION ST_MakeBox2d(geometry, geometry)
AS 'MODULE_PATHNAME', 'BOX2DFLOAT4_construct'
LANGUAGE 'C' IMMUTABLE STRICT;
-- Deprecation in 1.2.3
CREATE OR REPLACE FUNCTION combine_bbox(box2d,geometry)
RETURNS box2d
AS 'MODULE_PATHNAME', 'BOX2DFLOAT4_combine'
LANGUAGE 'C' IMMUTABLE;
-- Availability: 1.2.2
CREATE OR REPLACE FUNCTION ST_Combine_BBox(box2d,geometry)
@ -462,7 +445,7 @@ DECLARE
myrec RECORD;
BEGIN
FOR myrec IN EXECUTE 'SELECT extent("' || columnname || '") FROM "' || schemaname || '"."' || tablename || '"' LOOP
FOR myrec IN EXECUTE 'SELECT ST_Extent("' || columnname || '") FROM "' || schemaname || '"."' || tablename || '"' LOOP
return myrec.extent;
END LOOP;
END;
@ -479,7 +462,7 @@ DECLARE
myrec RECORD;
BEGIN
FOR myrec IN EXECUTE 'SELECT extent("' || columnname || '") FROM "' || schemaname || '"."' || tablename || '"' LOOP
FOR myrec IN EXECUTE 'SELECT ST_Extent("' || columnname || '") FROM "' || schemaname || '"."' || tablename || '"' LOOP
return myrec.extent;
END LOOP;
END;
@ -1038,12 +1021,6 @@ CREATE OR REPLACE FUNCTION ST_Length(geometry)
-- this is a fake (for back-compatibility)
-- uses 3d if 3d is available, 2d otherwise
-- Deprecation in 1.2.3
CREATE OR REPLACE FUNCTION length3d_spheroid(geometry, spheroid)
RETURNS FLOAT8
AS 'MODULE_PATHNAME','LWGEOM_length_ellipsoid_linestring'
LANGUAGE 'C' IMMUTABLE STRICT;
-- Availability: 1.2.2
CREATE OR REPLACE FUNCTION ST_length3d_spheroid(geometry, spheroid)
RETURNS FLOAT8
@ -1091,12 +1068,6 @@ CREATE OR REPLACE FUNCTION ST_perimeter2d(geometry)
AS 'MODULE_PATHNAME', 'LWGEOM_perimeter2d_poly'
LANGUAGE 'C' IMMUTABLE STRICT;
-- Deprecation in 1.2.3
CREATE OR REPLACE FUNCTION perimeter(geometry)
RETURNS FLOAT8
AS 'MODULE_PATHNAME', 'LWGEOM_perimeter_poly'
LANGUAGE 'C' IMMUTABLE STRICT;
-- PostGIS equivalent function: perimeter2d(geometry)
CREATE OR REPLACE FUNCTION ST_Perimeter(geometry)
RETURNS FLOAT8