From a01a751914d16c46d5df12a7c72e2d65ad50d49c Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 11 May 2015 17:07:38 +0000 Subject: [PATCH] Deprecate ST_Point_Inside_Circle (#2748) git-svn-id: http://svn.osgeo.org/postgis/trunk@13488 b70326c6-7e19-0410-871a-916f4a2858ee --- doc/reference_misc.xml | 13 ++++++++----- postgis/postgis.sql.in | 13 +++++++++++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/doc/reference_misc.xml b/doc/reference_misc.xml index d7beef8be..b7508430a 100644 --- a/doc/reference_misc.xml +++ b/doc/reference_misc.xml @@ -604,7 +604,7 @@ fulltable_size geomsize pergeom - ST_Point_Inside_Circle + ST_PointInsideCircle Is the point geometry insert circle defined by center_x, center_y, radius @@ -612,7 +612,7 @@ fulltable_size geomsize pergeom - boolean ST_Point_Inside_Circle + boolean ST_PointInsideCircle geometry a_point float center_x float center_y @@ -625,18 +625,21 @@ fulltable_size geomsize pergeom Description The syntax for this functions is - point_inside_circle(<geometry>,<circle_center_x>,<circle_center_y>,<radius>). + ST_PointInsideCircle(<geometry>,<circle_center_x>,<circle_center_y>,<radius>). Returns the true if the geometry is a point and is inside the circle. Returns false otherwise. This only works for points as the name suggests + + Availability: 1.2 + Changed: 2.2.0 In prior versions this used to be called ST_Point_Inside_Circle Examples - SELECT ST_Point_Inside_Circle(ST_Point(1,2), 0.5, 2, 3); - st_point_inside_circle + SELECT ST_PointInsideCircle(ST_Point(1,2), 0.5, 2, 3); + st_pointinsidecircle ------------------------ t diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in index aee062c34..369640703 100644 --- a/postgis/postgis.sql.in +++ b/postgis/postgis.sql.in @@ -1294,12 +1294,21 @@ CREATE OR REPLACE FUNCTION ST_Distance(geom1 geometry, geom2 geometry) LANGUAGE 'c' IMMUTABLE STRICT COST 100; --- Availability: 1.2.2 -CREATE OR REPLACE FUNCTION ST_point_inside_circle(geometry,float8,float8,float8) +-- Availability: 2.2.0 +CREATE OR REPLACE FUNCTION ST_PointInsideCircle(geometry,float8,float8,float8) RETURNS bool AS 'MODULE_PATHNAME', 'LWGEOM_inside_circle_point' LANGUAGE 'c' IMMUTABLE STRICT; +-- Availability: 1.2.2 +-- Deprecation in 2.2.0 +CREATE OR REPLACE FUNCTION ST_point_inside_circle(geometry,float8,float8,float8) + RETURNS bool AS + $$ SELECT _postgis_deprecate('ST_Point_Inside_Circle', 'ST_PointInsideCircle', '2.2.0'); + SELECT ST_PointInsideCircle($1,$2,$3,$4); + $$ + LANGUAGE 'sql' IMMUTABLE STRICT; + -- Availability: 1.2.2 CREATE OR REPLACE FUNCTION ST_azimuth(geom1 geometry, geom2 geometry) RETURNS float8 -- 2.50.1