From: Regina Obe <lr@pcorp.us>
Date: Fri, 27 May 2011 07:13:42 +0000 (+0000)
Subject: change ST_ConcaveHull to use default parameters
X-Git-Tag: 2.0.0alpha1~1548
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7e1dd5f834ea073bec5213a60a68938cdd7f7a7;p=postgis

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 7447acc58..6ee12d86f 100644
--- 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 faf40e8f3..cb8e1404e 100644
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -5071,7 +5071,7 @@ $$
 $$
   LANGUAGE plpgsql IMMUTABLE STRICT;
   
-CREATE OR REPLACE FUNCTION ST_ConcaveHull(param_geom geometry, param_pctconvex float, param_allow_holes boolean) RETURNS geometry AS
+CREATE OR REPLACE FUNCTION ST_ConcaveHull(param_geom geometry, param_pctconvex float, param_allow_holes boolean DEFAULT false) RETURNS geometry AS
 $$
 	DECLARE
 		var_convhull geometry := ST_ConvexHull(param_geom);
@@ -5222,13 +5222,6 @@ $$
 	END;
 $$
 LANGUAGE 'plpgsql' IMMUTABLE STRICT;
-
-CREATE OR REPLACE FUNCTION ST_ConcaveHull(param_geom geometry, param_pctconvex float)
-	RETURNS geometry AS
-$$
-	SELECT ST_ConcaveHull($1, $2, false);
-$$
-LANGUAGE 'sql' IMMUTABLE STRICT;
 -- ST_ConcaveHull and Helper functions end here --
 
 -----------------------------------------------------------------------
diff --git a/postgis/postgis_drop.sql.in.c b/postgis/postgis_drop.sql.in.c
index 82862667c..be60d4837 100644
--- 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);