#722 - get rid of transform and remainder of SnapToGrid deprecated family of function...

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

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index 6fb67d12fc8e4487402e821db47f0326a4072c61..4b1c555885eeddd0f709e89acbd5883a0df99d36 100644 (file)
--- 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 713ab5bcda03ce0b27c0525db27ede606f36fd85..a4e0d5117531f0ce6968b25c7eb93808ca0a133a 100644 (file)
--- 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'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
-CREATE OR REPLACE FUNCTION transform(geometry,integer)\r
-       RETURNS geometry\r
-       AS 'MODULE_PATHNAME','transform'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
--- PostGIS equivalent function: transform(geometry,integer)\r
+-- PostGIS equivalent of old function: transform(geometry,integer)\r
 CREATE OR REPLACE FUNCTION ST_Transform(geometry,integer)\r
        RETURNS geometry\r
        AS 'MODULE_PATHNAME','transform'\r
@@ -2936,26 +2931,14 @@ CREATE OR REPLACE FUNCTION ST_Simplify(geometry, float8)
        AS 'MODULE_PATHNAME', 'LWGEOM_simplify2d'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- SnapToGrid(input, xoff, yoff, xsize, ysize)\r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION SnapToGrid(geometry, float8, float8, float8, float8)\r
-       RETURNS geometry\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_snaptogrid'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
+-- ST_SnapToGrid(input, xoff, yoff, xsize, ysize)\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_SnapToGrid(geometry, float8, float8, float8, float8)\r
        RETURNS geometry\r
        AS 'MODULE_PATHNAME', 'LWGEOM_snaptogrid'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- SnapToGrid(input, xsize, ysize) # offsets=0\r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION SnapToGrid(geometry, float8, float8)\r
-       RETURNS geometry\r
-       AS 'SELECT ST_SnapToGrid($1, 0, 0, $2, $3)'\r
-       LANGUAGE 'SQL' IMMUTABLE STRICT;\r
-\r
+-- ST_SnapToGrid(input, xsize, ysize) # offsets=0\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_SnapToGrid(geometry, float8, float8)\r
        RETURNS geometry\r

diff --git a/postgis/uninstall_legacy.sql.in.c b/postgis/uninstall_legacy.sql.in.c
index 0d83376fdd83be959f268302dc0cca89ebe5eacb..71b91c12aaf801924e9afb57fdae7fd3222b4c59 100644 (file)
--- 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);