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

diff --git a/NEWS b/NEWS
index e59f3c5ae0ff3d3a2b59207da56ffc4feb4d9821..af4b9f07a234d284865d94fd77b7792568c6f911 100644 (file)
--- 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 f862189ff111fa86a9a42e62a7af461eb555ba08..b769a9339d7206e7658efe6cede901f9d2e60a0b 100644 (file)
--- 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 8b81f7b076f705f5ef772fe03bf363efd70b2a75..4a31cd08818248f1b308d9c15c19bf3839ea0e33 100644 (file)
--- 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
 -----------------------------------------------------------------------