From 482ee4174ab4571509e4c88f0c5349fbae6bd113 Mon Sep 17 00:00:00 2001
From: Bborie Park <bkpark at ucdavis.edu>
Date: Thu, 20 Jun 2013 15:57:37 +0000
Subject: [PATCH] Added missing signatures for ST_TPI(), ST_TRI() and
 ST_Roughness

git-svn-id: http://svn.osgeo.org/postgis/trunk@11552 b70326c6-7e19-0410-871a-916f4a2858ee
---
 NEWS                          |  2 ++
 doc/reference_raster.xml      |  6 +++---
 raster/rt_pg/rtpostgis.sql.in | 24 ++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index e59f3c5ae..af4b9f07a 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ PostGIS 2.2.0
 
  * Enhancements *
 
+  - Added missing variants of ST_TPI(), ST_TRI() and ST_Roughness()
+
  * Bug Fixes *
 
 PostGIS 2.1.0
diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index f862189ff..b769a9339 100644
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -11476,7 +11476,7 @@ GROUP BY t1.rast;
 							<paramdef><type>raster </type> <parameter>rast</parameter></paramdef>
 							<paramdef><type>integer </type> <parameter>nband</parameter></paramdef>
 							<paramdef><type>raster </type> <parameter>customextent</parameter></paramdef>
-							<paramdef choice="opt"><type>text </type> <parameter>pixeltype="32BF"</parameter> </paramdef>
+							<paramdef choice="opt"><type>text </type> <parameter>pixeltype=32BF</parameter> </paramdef>
 							<paramdef choice="opt"><type>boolean </type> <parameter> interpolate_nodata=FALSE </parameter> </paramdef>
 						</funcprototype>
 					</funcsynopsis>
@@ -11659,7 +11659,7 @@ GROUP BY t1.rast;
 							<paramdef><type>raster </type> <parameter>rast</parameter></paramdef>
 							<paramdef><type>integer </type> <parameter>nband</parameter></paramdef>
 							<paramdef><type>raster </type> <parameter>customextent</parameter></paramdef>
-							<paramdef choice="opt"><type>text </type> <parameter>pixeltype="32BF"</parameter> </paramdef>
+							<paramdef choice="opt"><type>text </type> <parameter>pixeltype=32BF</parameter> </paramdef>
 							<paramdef choice="opt"><type>boolean </type> <parameter> interpolate_nodata=FALSE </parameter> </paramdef>
 						</funcprototype>
 					</funcsynopsis>
@@ -11709,7 +11709,7 @@ GROUP BY t1.rast;
 							<paramdef><type>raster </type> <parameter>rast</parameter></paramdef>
 							<paramdef><type>integer </type> <parameter>nband</parameter></paramdef>
 							<paramdef><type>raster </type> <parameter>customextent</parameter></paramdef>
-							<paramdef choice="opt"><type>text </type> <parameter>pixeltype="32BF"</parameter> </paramdef>
+							<paramdef choice="opt"><type>text </type> <parameter>pixeltype=32BF</parameter> </paramdef>
 							<paramdef choice="opt"><type>boolean </type> <parameter> interpolate_nodata=FALSE </parameter> </paramdef> 
 						</funcprototype>
 					</funcsynopsis>
diff --git a/raster/rt_pg/rtpostgis.sql.in b/raster/rt_pg/rtpostgis.sql.in
index 8b81f7b07..4a31cd088 100644
--- a/raster/rt_pg/rtpostgis.sql.in
+++ b/raster/rt_pg/rtpostgis.sql.in
@@ -4234,6 +4234,14 @@ CREATE OR REPLACE FUNCTION st_tpi(
 	END;
 	$$ LANGUAGE 'plpgsql' IMMUTABLE;
 
+CREATE OR REPLACE FUNCTION st_tpi(
+	rast raster, nband integer DEFAULT 1,
+	pixeltype text DEFAULT '32BF', interpolate_nodata boolean DEFAULT FALSE
+)
+	RETURNS RASTER
+	AS $$ SELECT st_tpi($1, $2, NULL::raster, $3, $4) $$
+	LANGUAGE 'sql' IMMUTABLE;
+
 -----------------------------------------------------------------------
 -- ST_Roughness
 -----------------------------------------------------------------------
@@ -4357,6 +4365,14 @@ CREATE OR REPLACE FUNCTION st_roughness(
 	END;
 	$$ LANGUAGE 'plpgsql' IMMUTABLE;
 
+CREATE OR REPLACE FUNCTION st_roughness(
+	rast raster, nband integer DEFAULT 1,
+	pixeltype text DEFAULT '32BF', interpolate_nodata boolean DEFAULT FALSE
+)
+	RETURNS RASTER
+	AS $$ SELECT st_roughness($1, $2, NULL::raster, $3, $4) $$
+	LANGUAGE 'sql' IMMUTABLE;
+
 -----------------------------------------------------------------------
 -- ST_TRI
 -----------------------------------------------------------------------
@@ -4500,6 +4516,14 @@ CREATE OR REPLACE FUNCTION st_tri(
 	END;
 	$$ LANGUAGE 'plpgsql' IMMUTABLE;
 
+CREATE OR REPLACE FUNCTION st_tri(
+	rast raster, nband integer DEFAULT 1,
+	pixeltype text DEFAULT '32BF', interpolate_nodata boolean DEFAULT FALSE
+)
+	RETURNS RASTER
+	AS $$ SELECT st_tri($1, $2, NULL::raster, $3, $4) $$
+	LANGUAGE 'sql' IMMUTABLE;
+
 -----------------------------------------------------------------------
 -- Get information about the raster
 -----------------------------------------------------------------------
-- 
2.40.0