From 4f0c8d8d5fdd08434d627560c07608d1229731b0 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 15 Mar 2010 18:03:11 +0000 Subject: [PATCH] Rename ST_SplitGeometry to ST_Split (better now than never) git-svn-id: http://svn.osgeo.org/postgis/trunk@5438 b70326c6-7e19-0410-871a-916f4a2858ee --- postgis/lwgeom_geos_split.c | 8 ++++---- postgis/postgis.sql.in.c | 8 ++++---- regress/split.sql | 32 ++++++++++++++++---------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/postgis/lwgeom_geos_split.c b/postgis/lwgeom_geos_split.c index f88986f9c..16b90b1af 100644 --- a/postgis/lwgeom_geos_split.c +++ b/postgis/lwgeom_geos_split.c @@ -11,7 +11,7 @@ * ********************************************************************** * - * ST_SplitGeometry + * ST_Split * * Split polygon by line, line by line, line by point. * Returns at most components as a collection. @@ -405,9 +405,9 @@ lwgeom_split(LWGEOM* lwgeom_in, LWGEOM* blade_in) } -Datum ST_SplitGeometry(PG_FUNCTION_ARGS); -PG_FUNCTION_INFO_V1(ST_SplitGeometry); -Datum ST_SplitGeometry(PG_FUNCTION_ARGS) +Datum ST_Split(PG_FUNCTION_ARGS); +PG_FUNCTION_INFO_V1(ST_Split); +Datum ST_Split(PG_FUNCTION_ARGS) { PG_LWGEOM *in, *blade_in, *out; LWGEOM *lwgeom_in, *lwblade_in, *lwgeom_out; diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c index b1cf5d8b8..5c8a4debe 100644 --- a/postgis/postgis.sql.in.c +++ b/postgis/postgis.sql.in.c @@ -4085,10 +4085,10 @@ CREATE OR REPLACE FUNCTION ST_CleanGeometry(geometry) COST 100; -------------------------------------------------------------------------------- --- ST_SplitGeometry +-- ST_Split -------------------------------------------------------------------------------- --- ST_SplitGeometry(in geometry, blade geometry) +-- ST_Split(in geometry, blade geometry) -- -- Split a geometry in parts after cutting it with given blade. -- Returns a collection containing all parts. @@ -4098,9 +4098,9 @@ CREATE OR REPLACE FUNCTION ST_CleanGeometry(geometry) -- -- Availability: 2.0.0 -- -CREATE OR REPLACE FUNCTION ST_SplitGeometry(geometry, geometry) +CREATE OR REPLACE FUNCTION ST_Split(geometry, geometry) RETURNS geometry - AS 'MODULE_PATHNAME', 'ST_SplitGeometry' + AS 'MODULE_PATHNAME', 'ST_Split' LANGUAGE 'C' IMMUTABLE STRICT COST 100; diff --git a/regress/split.sql b/regress/split.sql index 8985885af..596fedb59 100644 --- a/regress/split.sql +++ b/regress/split.sql @@ -1,44 +1,44 @@ -- Split line by point of different SRID -select st_splitgeometry('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=5;POINT(5 1)'); +select st_split('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=5;POINT(5 1)'); -- Split line by point on the line interior -select '1',st_asewkt(st_splitgeometry('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;POINT(5 0)')); -select '1.1',st_asewkt(st_splitgeometry('SRID=10;LINESTRING(10 0, 0 0)', 'SRID=10;POINT(5 0)')); +select '1',st_asewkt(st_split('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;POINT(5 0)')); +select '1.1',st_asewkt(st_split('SRID=10;LINESTRING(10 0, 0 0)', 'SRID=10;POINT(5 0)')); -- Split line by point on the line boundary -select '2',st_asewkt(st_splitgeometry('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;POINT(10 0)')); +select '2',st_asewkt(st_split('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;POINT(10 0)')); -- Split line by point on the line exterior -select '3',st_asewkt(st_splitgeometry('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;POINT(5 1)')); +select '3',st_asewkt(st_split('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;POINT(5 1)')); -- Split line by line of different SRID -select st_splitgeometry('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=5;LINESTRING(5 1, 10 1)'); +select st_split('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=5;LINESTRING(5 1, 10 1)'); -- Split line by disjoint line -select '4', st_asewkt(ST_SplitGeometry('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;LINESTRING(20 0, 20 20)')); +select '4', st_asewkt(ST_Split('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;LINESTRING(20 0, 20 20)')); -- Split line by touching line -select '5', st_asewkt(ST_SplitGeometry('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;LINESTRING(10 -5, 10 5)')); +select '5', st_asewkt(ST_Split('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;LINESTRING(10 -5, 10 5)')); -- Split line by crossing line -select '6', st_asewkt(ST_SplitGeometry('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;LINESTRING(5 -5, 5 5)')); +select '6', st_asewkt(ST_Split('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;LINESTRING(5 -5, 5 5)')); -- Split line by multiply-crossing line -select '7', st_asewkt(ST_SplitGeometry('SRID=10;LINESTRING(0 0, 10 0, 10 10, 0 10, 0 20, 10 20)', 'SRID=10;LINESTRING(5 -5, 5 25)')); +select '7', st_asewkt(ST_Split('SRID=10;LINESTRING(0 0, 10 0, 10 10, 0 10, 0 20, 10 20)', 'SRID=10;LINESTRING(5 -5, 5 25)')); -- Split line by overlapping line (1) -select '8.1', st_asewkt(ST_SplitGeometry('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;LINESTRING(5 0, 20 0)')); +select '8.1', st_asewkt(ST_Split('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;LINESTRING(5 0, 20 0)')); -- Split line by contained line (2) -select '8.2', st_asewkt(ST_SplitGeometry('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;LINESTRING(5 0, 8 0)')); +select '8.2', st_asewkt(ST_Split('SRID=10;LINESTRING(0 0, 10 0)', 'SRID=10;LINESTRING(5 0, 8 0)')); -- Split exterior-only polygon by crossing line -select '20', st_asewkt(ST_SplitGeometry('SRID=12;POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', 'SRID=12;LINESTRING(5 -5, 5 15)')); +select '20', st_asewkt(ST_Split('SRID=12;POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', 'SRID=12;LINESTRING(5 -5, 5 15)')); -- Split single-hole polygon by line crossing both exterior and hole -select '21', st_asewkt(ST_SplitGeometry('SRID=12;POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(2 2, 8 2, 8 8, 2 8, 2 2))', 'SRID=12;LINESTRING(5 -5, 5 15)')); +select '21', st_asewkt(ST_Split('SRID=12;POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(2 2, 8 2, 8 8, 2 8, 2 2))', 'SRID=12;LINESTRING(5 -5, 5 15)')); -- Split single-hole polygon by line crossing only exterior -select '22', st_asewkt(ST_SplitGeometry('SRID=12;POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(5 2, 8 2, 8 8, 5 8, 5 2))', 'SRID=12;LINESTRING(2 -5, 2 15)')); +select '22', st_asewkt(ST_Split('SRID=12;POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(5 2, 8 2, 8 8, 5 8, 5 2))', 'SRID=12;LINESTRING(2 -5, 2 15)')); -- Split double-hole polygon by line crossing exterior and both holes -select '23', st_asewkt(ST_SplitGeometry('SRID=12;POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(2 2, 8 2, 8 4, 2 4, 2 2),(2 6,8 6,8 8,2 8,2 6))', 'SRID=12;LINESTRING(5 -5, 5 15)')); +select '23', st_asewkt(ST_Split('SRID=12;POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(2 2, 8 2, 8 4, 2 4, 2 2),(2 6,8 6,8 8,2 8,2 6))', 'SRID=12;LINESTRING(5 -5, 5 15)')); -- 2.40.0