mirror of
https://git.osgeo.org/gitea/postgis/postgis
synced 2024-10-25 01:22:47 +00:00
#722 : remove deprecated functions (part): contains, intersection, line_interpolate_point, line_locate_point,
line_substring, locate_between_measures git-svn-id: http://svn.osgeo.org/postgis/trunk@6576 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
parent
986fd1cc2a
commit
ad3ed6739a
|
@ -580,6 +580,12 @@ CREATE OR REPLACE FUNCTION buffer(geometry,float8,integer)
|
||||||
AS 'SELECT ST_Buffer($1, $2, $3)'
|
AS 'SELECT ST_Buffer($1, $2, $3)'
|
||||||
LANGUAGE 'SQL' IMMUTABLE STRICT;
|
LANGUAGE 'SQL' IMMUTABLE STRICT;
|
||||||
|
|
||||||
|
-- Deprecation in 1.2.3
|
||||||
|
CREATE OR REPLACE FUNCTION Contains(geometry,geometry)
|
||||||
|
RETURNS boolean
|
||||||
|
AS 'MODULE_PATHNAME'
|
||||||
|
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||||
|
|
||||||
-- Deprecation in 1.2.3
|
-- Deprecation in 1.2.3
|
||||||
CREATE OR REPLACE FUNCTION crosses(geometry,geometry)
|
CREATE OR REPLACE FUNCTION crosses(geometry,geometry)
|
||||||
RETURNS boolean
|
RETURNS boolean
|
||||||
|
@ -860,6 +866,12 @@ CREATE OR REPLACE FUNCTION InteriorRingN(geometry,integer)
|
||||||
AS 'MODULE_PATHNAME','LWGEOM_interiorringn_polygon'
|
AS 'MODULE_PATHNAME','LWGEOM_interiorringn_polygon'
|
||||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||||
|
|
||||||
|
-- Deprecation in 1.2.3
|
||||||
|
CREATE OR REPLACE FUNCTION intersection(geometry,geometry)
|
||||||
|
RETURNS geometry
|
||||||
|
AS 'MODULE_PATHNAME','intersection'
|
||||||
|
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||||
|
|
||||||
-- Deprecation in 1.2.3
|
-- Deprecation in 1.2.3
|
||||||
CREATE OR REPLACE FUNCTION IsClosed(geometry)
|
CREATE OR REPLACE FUNCTION IsClosed(geometry)
|
||||||
RETURNS boolean
|
RETURNS boolean
|
||||||
|
@ -897,6 +909,24 @@ CREATE OR REPLACE FUNCTION length(geometry)
|
||||||
AS 'MODULE_PATHNAME', 'LWGEOM_length_linestring'
|
AS 'MODULE_PATHNAME', 'LWGEOM_length_linestring'
|
||||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||||
|
|
||||||
|
-- Deprecation in 1.2.3
|
||||||
|
CREATE OR REPLACE FUNCTION line_interpolate_point(geometry, float8)
|
||||||
|
RETURNS geometry
|
||||||
|
AS 'MODULE_PATHNAME', 'LWGEOM_line_interpolate_point'
|
||||||
|
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||||
|
|
||||||
|
-- Deprecation in 1.2.3
|
||||||
|
CREATE OR REPLACE FUNCTION line_locate_point(geometry, geometry)
|
||||||
|
RETURNS float8
|
||||||
|
AS 'MODULE_PATHNAME', 'LWGEOM_line_locate_point'
|
||||||
|
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||||
|
|
||||||
|
-- Deprecation in 1.2.3
|
||||||
|
CREATE OR REPLACE FUNCTION line_substring(geometry, float8, float8)
|
||||||
|
RETURNS geometry
|
||||||
|
AS 'MODULE_PATHNAME', 'LWGEOM_line_substring'
|
||||||
|
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||||
|
|
||||||
-- Deprecation in 1.2.3
|
-- Deprecation in 1.2.3
|
||||||
CREATE OR REPLACE FUNCTION LineFromText(text)
|
CREATE OR REPLACE FUNCTION LineFromText(text)
|
||||||
RETURNS geometry
|
RETURNS geometry
|
||||||
|
@ -943,6 +973,7 @@ CREATE OR REPLACE FUNCTION LineFromWKB(bytea)
|
||||||
'
|
'
|
||||||
LANGUAGE 'SQL' IMMUTABLE STRICT;
|
LANGUAGE 'SQL' IMMUTABLE STRICT;
|
||||||
|
|
||||||
|
|
||||||
-- Deprecation in 1.2.3
|
-- Deprecation in 1.2.3
|
||||||
CREATE OR REPLACE FUNCTION LineStringFromText(text)
|
CREATE OR REPLACE FUNCTION LineStringFromText(text)
|
||||||
RETURNS geometry
|
RETURNS geometry
|
||||||
|
@ -975,6 +1006,11 @@ CREATE OR REPLACE FUNCTION LinestringFromWKB(bytea)
|
||||||
'
|
'
|
||||||
LANGUAGE 'SQL' IMMUTABLE STRICT;
|
LANGUAGE 'SQL' IMMUTABLE STRICT;
|
||||||
|
|
||||||
|
-- Deprecation in 1.2.3
|
||||||
|
CREATE OR REPLACE FUNCTION locate_between_measures(geometry, float8, float8)
|
||||||
|
RETURNS geometry
|
||||||
|
AS 'MODULE_PATHNAME', 'LWGEOM_locate_between_m'
|
||||||
|
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||||
|
|
||||||
-- Deprecation in 1.2.3
|
-- Deprecation in 1.2.3
|
||||||
CREATE OR REPLACE FUNCTION M(geometry)
|
CREATE OR REPLACE FUNCTION M(geometry)
|
||||||
|
|
|
@ -2882,48 +2882,24 @@ CREATE OR REPLACE FUNCTION ST_Segmentize(geometry, float8)
|
||||||
-- LRS
|
-- LRS
|
||||||
---------------------------------------------------------------
|
---------------------------------------------------------------
|
||||||
|
|
||||||
-- Deprecation in 1.2.3
|
|
||||||
CREATE OR REPLACE FUNCTION line_interpolate_point(geometry, float8)
|
|
||||||
RETURNS geometry
|
|
||||||
AS 'MODULE_PATHNAME', 'LWGEOM_line_interpolate_point'
|
|
||||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
|
||||||
|
|
||||||
-- Availability: 1.2.2
|
-- Availability: 1.2.2
|
||||||
CREATE OR REPLACE FUNCTION ST_line_interpolate_point(geometry, float8)
|
CREATE OR REPLACE FUNCTION ST_line_interpolate_point(geometry, float8)
|
||||||
RETURNS geometry
|
RETURNS geometry
|
||||||
AS 'MODULE_PATHNAME', 'LWGEOM_line_interpolate_point'
|
AS 'MODULE_PATHNAME', 'LWGEOM_line_interpolate_point'
|
||||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||||
|
|
||||||
-- Deprecation in 1.2.3
|
|
||||||
CREATE OR REPLACE FUNCTION line_substring(geometry, float8, float8)
|
|
||||||
RETURNS geometry
|
|
||||||
AS 'MODULE_PATHNAME', 'LWGEOM_line_substring'
|
|
||||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
|
||||||
|
|
||||||
-- Availability: 1.2.2
|
-- Availability: 1.2.2
|
||||||
CREATE OR REPLACE FUNCTION ST_line_substring(geometry, float8, float8)
|
CREATE OR REPLACE FUNCTION ST_line_substring(geometry, float8, float8)
|
||||||
RETURNS geometry
|
RETURNS geometry
|
||||||
AS 'MODULE_PATHNAME', 'LWGEOM_line_substring'
|
AS 'MODULE_PATHNAME', 'LWGEOM_line_substring'
|
||||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||||
|
|
||||||
-- Deprecation in 1.2.3
|
|
||||||
CREATE OR REPLACE FUNCTION line_locate_point(geometry, geometry)
|
|
||||||
RETURNS float8
|
|
||||||
AS 'MODULE_PATHNAME', 'LWGEOM_line_locate_point'
|
|
||||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
|
||||||
|
|
||||||
-- Availability: 1.2.2
|
-- Availability: 1.2.2
|
||||||
CREATE OR REPLACE FUNCTION ST_line_locate_point(geometry, geometry)
|
CREATE OR REPLACE FUNCTION ST_line_locate_point(geometry, geometry)
|
||||||
RETURNS float8
|
RETURNS float8
|
||||||
AS 'MODULE_PATHNAME', 'LWGEOM_line_locate_point'
|
AS 'MODULE_PATHNAME', 'LWGEOM_line_locate_point'
|
||||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||||
|
|
||||||
-- Deprecation in 1.2.3
|
|
||||||
CREATE OR REPLACE FUNCTION locate_between_measures(geometry, float8, float8)
|
|
||||||
RETURNS geometry
|
|
||||||
AS 'MODULE_PATHNAME', 'LWGEOM_locate_between_m'
|
|
||||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
|
||||||
|
|
||||||
-- Availability: 1.2.2
|
-- Availability: 1.2.2
|
||||||
CREATE OR REPLACE FUNCTION ST_locate_between_measures(geometry, float8, float8)
|
CREATE OR REPLACE FUNCTION ST_locate_between_measures(geometry, float8, float8)
|
||||||
RETURNS geometry
|
RETURNS geometry
|
||||||
|
@ -2934,7 +2910,7 @@ CREATE OR REPLACE FUNCTION ST_locate_between_measures(geometry, float8, float8)
|
||||||
-- Availability: 1.2.2
|
-- Availability: 1.2.2
|
||||||
CREATE OR REPLACE FUNCTION ST_locate_along_measure(geometry, float8)
|
CREATE OR REPLACE FUNCTION ST_locate_along_measure(geometry, float8)
|
||||||
RETURNS geometry
|
RETURNS geometry
|
||||||
AS $$ SELECT locate_between_measures($1, $2, $2) $$
|
AS $$ SELECT ST_locate_between_measures($1, $2, $2) $$
|
||||||
LANGUAGE 'sql' IMMUTABLE STRICT;
|
LANGUAGE 'sql' IMMUTABLE STRICT;
|
||||||
|
|
||||||
-- Availability: 1.5.0
|
-- Availability: 1.5.0
|
||||||
|
@ -2947,12 +2923,6 @@ CREATE OR REPLACE FUNCTION ST_AddMeasure(geometry, float8, float8)
|
||||||
-- GEOS
|
-- GEOS
|
||||||
---------------------------------------------------------------
|
---------------------------------------------------------------
|
||||||
|
|
||||||
-- Deprecation in 1.2.3
|
|
||||||
CREATE OR REPLACE FUNCTION intersection(geometry,geometry)
|
|
||||||
RETURNS geometry
|
|
||||||
AS 'MODULE_PATHNAME','intersection'
|
|
||||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
|
||||||
|
|
||||||
-- PostGIS equivalent function: intersection(geometry,geometry)
|
-- PostGIS equivalent function: intersection(geometry,geometry)
|
||||||
CREATE OR REPLACE FUNCTION ST_Intersection(geometry,geometry)
|
CREATE OR REPLACE FUNCTION ST_Intersection(geometry,geometry)
|
||||||
RETURNS geometry
|
RETURNS geometry
|
||||||
|
@ -3485,12 +3455,6 @@ CREATE OR REPLACE FUNCTION ST_Within(geometry,geometry)
|
||||||
AS 'SELECT $1 && $2 AND _ST_Within($1,$2)'
|
AS 'SELECT $1 && $2 AND _ST_Within($1,$2)'
|
||||||
LANGUAGE 'SQL' IMMUTABLE;
|
LANGUAGE 'SQL' IMMUTABLE;
|
||||||
|
|
||||||
-- Deprecation in 1.2.3
|
|
||||||
CREATE OR REPLACE FUNCTION Contains(geometry,geometry)
|
|
||||||
RETURNS boolean
|
|
||||||
AS 'MODULE_PATHNAME'
|
|
||||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
|
||||||
|
|
||||||
-- PostGIS equivalent function: contains(geometry,geometry)
|
-- PostGIS equivalent function: contains(geometry,geometry)
|
||||||
CREATE OR REPLACE FUNCTION _ST_Contains(geometry,geometry)
|
CREATE OR REPLACE FUNCTION _ST_Contains(geometry,geometry)
|
||||||
RETURNS boolean
|
RETURNS boolean
|
||||||
|
|
|
@ -301,18 +301,18 @@ CREATE OR REPLACE FUNCTION SE_EnvelopesIntersect(geometry,geometry)
|
||||||
-- ST_Buffer(geometry, float8) - already defined.
|
-- ST_Buffer(geometry, float8) - already defined.
|
||||||
-- ST_ConvexHull(geometry) already defined.
|
-- ST_ConvexHull(geometry) already defined.
|
||||||
|
|
||||||
-- PostGIS equivalent function: locate_along_measure(geometry, float8)
|
|
||||||
CREATE OR REPLACE FUNCTION SE_LocateAlong(geometry, float8)
|
|
||||||
RETURNS geometry
|
|
||||||
AS $$ SELECT locate_between_measures($1, $2, $2) $$
|
|
||||||
LANGUAGE 'sql' IMMUTABLE STRICT;
|
|
||||||
|
|
||||||
-- PostGIS equivalent function: locate_between_measures(geometry, float8, float8)
|
-- PostGIS equivalent function: locate_between_measures(geometry, float8, float8)
|
||||||
CREATE OR REPLACE FUNCTION SE_LocateBetween(geometry, float8, float8)
|
CREATE OR REPLACE FUNCTION SE_LocateBetween(geometry, float8, float8)
|
||||||
RETURNS geometry
|
RETURNS geometry
|
||||||
AS 'MODULE_PATHNAME', 'LWGEOM_locate_between_m'
|
AS 'MODULE_PATHNAME', 'LWGEOM_locate_between_m'
|
||||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||||
|
|
||||||
|
-- PostGIS equivalent function: locate_along_measure(geometry, float8)
|
||||||
|
CREATE OR REPLACE FUNCTION SE_LocateAlong(geometry, float8)
|
||||||
|
RETURNS geometry
|
||||||
|
AS $$ SELECT SE_LocateBetween($1, $2, $2) $$
|
||||||
|
LANGUAGE 'sql' IMMUTABLE STRICT;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in a new issue