From 307177e6d9b356952cde12d74377f6ec80028faa Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 27 Oct 2004 15:19:45 +0000 Subject: [PATCH] MakePoly renamed to Polygonize git-svn-id: http://svn.osgeo.org/postgis/trunk@1055 b70326c6-7e19-0410-871a-916f4a2858ee --- doc/postgis.xml | 6 +++--- lwgeom/lwgeom_geos.c | 18 +++++++++--------- lwgeom/lwpostgis.sql.in | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/postgis.xml b/doc/postgis.xml index 2b0f53137..612bc98d0 100644 --- a/doc/postgis.xml +++ b/doc/postgis.xml @@ -3702,12 +3702,12 @@ FROM geometry_table; - MakePoly(geometry set) + Polygonize(geometry set) Aggregate. Creates a MultiPolygon from the costituent - linework of a set of geometries. Only available when compiled - agains GEOS >= 2.1.0. + linework of a set of geometries. + Only available when compiled against GEOS >= 2.1.0. diff --git a/lwgeom/lwgeom_geos.c b/lwgeom/lwgeom_geos.c index a566e6e53..42bf02f04 100644 --- a/lwgeom/lwgeom_geos.c +++ b/lwgeom/lwgeom_geos.c @@ -34,7 +34,7 @@ Datum pointonsurface(PG_FUNCTION_ARGS); Datum GEOSnoop(PG_FUNCTION_ARGS); Datum postgis_geos_version(PG_FUNCTION_ARGS); Datum centroid(PG_FUNCTION_ARGS); -Datum GEOS_makepoly_garray(PG_FUNCTION_ARGS); +Datum GEOS_polygonize_garray(PG_FUNCTION_ARGS); @@ -2242,8 +2242,8 @@ Datum GEOSnoop(PG_FUNCTION_ARGS) PG_RETURN_POINTER(result); } -PG_FUNCTION_INFO_V1(GEOS_makepoly_garray); -Datum GEOS_makepoly_garray(PG_FUNCTION_ARGS) +PG_FUNCTION_INFO_V1(GEOS_polygonize_garray); +Datum GEOS_polygonize_garray(PG_FUNCTION_ARGS) { Datum datum; ArrayType *array; @@ -2270,7 +2270,7 @@ Datum GEOS_makepoly_garray(PG_FUNCTION_ARGS) nelems = ArrayGetNItems(ARR_NDIM(array), ARR_DIMS(array)); #ifdef DEBUG - elog(NOTICE, "GEOS_makepoly_garray: number of elements: %d", nelems); + elog(NOTICE, "GEOS_polygonize_garray: number of elements: %d", nelems); #endif if ( nelems == 0 ) PG_RETURN_NULL(); @@ -2288,12 +2288,12 @@ Datum GEOS_makepoly_garray(PG_FUNCTION_ARGS) } #ifdef DEBUG - elog(NOTICE, "GEOS_makepoly_garray: invoking GEOSpolygonize"); + elog(NOTICE, "GEOS_polygonize_garray: invoking GEOSpolygonize"); #endif geos_result = GEOSpolygonize(vgeoms, nelems); #ifdef DEBUG - elog(NOTICE, "GEOS_makepoly_garray: GEOSpolygonize returned"); + elog(NOTICE, "GEOS_polygonize_garray: GEOSpolygonize returned"); #endif //pfree(vgeoms); if ( ! geos_result ) PG_RETURN_NULL(); @@ -2461,10 +2461,10 @@ Datum unite_garray(PG_FUNCTION_ARGS) PG_RETURN_NULL(); // never get here } -PG_FUNCTION_INFO_V1(GEOS_makepoly_garray); -Datum GEOS_makepoly_garray(PG_FUNCTION_ARGS) +PG_FUNCTION_INFO_V1(GEOS_polygonize_garray); +Datum GEOS_polygonize_garray(PG_FUNCTION_ARGS) { - elog(ERROR,"GEOS_makepoly_garray:: operation not implemented - compile PostGIS with GEOS support"); + elog(ERROR,"GEOS_polygonize_garray:: operation not implemented - compile PostGIS with GEOS support"); PG_RETURN_NULL(); // never get here } diff --git a/lwgeom/lwpostgis.sql.in b/lwgeom/lwpostgis.sql.in index fb1835bf5..2963c4f47 100644 --- a/lwgeom/lwpostgis.sql.in +++ b/lwgeom/lwpostgis.sql.in @@ -1689,16 +1689,16 @@ CREATE AGGREGATE makeline ( finalfunc = makeline_garray ); -CREATEFUNCTION makepoly_garray (geometry[]) +CREATEFUNCTION polygonize_garray (geometry[]) RETURNS geometry - AS '@MODULE_FILENAME@', 'GEOS_makepoly_garray' + AS '@MODULE_FILENAME@', 'GEOS_polygonize_garray' LANGUAGE 'C'; -CREATE AGGREGATE makepoly ( +CREATE AGGREGATE polygonize ( sfunc = geom_accum, basetype = geometry, stype = geometry[], - finalfunc = makepoly_garray + finalfunc = polygonize_garray ); ------------------------------------------------------------------------ -- 2.50.1