Tweaked tests to use new variants of ST_AddBand and ST_SetValues

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

diff --git a/raster/test/regress/rt_band.sql b/raster/test/regress/rt_band.sql
index f01bcca43aec0c30a87ecc6f4178c987da6caf73..748a907ef8b67c86ced501b48f8b007b43c6b5c8 100644 (file)
--- a/raster/test/regress/rt_band.sql
+++ b/raster/test/regress/rt_band.sql
@@ -4,14 +4,12 @@ SELECT ST_Value(ST_Band(ST_AddBand(ST_MakeEmptyRaster(200, 200, 10, 10, 2, 2, 0,
 SELECT ST_Value(
        ST_Band(
                ST_AddBand(
-                       ST_AddBand(
-                               ST_AddBand(
-                                       ST_MakeEmptyRaster(200, 200, 10, 10, 2, 2, 0, 0,0)
-                                       , 1, '64BF', 1234.5678, NULL
-                               )
-                               , '64BF', 987.654321, NULL
-                       )
-                       , '64BF', 9876.54321, NULL
+                       ST_MakeEmptyRaster(200, 200, 10, 10, 2, 2, 0, 0,0),
+                       ARRAY[
+                               ROW(1, '64BF', 1234.5678, NULL),
+                               ROW(NULL, '64BF', 987.654321, NULL),
+                               ROW(NULL, '64BF', 9876.54321, NULL)
+                       ]::addbandarg[]
                ),
                ARRAY[1]
        ),
@@ -19,14 +17,12 @@ SELECT ST_Value(
 SELECT ST_Value(
        ST_Band(
                ST_AddBand(
-                       ST_AddBand(
-                               ST_AddBand(
-                                       ST_MakeEmptyRaster(200, 200, 10, 10, 2, 2, 0, 0,0)
-                                       , 1, '64BF', 1234.5678, NULL
-                               )
-                               , '64BF', 987.654321, NULL
-                       )
-                       , '64BF', 9876.54321, NULL
+                       ST_MakeEmptyRaster(200, 200, 10, 10, 2, 2, 0, 0,0),
+                       ARRAY[
+                               ROW(1, '64BF', 1234.5678, NULL),
+                               ROW(NULL, '64BF', 987.654321, NULL),
+                               ROW(NULL, '64BF', 9876.54321, NULL)
+                       ]::addbandarg[]
                ),
                ARRAY[2]
        ),
@@ -34,14 +30,12 @@ SELECT ST_Value(
 SELECT ST_Value(
        ST_Band(
                ST_AddBand(
-                       ST_AddBand(
-                               ST_AddBand(
-                                       ST_MakeEmptyRaster(200, 200, 10, 10, 2, 2, 0, 0,0)
-                                       , 1, '64BF', 1234.5678, NULL
-                               )
-                               , '64BF', 987.654321, NULL
-                       )
-                       , '64BF', 9876.54321, NULL
+                       ST_MakeEmptyRaster(200, 200, 10, 10, 2, 2, 0, 0,0),
+                       ARRAY[
+                               ROW(1, '64BF', 1234.5678, NULL),
+                               ROW(NULL, '64BF', 987.654321, NULL),
+                               ROW(NULL, '64BF', 9876.54321, NULL)
+                       ]::addbandarg[]
                ),
                ARRAY[3]
        ),
@@ -49,14 +43,12 @@ SELECT ST_Value(
 SELECT ST_Value(
        ST_Band(
                ST_AddBand(
-                       ST_AddBand(
-                               ST_AddBand(
-                                       ST_MakeEmptyRaster(200, 200, 10, 10, 2, 2, 0, 0,0)
-                                       , 1, '64BF', 1234.5678, NULL
-                               )
-                               , '64BF', 987.654321, NULL
-                       )
-                       , '64BF', 9876.54321, NULL
+                       ST_MakeEmptyRaster(200, 200, 10, 10, 2, 2, 0, 0,0),
+                       ARRAY[
+                               ROW(1, '64BF', 1234.5678, NULL),
+                               ROW(NULL, '64BF', 987.654321, NULL),
+                               ROW(NULL, '64BF', 9876.54321, NULL)
+                       ]::addbandarg[]
                ),
                1
        ),
@@ -79,14 +71,12 @@ SELECT ST_Value(
 SELECT ST_Value(
        ST_Band(
                ST_AddBand(
-                       ST_AddBand(
-                               ST_AddBand(
-                                       ST_MakeEmptyRaster(200, 200, 10, 10, 2, 2, 0, 0,0)
-                                       , 1, '64BF', 1234.5678, NULL
-                               )
-                               , '64BF', 987.654321, NULL
-                       )
-                       , '64BF', 9876.54321, NULL
+                       ST_MakeEmptyRaster(200, 200, 10, 10, 2, 2, 0, 0,0),
+                       ARRAY[
+                               ROW(1, '64BF', 1234.5678, NULL),
+                               ROW(NULL, '64BF', 987.654321, NULL),
+                               ROW(NULL, '64BF', 9876.54321, NULL)
+                       ]::addbandarg[]
                ),
                3
        ),

diff --git a/raster/test/regress/rt_nearestvalue.sql b/raster/test/regress/rt_nearestvalue.sql
index e4d0b2112a9d8c5091874916af3d2f4132eec551..bdb4cac8aad3c7e1e036c041a760bbb002e14874 100644 (file)
--- a/raster/test/regress/rt_nearestvalue.sql
+++ b/raster/test/regress/rt_nearestvalue.sql
@@ -11,15 +11,19 @@ CREATE OR REPLACE FUNCTION make_test_raster()
                x int;
                y int;
                rast raster;
+               valset double precision[][];
        BEGIN
                rast := ST_MakeEmptyRaster(width, height, 0, 0, 1, -1, 0, 0, 0);
                rast := ST_AddBand(rast, 1, '8BUI', 1, 0);
 
+
+               valset := array_fill(0., ARRAY[height, width]);
                FOR y IN 1..height LOOP
                        FOR x IN 1..width LOOP
-                               rast := ST_SetValue(rast, x, y, 2 * x + (1/3) * y);
+                               valset[y][x] := 2 * x + (1/3) * y;
                        END LOOP;
                END LOOP;
+               rast := ST_SetValues(rast, 1, 1, 1, valset);
 
                rast := ST_SetValue(rast, 1, 1, 0);
                rast := ST_SetValue(rast, 4, 1, 0);