change ST_ConcaveHull to use default parameters

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

diff --git a/doc/reference_processing.xml b/doc/reference_processing.xml
index 7447acc58083671970bcac76d2ad1a7012b0e33e..6ee12d86fc184ad8a7edba6696aa5acaacd8cba3 100644 (file)
--- a/doc/reference_processing.xml
+++ b/doc/reference_processing.xml
@@ -507,17 +507,11 @@ MULTILINESTRING((1 2,3 4),(3 4,4 5))
 
          <refsynopsisdiv>
                <funcsynopsis>
-                 <funcprototype>
-                       <funcdef>geometry <function>ST_ConcaveHull</function></funcdef>
-                       <paramdef><type>geometry </type> <parameter>geomA</parameter></paramdef>
-                       <paramdef><type>float </type> <parameter>target_percent</parameter></paramdef>
-                 </funcprototype>
-                       
                 <funcprototype>
                        <funcdef>geometry <function>ST_ConcaveHull</function></funcdef>
                        <paramdef><type>geometry </type> <parameter>geomA</parameter></paramdef>
                        <paramdef><type>float </type> <parameter>target_percent</parameter></paramdef>
-                       <paramdef><type>boolean </type> <parameter>allow_holes</parameter></paramdef>
+                       <paramdef choice="opt"><type>boolean </type> <parameter>allow_holes=false</parameter></paramdef>
                  </funcprototype>
                </funcsynopsis>
          </refsynopsisdiv>

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index faf40e8f3a11478d4289d56ea6762be70ab0d537..cb8e1404e5cb9f9195ff2586bd0f3b9a41b82f68 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -5071,7 +5071,7 @@ $$
 $$\r
   LANGUAGE plpgsql IMMUTABLE STRICT;\r
   \r
-CREATE OR REPLACE FUNCTION ST_ConcaveHull(param_geom geometry, param_pctconvex float, param_allow_holes boolean) RETURNS geometry AS\r
+CREATE OR REPLACE FUNCTION ST_ConcaveHull(param_geom geometry, param_pctconvex float, param_allow_holes boolean DEFAULT false) RETURNS geometry AS\r
 $$\r
        DECLARE\r
                var_convhull geometry := ST_ConvexHull(param_geom);\r
@@ -5222,13 +5222,6 @@ $$
        END;\r
 $$\r
 LANGUAGE 'plpgsql' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION ST_ConcaveHull(param_geom geometry, param_pctconvex float)\r
-       RETURNS geometry AS\r
-$$\r
-       SELECT ST_ConcaveHull($1, $2, false);\r
-$$\r
-LANGUAGE 'sql' IMMUTABLE STRICT;\r
 -- ST_ConcaveHull and Helper functions end here --\r
 \r
 -----------------------------------------------------------------------\r

diff --git a/postgis/postgis_drop.sql.in.c b/postgis/postgis_drop.sql.in.c
index 82862667ce54c2c918d8219d504a8dee6f529cbe..be60d483768e9c94536b00109b08916f976fc679 100644 (file)
--- a/postgis/postgis_drop.sql.in.c
+++ b/postgis/postgis_drop.sql.in.c
@@ -33,6 +33,7 @@ DROP FUNCTION IF EXISTS st_box3d(box2d);
 DROP FUNCTION IF EXISTS st_box(box3d);
 DROP FUNCTION IF EXISTS st_box3d(geometry);
 DROP FUNCTION IF EXISTS st_box(geometry);
+DROP FUNCTION IF EXISTS ST_ConcaveHull(geometry,float); -- this one changed to use default parameters
 DROP FUNCTION IF EXISTS st_text(geometry);
 DROP FUNCTION IF EXISTS st_geometry(box2d);
 DROP FUNCTION IF EXISTS st_geometry(box3d);