Renamed {GEOS,JTS}_polygonize_garray to polygonize_garray to reduce

redundancies.

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

diff --git a/lwgeom/lwgeom_geos.c b/lwgeom/lwgeom_geos.c
index 912fa77f1b720f47e0df2ec4d1b5d364b509a130..025b3a14fd5a0ffd2aafaaf7a2a6de7d94c7fb64 100644 (file)
--- a/lwgeom/lwgeom_geos.c
+++ b/lwgeom/lwgeom_geos.c
@@ -35,7 +35,7 @@ Datum GEOSnoop(PG_FUNCTION_ARGS);
 Datum postgis_geos_version(PG_FUNCTION_ARGS);
 Datum postgis_jts_version(PG_FUNCTION_ARGS);
 Datum centroid(PG_FUNCTION_ARGS);
-Datum GEOS_polygonize_garray(PG_FUNCTION_ARGS);
+Datum polygonize_garray(PG_FUNCTION_ARGS);
 
 
 
@@ -2418,8 +2418,8 @@ Datum GEOSnoop(PG_FUNCTION_ARGS)
        PG_RETURN_POINTER(result);
 }
 
-PG_FUNCTION_INFO_V1(GEOS_polygonize_garray);
-Datum GEOS_polygonize_garray(PG_FUNCTION_ARGS)
+PG_FUNCTION_INFO_V1(polygonize_garray);
+Datum polygonize_garray(PG_FUNCTION_ARGS)
 {
        Datum datum;
        ArrayType *array;
@@ -2448,7 +2448,7 @@ Datum GEOS_polygonize_garray(PG_FUNCTION_ARGS)
        nelems = ArrayGetNItems(ARR_NDIM(array), ARR_DIMS(array));
 
 #ifdef PGIS_DEBUG
-       elog(NOTICE, "GEOS_polygonize_garray: number of elements: %d", nelems);
+       elog(NOTICE, "polygonize_garray: number of elements: %d", nelems);
 #endif
 
        if ( nelems == 0 ) PG_RETURN_NULL();
@@ -2479,12 +2479,12 @@ Datum GEOS_polygonize_garray(PG_FUNCTION_ARGS)
        }
 
 #ifdef PGIS_DEBUG
-       elog(NOTICE, "GEOS_polygonize_garray: invoking GEOSpolygonize");
+       elog(NOTICE, "polygonize_garray: invoking GEOSpolygonize");
 #endif
 
        geos_result = GEOSpolygonize(vgeoms, nelems);
 #ifdef PGIS_DEBUG
-       elog(NOTICE, "GEOS_polygonize_garray: GEOSpolygonize returned");
+       elog(NOTICE, "polygonize_garray: GEOSpolygonize returned");
 #endif
        //pfree(vgeoms);
        if ( ! geos_result ) PG_RETURN_NULL();

diff --git a/lwgeom/lwgeom_jts.c b/lwgeom/lwgeom_jts.c
index deba76c866d184af881d54050b2968c2b5a4723f..1bda6ed6c11f28117804f765f7acac9bda885ed9 100644 (file)
--- a/lwgeom/lwgeom_jts.c
+++ b/lwgeom/lwgeom_jts.c
@@ -34,7 +34,7 @@ Datum pointonsurface(PG_FUNCTION_ARGS);
 Datum JTSnoop(PG_FUNCTION_ARGS);
 Datum postgis_geos_version(PG_FUNCTION_ARGS);
 Datum centroid(PG_FUNCTION_ARGS);
-Datum JTS_polygonize_garray(PG_FUNCTION_ARGS);
+Datum polygonize_garray(PG_FUNCTION_ARGS);
 
 
 
@@ -2483,8 +2483,8 @@ Datum JTSnoop(PG_FUNCTION_ARGS)
        PG_RETURN_POINTER(result);
 }
 
-PG_FUNCTION_INFO_V1(JTS_polygonize_garray);
-Datum JTS_polygonize_garray(PG_FUNCTION_ARGS)
+PG_FUNCTION_INFO_V1(polygonize_garray);
+Datum polygonize_garray(PG_FUNCTION_ARGS)
 {
        Datum datum;
        ArrayType *array;
@@ -2513,7 +2513,7 @@ Datum JTS_polygonize_garray(PG_FUNCTION_ARGS)
        nelems = ArrayGetNItems(ARR_NDIM(array), ARR_DIMS(array));
 
 #ifdef PGIS_DEBUG
-       elog(NOTICE, "JTS_polygonize_garray: number of elements: %d", nelems);
+       elog(NOTICE, "polygonize_garray: number of elements: %d", nelems);
 #endif
 
        if ( nelems == 0 ) PG_RETURN_NULL();
@@ -2545,12 +2545,12 @@ Datum JTS_polygonize_garray(PG_FUNCTION_ARGS)
        }
 
 #ifdef PGIS_DEBUG
-       elog(NOTICE, "JTS_polygonize_garray: invoking JTSpolygonize");
+       elog(NOTICE, "polygonize_garray: invoking JTSpolygonize");
 #endif
 
        geos_result = JTSpolygonize(vgeoms, nelems);
 #ifdef PGIS_DEBUG
-       elog(NOTICE, "JTS_polygonize_garray: JTSpolygonize returned");
+       elog(NOTICE, "polygonize_garray: JTSpolygonize returned");
 #endif
        //pfree(vgeoms);
        if ( ! geos_result ) {
@@ -2573,14 +2573,6 @@ Datum JTS_polygonize_garray(PG_FUNCTION_ARGS)
 
 }
 
-Datum GEOS_polygonize_garray(PG_FUNCTION_ARGS);
-PG_FUNCTION_INFO_V1(GEOS_polygonize_garray);
-Datum GEOS_polygonize_garray(PG_FUNCTION_ARGS)
-{
-       elog(NOTICE, "GEOS support is disabled, use JTS_polygonize_garray instead");
-       PG_RETURN_NULL();
-}
-
 Datum GEOSnoop(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(GEOSnoop);
 Datum GEOSnoop(PG_FUNCTION_ARGS)
@@ -2608,6 +2600,9 @@ Datum postgis_jts_version(PG_FUNCTION_ARGS)
        VARATT_SIZEP(result) = VARHDRSZ + strlen(ver) ;
        memcpy(VARDATA(result), ver, strlen(ver));
        free(ver);
+
+       finishJTS();
+
        PG_RETURN_POINTER(result);
 }
 

diff --git a/lwgeom/lwgeom_nojts.c b/lwgeom/lwgeom_nojts.c
index 1d295c221d43cea4ab758b347145ebf3ff8d4eec..8a6aa7101d4e451aca348c5bf7bdf851884228a3 100644 (file)
--- a/lwgeom/lwgeom_nojts.c
+++ b/lwgeom/lwgeom_nojts.c
@@ -197,11 +197,11 @@ Datum unite_garray(PG_FUNCTION_ARGS)
        PG_RETURN_NULL(); // never get here
 }
 
-Datum GEOS_polygonize_garray(PG_FUNCTION_ARGS);
-PG_FUNCTION_INFO_V1(GEOS_polygonize_garray);
-Datum GEOS_polygonize_garray(PG_FUNCTION_ARGS)
+Datum polygonize_garray(PG_FUNCTION_ARGS);
+PG_FUNCTION_INFO_V1(polygonize_garray);
+Datum polygonize_garray(PG_FUNCTION_ARGS)
 {
-       elog(ERROR,"JTS_polygonize_garray:: operation not implemented - compile PostGIS with JTS or GEOS support");
+       elog(ERROR,"polygonize_garray:: operation not implemented - compile PostGIS with JTS or GEOS support");
        PG_RETURN_NULL(); // never get here
 }
 

diff --git a/lwgeom/lwpostgis.sql.in b/lwgeom/lwpostgis.sql.in
index 27fb4829b7c46eb955c1c09ca7c91054d8facac7..13de5aa89d5c84665b6df8e7472bb44c56147f93 100644 (file)
--- a/lwgeom/lwpostgis.sql.in
+++ b/lwgeom/lwpostgis.sql.in
@@ -1832,7 +1832,7 @@ CREATEFUNCTION MakePolygon(geometry)
 
 CREATEFUNCTION polygonize_garray (geometry[])
        RETURNS geometry
-       AS '@MODULE_FILENAME@', 'GEOS_polygonize_garray'
+       AS '@MODULE_FILENAME@', 'polygonize_garray'
        LANGUAGE 'C' _IMMUTABLE_STRICT;
 
 CREATE AGGREGATE polygonize (