From 592cbf8f331462e045778d005394e48a618b810a Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Wed, 15 Jun 2011 12:44:42 +0000 Subject: [PATCH] #722 - get rid of transform and remainder of SnapToGrid deprecated family of functions. Add to #945 uninstall_legacy and also legacy.sql.in.c files git-svn-id: http://svn.osgeo.org/postgis/trunk@7398 b70326c6-7e19-0410-871a-916f4a2858ee --- postgis/legacy.sql.in.c | 18 ++++++++++++++++++ postgis/postgis.sql.in.c | 23 +++-------------------- postgis/uninstall_legacy.sql.in.c | 5 +++++ 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c index 6fb67d12f..4b1c55588 100644 --- a/postgis/legacy.sql.in.c +++ b/postgis/legacy.sql.in.c @@ -1663,6 +1663,12 @@ CREATE OR REPLACE FUNCTION Simplify(geometry, float8) LANGUAGE 'C' IMMUTABLE STRICT; -- SnapToGrid(input, size) # xsize=ysize=size, offsets=0 +-- Deprecation in 1.2.3 +CREATE OR REPLACE FUNCTION SnapToGrid(geometry, float8, float8, float8, float8) + RETURNS geometry + AS 'MODULE_PATHNAME', 'LWGEOM_snaptogrid' + LANGUAGE 'C' IMMUTABLE STRICT; + -- Deprecation in 1.2.3 CREATE OR REPLACE FUNCTION SnapToGrid(geometry, float8) RETURNS geometry @@ -1676,6 +1682,13 @@ CREATE OR REPLACE FUNCTION SnapToGrid(geometry, geometry, float8, float8, float8 AS 'MODULE_PATHNAME', 'LWGEOM_snaptogrid_pointoff' LANGUAGE 'C' IMMUTABLE STRICT; +-- SnapToGrid(input, xsize, ysize) # offsets=0 +-- Deprecation in 1.2.3 +CREATE OR REPLACE FUNCTION SnapToGrid(geometry, float8, float8) + RETURNS geometry + AS 'SELECT ST_SnapToGrid($1, 0, 0, $2, $3)' + LANGUAGE 'SQL' IMMUTABLE STRICT; + -- Availability: 1.2.2 -- this should be deprecated (do not think anyone has ever used it) CREATE OR REPLACE FUNCTION ST_MakeLine_GArray (geometry[]) RETURNS geometry @@ -1705,6 +1718,11 @@ CREATE OR REPLACE FUNCTION summary(geometry) RETURNS text AS 'MODULE_PATHNAME', 'LWGEOM_summary' LANGUAGE 'C' IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION transform(geometry,integer) + RETURNS geometry + AS 'MODULE_PATHNAME','transform' + LANGUAGE 'C' IMMUTABLE STRICT; -- Deprecation in 1.2.3 CREATE OR REPLACE FUNCTION touches(geometry,geometry) diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c index 713ab5bcd..a4e0d5117 100644 --- a/postgis/postgis.sql.in.c +++ b/postgis/postgis.sql.in.c @@ -2721,12 +2721,7 @@ CREATE OR REPLACE FUNCTION postgis_transform_geometry(geometry,text,text,int) AS 'MODULE_PATHNAME','transform_geom' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION transform(geometry,integer) - RETURNS geometry - AS 'MODULE_PATHNAME','transform' - LANGUAGE 'C' IMMUTABLE STRICT; - --- PostGIS equivalent function: transform(geometry,integer) +-- PostGIS equivalent of old function: transform(geometry,integer) CREATE OR REPLACE FUNCTION ST_Transform(geometry,integer) RETURNS geometry AS 'MODULE_PATHNAME','transform' @@ -2936,26 +2931,14 @@ CREATE OR REPLACE FUNCTION ST_Simplify(geometry, float8) AS 'MODULE_PATHNAME', 'LWGEOM_simplify2d' LANGUAGE 'C' IMMUTABLE STRICT; --- SnapToGrid(input, xoff, yoff, xsize, ysize) --- Deprecation in 1.2.3 -CREATE OR REPLACE FUNCTION SnapToGrid(geometry, float8, float8, float8, float8) - RETURNS geometry - AS 'MODULE_PATHNAME', 'LWGEOM_snaptogrid' - LANGUAGE 'C' IMMUTABLE STRICT; - +-- ST_SnapToGrid(input, xoff, yoff, xsize, ysize) -- Availability: 1.2.2 CREATE OR REPLACE FUNCTION ST_SnapToGrid(geometry, float8, float8, float8, float8) RETURNS geometry AS 'MODULE_PATHNAME', 'LWGEOM_snaptogrid' LANGUAGE 'C' IMMUTABLE STRICT; --- SnapToGrid(input, xsize, ysize) # offsets=0 --- Deprecation in 1.2.3 -CREATE OR REPLACE FUNCTION SnapToGrid(geometry, float8, float8) - RETURNS geometry - AS 'SELECT ST_SnapToGrid($1, 0, 0, $2, $3)' - LANGUAGE 'SQL' IMMUTABLE STRICT; - +-- ST_SnapToGrid(input, xsize, ysize) # offsets=0 -- Availability: 1.2.2 CREATE OR REPLACE FUNCTION ST_SnapToGrid(geometry, float8, float8) RETURNS geometry diff --git a/postgis/uninstall_legacy.sql.in.c b/postgis/uninstall_legacy.sql.in.c index 0d83376fd..71b91c12a 100644 --- a/postgis/uninstall_legacy.sql.in.c +++ b/postgis/uninstall_legacy.sql.in.c @@ -79,4 +79,9 @@ DROP FUNCTION IF EXISTS Force_3dz(geometry); DROP FUNCTION IF EXISTS Force_4d(geometry); DROP FUNCTION IF EXISTS Force_Collection(geometry); DROP FUNCTION IF EXISTS ForceRHR(geometry); +DROP FUNCTION IF EXISTS SnapToGrid(geometry, float8, float8, float8, float8); +DROP FUNCTION IF EXISTS SnapToGrid(geometry, float8); +DROP FUNCTION IF EXISTS SnapToGrid(geometry, geometry, float8, float8, float8, float8); +DROP FUNCTION IF EXISTS SnapToGrid(geometry, float8, float8); +DROP FUNCTION IF FUNCTION transform(geometry,integer); -- 2.50.1