Rearranged function arguments for ST_Tile(raster)

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

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index f5299e7e1e18f7e86079b38faf43ed0d1f5a5915..1f3c3b882d2f94773cb86f3440ca51fa1691611c 100644 (file)
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -1585,9 +1585,17 @@ FROM (SELECT rid, ST_MetaData(rast) As md
                                        <funcprototype>
                                                <funcdef>text <function>ST_Tile</function></funcdef>
                                                <paramdef><type>raster </type> <parameter>rast</parameter></paramdef>
+                                               <paramdef><type>int[] </type> <parameter>nband</parameter></paramdef>
+                                               <paramdef><type>integer </type> <parameter>width</parameter></paramdef>
+                                               <paramdef><type>integer </type> <parameter>height</parameter></paramdef>
+                                       </funcprototype>
+
+                                       <funcprototype>
+                                               <funcdef>text <function>ST_Tile</function></funcdef>
+                                               <paramdef><type>raster </type> <parameter>rast</parameter></paramdef>
+                                               <paramdef><type>integer </type> <parameter>nband</parameter></paramdef>
                                                <paramdef><type>integer </type> <parameter>width</parameter></paramdef>
                                                <paramdef><type>integer </type> <parameter>height</parameter></paramdef>
-                                               <paramdef choice="opt"><type>int[] </type> <parameter>nband=NULL</parameter></paramdef>
                                        </funcprototype>
 
                                        <funcprototype>
@@ -1595,7 +1603,6 @@ FROM (SELECT rid, ST_MetaData(rast) As md
                                                <paramdef><type>raster </type> <parameter>rast</parameter></paramdef>
                                                <paramdef><type>integer </type> <parameter>width</parameter></paramdef>
                                                <paramdef><type>integer </type> <parameter>height</parameter></paramdef>
-                                               <paramdef><type>int </type> <parameter>nband</parameter></paramdef>
                                        </funcprototype>
 
                                </funcsynopsis>

diff --git a/raster/rt_pg/rtpostgis.sql.in.c b/raster/rt_pg/rtpostgis.sql.in.c
index 3e899e13a15437733e5a3b91d6ff3cff7fc153e1..6f7ec96ba47f57659b15818c7b35debd31214a9d 100644 (file)
--- a/raster/rt_pg/rtpostgis.sql.in.c
+++ b/raster/rt_pg/rtpostgis.sql.in.c
@@ -3966,7 +3966,7 @@ CREATE OR REPLACE FUNCTION st_setgeoreference(rast raster, georef text, format t
 -- ST_Tile(raster)
 -----------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION st_tile(
+CREATE OR REPLACE FUNCTION _st_tile(
        rast raster,
        width integer, height integer,
        nband int[] DEFAULT NULL
@@ -3975,13 +3975,28 @@ CREATE OR REPLACE FUNCTION st_tile(
        AS 'MODULE_PATHNAME','RASTER_tile'
        LANGUAGE 'c' IMMUTABLE;
 
+CREATE OR REPLACE FUNCTION st_tile(
+       rast raster, nband integer[],
+       width integer, height integer
+)
+       RETURNS SETOF raster
+       AS $$ SELECT _st_tile($1, $3, $4, $2) $$
+       LANGUAGE 'sql' IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION st_tile(
+       rast raster, nband integer,
+       width integer, height integer
+)
+       RETURNS SETOF raster
+       AS $$ SELECT _st_tile($1, $3, $4, ARRAY[$2]::integer[]) $$
+       LANGUAGE 'sql' IMMUTABLE;
+
 CREATE OR REPLACE FUNCTION st_tile(
        rast raster,
-       width integer, height integer,
-       nband int
+       width integer, height integer
 )
        RETURNS SETOF raster
-       AS $$ SELECT st_tile($1, $2, $3, ARRAY[$4]::int[]) $$
+       AS $$ SELECT _st_tile($1, $2, $3, NULL::integer[]) $$
        LANGUAGE 'sql' IMMUTABLE;
 
 -----------------------------------------------------------------------

diff --git a/raster/rt_pg/rtpostgis_drop.sql.in.c b/raster/rt_pg/rtpostgis_drop.sql.in.c
index 5641cde2373a5f03c39faa9943c1c6da9ce57b7f..7ee777773277dc379e65c9465e6c3f631543fba2 100644 (file)
--- a/raster/rt_pg/rtpostgis_drop.sql.in.c
+++ b/raster/rt_pg/rtpostgis_drop.sql.in.c
@@ -436,3 +436,7 @@ DROP FUNCTION IF EXISTS st_addband(raster, raster[], integer);
 DROP FUNCTION IF EXISTS st_slope(raster, integer, text);
 DROP FUNCTION IF EXISTS st_aspect(raster, integer, text);
 DROP FUNCTION IF EXISTS st_hillshade(raster, integer, text, float, float, float, float);
+
+-- function no longer exists
+DROP FUNCTION IF EXISTS st_tile(raster, integer, integer, integer[]);
+DROP FUNCTION IF EXISTS st_tile(raster, integer, integer, integer);

diff --git a/raster/test/regress/rt_tile.sql b/raster/test/regress/rt_tile.sql
index 7c86c638f9b76a24cf09f8f288092f2747260efe..c8e4ec9f48823f466ec573e9ea762d9acb97a01b 100644 (file)
--- a/raster/test/regress/rt_tile.sql
+++ b/raster/test/regress/rt_tile.sql
@@ -23,21 +23,21 @@ SELECT
 FROM foo;
 
 WITH foo AS (
-       SELECT ST_Tile(rast, 3, 3, ARRAY[1]) AS rast FROM raster_tile
+       SELECT ST_Tile(rast, ARRAY[1], 3, 3) AS rast FROM raster_tile
 )
 SELECT
        2, ST_DumpValues(rast)
 FROM foo;
 
 WITH foo AS (
-       SELECT ST_Tile(rast, 3, 3, ARRAY[2, 1]) AS rast FROM raster_tile
+       SELECT ST_Tile(rast, ARRAY[2, 1], 3, 3) AS rast FROM raster_tile
 )
 SELECT
        3, ST_DumpValues(rast)
 FROM foo;
 
 WITH foo AS (
-       SELECT ST_Tile(rast, 3, 3, 2) AS rast FROM raster_tile
+       SELECT ST_Tile(rast, 2, 3, 3) AS rast FROM raster_tile
 )
 SELECT
        4, ST_DumpValues(rast)