add unit test for #3020. use rectangular out-db raster

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

diff --git a/raster/test/regress/load_outdb-pre.pl b/raster/test/regress/load_outdb-pre.pl
index 65b24af36f6de982ee0e3c54395baa61cd0a4abb..1592030d7309b6676039080ea002f23068bf6efb 100755 (executable)
--- a/raster/test/regress/load_outdb-pre.pl
+++ b/raster/test/regress/load_outdb-pre.pl
@@ -23,14 +23,14 @@ CREATE TABLE raster_outdb_template AS
 SELECT
        1 AS rid,
        ST_AddBand( -- insert all three bands of out-db raster at index 1
-               ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
+               ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0),
                1, '$FILERASTER'::text, NULL::int[]
        ) AS rast
 UNION ALL
 SELECT
        2 AS rid,
        ST_AddBand( -- append all three bands of out-db raster
-               ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
+               ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0),
                '$FILERASTER'::text, NULL::int[]
        ) AS rast
 UNION ALL
@@ -38,7 +38,7 @@ SELECT
        3 AS rid,
        ST_AddBand( -- append out-db band 2
                ST_AddBand( -- in-db band
-                       ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
+                       ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0),
                        1, '8BUI', 1, 0
                ),
                '$FILERASTER'::text, ARRAY[2]::int[]
@@ -48,7 +48,7 @@ SELECT
        4 AS rid,
        ST_AddBand( -- append out-db band 2
                ST_AddBand( -- in-db band
-                       ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
+                       ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0),
                        1, '8BUI', 1, 0
                ),
                '$FILERASTER'::text, ARRAY[2]::int[],

diff --git a/raster/test/regress/load_outdb-pre.sh b/raster/test/regress/load_outdb-pre.sh
index 7d4e5b1bf1d25499b40d03d45197f87acbe53f65..6b05b9e64a404b006294ed68fa4d1ef391dec15c 100755 (executable)
--- a/raster/test/regress/load_outdb-pre.sh
+++ b/raster/test/regress/load_outdb-pre.sh
@@ -21,14 +21,14 @@ CREATE TABLE raster_outdb_template AS \
 SELECT \
        1 AS rid, \
        ST_AddBand( -- insert all three bands of out-db raster at index 1 \
-               ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0), \
+               ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0), \
                1, '$FILERASTER'::text, NULL::int[] \
        ) AS rast \
 UNION ALL \
 SELECT \
        2 AS rid, \
        ST_AddBand( -- append all three bands of out-db raster \
-               ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0), \
+               ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0), \
                '$FILERASTER'::text, NULL::int[] \
        ) AS rast \
 UNION ALL \
@@ -36,7 +36,7 @@ SELECT \
        3 AS rid, \
        ST_AddBand( -- append out-db band 2 \
                ST_AddBand( \
-                       ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0), \
+                       ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0), \
                        1, '8BUI', 1, 0 \
                ), \
                '$FILERASTER'::text, ARRAY[2]::int[] \
@@ -46,7 +46,7 @@ SELECT \
        4 AS rid, \
        ST_AddBand( -- append out-db band 2 \
                ST_AddBand( \
-                       ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0), \
+                       ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0), \
                        1, '8BUI', 1, 0 \
                ), \
                '$FILERASTER'::text, ARRAY[2]::int[], \

diff --git a/raster/test/regress/loader/Basic.select.expected b/raster/test/regress/loader/Basic.select.expected
index 856d81fb0b2a58227be6f97d6dcc32e49ca76824..484721c35cb439cd4b402747a400512d2040d4b2 100644 (file)
--- a/raster/test/regress/loader/Basic.select.expected
+++ b/raster/test/regress/loader/Basic.select.expected
@@ -1,4 +1,4 @@
-0|1.0000000000|-1.0000000000|90|90|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{f,f,f}|POLYGON((0 -90,0 0,90 0,90 -90,0 -90))
+0|1.0000000000|-1.0000000000|90|50|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{f,f,f}|POLYGON((0 -50,0 0,90 0,90 -50,0 -50))
 POLYGON((0 0,1 0,1 -1,0 -1,0 0))|255
-POLYGON((89 -89,90 -89,90 -90,89 -90,89 -89))|0
-POLYGON((44 -44,45 -44,45 -45,44 -45,44 -44))|0
+POLYGON((89 -49,90 -49,90 -50,89 -50,89 -49))|0
+POLYGON((44 -24,45 -24,45 -25,44 -25,44 -24))|0

diff --git a/raster/test/regress/loader/Basic.select.sql b/raster/test/regress/loader/Basic.select.sql
index 921329d4141041d0effb9299481b87fc0268ca7c..bc0434c086406f813fbe17ebcaec8d302c1ef4de 100644 (file)
--- a/raster/test/regress/loader/Basic.select.sql
+++ b/raster/test/regress/loader/Basic.select.sql
@@ -1,4 +1,4 @@
 SELECT srid, scale_x::numeric(16, 10), scale_y::numeric(16, 10), blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values::numeric(16,10)[], out_db, ST_AsEWKT(extent) FROM raster_columns WHERE r_table_name = 'loadedrast' AND r_raster_column = 'rast';
 SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 1)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 1 AND y = 1;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 90 AND y = 90;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 45 AND y = 45;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 90 AND y = 50;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 45 AND y = 25;

diff --git a/raster/test/regress/loader/BasicCopy.select.expected b/raster/test/regress/loader/BasicCopy.select.expected
index 856d81fb0b2a58227be6f97d6dcc32e49ca76824..484721c35cb439cd4b402747a400512d2040d4b2 100644 (file)
--- a/raster/test/regress/loader/BasicCopy.select.expected
+++ b/raster/test/regress/loader/BasicCopy.select.expected
@@ -1,4 +1,4 @@
-0|1.0000000000|-1.0000000000|90|90|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{f,f,f}|POLYGON((0 -90,0 0,90 0,90 -90,0 -90))
+0|1.0000000000|-1.0000000000|90|50|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{f,f,f}|POLYGON((0 -50,0 0,90 0,90 -50,0 -50))
 POLYGON((0 0,1 0,1 -1,0 -1,0 0))|255
-POLYGON((89 -89,90 -89,90 -90,89 -90,89 -89))|0
-POLYGON((44 -44,45 -44,45 -45,44 -45,44 -44))|0
+POLYGON((89 -49,90 -49,90 -50,89 -50,89 -49))|0
+POLYGON((44 -24,45 -24,45 -25,44 -25,44 -24))|0

diff --git a/raster/test/regress/loader/BasicCopy.select.sql b/raster/test/regress/loader/BasicCopy.select.sql
index 921329d4141041d0effb9299481b87fc0268ca7c..bc0434c086406f813fbe17ebcaec8d302c1ef4de 100644 (file)
--- a/raster/test/regress/loader/BasicCopy.select.sql
+++ b/raster/test/regress/loader/BasicCopy.select.sql
@@ -1,4 +1,4 @@
 SELECT srid, scale_x::numeric(16, 10), scale_y::numeric(16, 10), blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values::numeric(16,10)[], out_db, ST_AsEWKT(extent) FROM raster_columns WHERE r_table_name = 'loadedrast' AND r_raster_column = 'rast';
 SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 1)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 1 AND y = 1;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 90 AND y = 90;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 45 AND y = 45;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 90 AND y = 50;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 45 AND y = 25;

diff --git a/raster/test/regress/loader/BasicFilename.select.expected b/raster/test/regress/loader/BasicFilename.select.expected
index e10dcacb56c2504855c3bb1afbe38fa7579a89ee..abc84600b59ba239425a538a0ce4895b10713692 100644 (file)
--- a/raster/test/regress/loader/BasicFilename.select.expected
+++ b/raster/test/regress/loader/BasicFilename.select.expected
@@ -1,5 +1,5 @@
 0|||||f|f|||||
 POLYGON((0 0,1 0,1 -1,0 -1,0 0))|255
-POLYGON((89 -89,90 -89,90 -90,89 -90,89 -89))|0
-POLYGON((44 -44,45 -44,45 -45,44 -45,44 -44))|0
+POLYGON((89 -49,90 -49,90 -50,89 -50,89 -49))|0
+POLYGON((44 -24,45 -24,45 -25,44 -25,44 -24))|0
 BasicFilename.tif

diff --git a/raster/test/regress/loader/BasicFilename.select.sql b/raster/test/regress/loader/BasicFilename.select.sql
index 9aba71db0fbfb8db34019abe1dbf89ceef431a70..78fd86c4763347efc6f521803ee40e7e019beb7f 100644 (file)
--- a/raster/test/regress/loader/BasicFilename.select.sql
+++ b/raster/test/regress/loader/BasicFilename.select.sql
@@ -1,5 +1,5 @@
 SELECT srid, scale_x::numeric(16, 10), scale_y::numeric(16, 10), blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values::numeric(16,10)[], out_db, ST_AsEWKT(extent) FROM raster_columns WHERE r_table_name = 'loadedrast' AND r_raster_column = 'rast';
 SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 1)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 1 AND y = 1;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 90 AND y = 90;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 45 AND y = 45;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 90 AND y = 50;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 45 AND y = 25;
 SELECT foobar FROM loadedrast ORDER BY foobar;

diff --git a/raster/test/regress/loader/BasicOutDB.select.expected b/raster/test/regress/loader/BasicOutDB.select.expected
index e8622fc42c40773c1eeee766985369e83f80beba..8b221774607074e11edbb2c41d331b202d973ff2 100644 (file)
--- a/raster/test/regress/loader/BasicOutDB.select.expected
+++ b/raster/test/regress/loader/BasicOutDB.select.expected
@@ -1,4 +1,4 @@
-0|1.0000000000|-1.0000000000|90|90|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{t,t,t}|POLYGON((0 -90,0 0,90 0,90 -90,0 -90))
+0|1.0000000000|-1.0000000000|90|50|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{t,t,t}|POLYGON((0 -50,0 0,90 0,90 -50,0 -50))
 POLYGON((0 0,1 0,1 -1,0 -1,0 0))|255
-POLYGON((89 -89,90 -89,90 -90,89 -90,89 -89))|0
-POLYGON((44 -44,45 -44,45 -45,44 -45,44 -44))|0
+POLYGON((89 -49,90 -49,90 -50,89 -50,89 -49))|0
+POLYGON((44 -24,45 -24,45 -25,44 -25,44 -24))|0

diff --git a/raster/test/regress/loader/BasicOutDB.select.sql b/raster/test/regress/loader/BasicOutDB.select.sql
index 455e0f3a9593e617269236eed3845a2c860b7bb8..a2567a998d32875bd21146bf5a6d555bba4b7f7b 100644 (file)
--- a/raster/test/regress/loader/BasicOutDB.select.sql
+++ b/raster/test/regress/loader/BasicOutDB.select.sql
@@ -7,5 +7,5 @@ SET postgis.gdal_enabled_drivers = 'GTiff';
 DELETE FROM loadedrast WHERE filename != 'testraster.tif';
 SELECT srid, scale_x::numeric(16, 10), scale_y::numeric(16, 10), blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values::numeric(16,10)[], out_db, ST_AsEWKT(extent) FROM raster_columns WHERE r_table_name = 'loadedrast' AND r_raster_column = 'rast';
 SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 1)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 1 AND y = 1;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 90 AND y = 90;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 45 AND y = 45;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 90 AND y = 50;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 45 AND y = 25;

diff --git a/raster/test/regress/loader/Projected.select.expected b/raster/test/regress/loader/Projected.select.expected
index 9ea740384d0abd11c95f960836f44b1e908742ba..8fe45cf035ba37fe983ab720a2c605daa818086a 100644 (file)
--- a/raster/test/regress/loader/Projected.select.expected
+++ b/raster/test/regress/loader/Projected.select.expected
@@ -1,4 +1,4 @@
 3857
--20000000
+-14500000
 3857
--20000000
+-14500000

diff --git a/raster/test/regress/loader/Projected.tif b/raster/test/regress/loader/Projected.tif
index 312692f9081dcc336dd52ba9919654a009078096..8b9c4e2f98bb3f791e7e99eb7646c40d905b46b8 100644 (file)
Binary files a/raster/test/regress/loader/Projected.tif and b/raster/test/regress/loader/Projected.tif differ

diff --git a/raster/test/regress/loader/Tiled10x10.select.expected b/raster/test/regress/loader/Tiled10x10.select.expected
index 5f882d2506c1eb84e37dbd8d0ffea3325cbc0ce6..a66411e0a155110877ecac91f49031df274d4869 100644 (file)
--- a/raster/test/regress/loader/Tiled10x10.select.expected
+++ b/raster/test/regress/loader/Tiled10x10.select.expected
@@ -1,4 +1,4 @@
-0|1.0000000000|-1.0000000000|10|10|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{f,f,f}|POLYGON((0 -90,0 0,90 0,90 -90,0 -90))
+0|1.0000000000|-1.0000000000|10|10|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{f,f,f}|POLYGON((0 -50,0 0,90 0,90 -50,0 -50))
 POLYGON((0 0,1 0,1 -1,0 -1,0 0))|255
-POLYGON((0 -80,1 -80,1 -81,0 -81,0 -80))|255
-POLYGON((80 -80,81 -80,81 -81,80 -81,80 -80))|255
+POLYGON((40 -20,41 -20,41 -21,40 -21,40 -20))|0
+POLYGON((80 -40,81 -40,81 -41,80 -41,80 -40))|198

diff --git a/raster/test/regress/loader/Tiled10x10.select.sql b/raster/test/regress/loader/Tiled10x10.select.sql
index e29fd3dc942bd7f2e0bc3cc85fc37cb196db1301..3d8cc6b7d5a2dae6af987690565712cc770a9529 100644 (file)
--- a/raster/test/regress/loader/Tiled10x10.select.sql
+++ b/raster/test/regress/loader/Tiled10x10.select.sql
@@ -1,4 +1,4 @@
 SELECT srid, scale_x::numeric(16, 10), scale_y::numeric(16, 10), blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values::numeric(16,10)[], out_db, ST_AsEWKT(extent) FROM raster_columns WHERE r_table_name = 'loadedrast' AND r_raster_column = 'rast';
 SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 1)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 1 AND y = 1;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 73) foo WHERE x = 1 AND y = 1;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 81) foo WHERE x = 1 AND y = 1;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 23) foo WHERE x = 1 AND y = 1;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 45) foo WHERE x = 1 AND y = 1;

diff --git a/raster/test/regress/loader/Tiled10x10Copy.select.expected b/raster/test/regress/loader/Tiled10x10Copy.select.expected
index 5f882d2506c1eb84e37dbd8d0ffea3325cbc0ce6..a66411e0a155110877ecac91f49031df274d4869 100644 (file)
--- a/raster/test/regress/loader/Tiled10x10Copy.select.expected
+++ b/raster/test/regress/loader/Tiled10x10Copy.select.expected
@@ -1,4 +1,4 @@
-0|1.0000000000|-1.0000000000|10|10|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{f,f,f}|POLYGON((0 -90,0 0,90 0,90 -90,0 -90))
+0|1.0000000000|-1.0000000000|10|10|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{f,f,f}|POLYGON((0 -50,0 0,90 0,90 -50,0 -50))
 POLYGON((0 0,1 0,1 -1,0 -1,0 0))|255
-POLYGON((0 -80,1 -80,1 -81,0 -81,0 -80))|255
-POLYGON((80 -80,81 -80,81 -81,80 -81,80 -80))|255
+POLYGON((40 -20,41 -20,41 -21,40 -21,40 -20))|0
+POLYGON((80 -40,81 -40,81 -41,80 -41,80 -40))|198

diff --git a/raster/test/regress/loader/Tiled10x10Copy.select.sql b/raster/test/regress/loader/Tiled10x10Copy.select.sql
index e29fd3dc942bd7f2e0bc3cc85fc37cb196db1301..3d8cc6b7d5a2dae6af987690565712cc770a9529 100644 (file)
--- a/raster/test/regress/loader/Tiled10x10Copy.select.sql
+++ b/raster/test/regress/loader/Tiled10x10Copy.select.sql
@@ -1,4 +1,4 @@
 SELECT srid, scale_x::numeric(16, 10), scale_y::numeric(16, 10), blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values::numeric(16,10)[], out_db, ST_AsEWKT(extent) FROM raster_columns WHERE r_table_name = 'loadedrast' AND r_raster_column = 'rast';
 SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 1)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 1 AND y = 1;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 73) foo WHERE x = 1 AND y = 1;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 81) foo WHERE x = 1 AND y = 1;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 23) foo WHERE x = 1 AND y = 1;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 45) foo WHERE x = 1 AND y = 1;

diff --git a/raster/test/regress/loader/Tiled8x8.select.expected b/raster/test/regress/loader/Tiled8x8.select.expected
index 5dac569548f5e46936b24c067f47492f2d00c413..a62918f1ee746b1f97837c53e8fa5c1b8587b948 100644 (file)
--- a/raster/test/regress/loader/Tiled8x8.select.expected
+++ b/raster/test/regress/loader/Tiled8x8.select.expected
@@ -1,5 +1,5 @@
 0|1.0000000000|-1.0000000000|8|8|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{f,f,f}|t
-POLYGON((88 0,89 0,89 -1,88 -1,88 0))|255
-POLYGON((88 0,89 0,89 -1,88 -1,88 0))|255
-POLYGON((0 -88,1 -88,1 -89,0 -89,0 -88))|255
-POLYGON((88 -88,89 -88,89 -89,88 -89,88 -88))|255
+POLYGON((88 0,89 0,89 -1,88 -1,88 0))|0
+POLYGON((88 0,89 0,89 -1,88 -1,88 0))|90
+POLYGON((56 -24,57 -24,57 -25,56 -25,56 -24))|255
+POLYGON((88 -48,89 -48,89 -49,88 -49,88 -48))|198

diff --git a/raster/test/regress/loader/Tiled8x8.select.sql b/raster/test/regress/loader/Tiled8x8.select.sql
index 25c943490d9c0fa39d031dc6ff6e5d1f29cc769e..59d61424545ddab70cd8ab43d3551af4e1a52c5e 100644 (file)
--- a/raster/test/regress/loader/Tiled8x8.select.sql
+++ b/raster/test/regress/loader/Tiled8x8.select.sql
@@ -10,11 +10,11 @@ SELECT
        pixel_types,
        nodata_values::numeric(16,10)[],
        out_db,
-       ST_Equals(extent, 'POLYGON((16 -90,8 -90,0 -90,0 -88,0 -80,0 -72,0 -64,0 -56,0 -48,0 -40,0 -32,0 -24,0 -16,0 -8,0 0,8 0,16 0,24 0,32 0,40 0,48 0,56 0,64 0,72 0,80 0,88 0,90 0,90 -8,90 -16,90 -24,90 -32,90 -40,90 -48,90 -56,90 -64,90 -72,90 -80,90 -88,90 -90,88 -90,80 -90,72 -90,64 -90,56 -90,48 -90,40 -90,32 -90,24 -90,16 -90))'::geometry)
+       ST_Equals(extent, 'POLYGON((0 -50,0 0,90 0,90 -50,0 -50))'::geometry)
 FROM raster_columns
 WHERE r_table_name = 'loadedrast'
        AND r_raster_column = 'rast';
 SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 1)).* FROM loadedrast WHERE rid = 12) foo WHERE x = 1 AND y = 1;
 SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 12) foo WHERE x = 1 AND y = 1;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 133) foo WHERE x = 1 AND y = 1;
-SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 144) foo WHERE x = 1 AND y = 1;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 44) foo WHERE x = 1 AND y = 1;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 84) foo WHERE x = 1 AND y = 1;

diff --git a/raster/test/regress/loader/testraster.tif b/raster/test/regress/loader/testraster.tif
index 3c3a74293be032891ec4ff518a0f2c0038e94396..2a90b092b602d62a3fd2abaf710beabdf9046b8b 100644 (file)
Binary files a/raster/test/regress/loader/testraster.tif and b/raster/test/regress/loader/testraster.tif differ

diff --git a/raster/test/regress/rt_addband.sql b/raster/test/regress/rt_addband.sql
index 17df1cde3b6716428cc3f1b3a941afe96d08de8c..9c46a70f30ce9740d24641f105fd305c8cab036e 100644 (file)
--- a/raster/test/regress/rt_addband.sql
+++ b/raster/test/regress/rt_addband.sql
@@ -223,3 +223,38 @@ SELECT
                ELSE NULL
        END
 FROM ST_BandMetadata((SELECT rast FROM raster_outdb_template WHERE rid = 4), ARRAY[]::int[]);
+
+-- #3020
+SET postgis.gdal_enabled_drivers = 'GTiff';
+SET postgis.enable_outdb_rasters = true;
+WITH foo AS (
+       SELECT
+                       path
+       FROM ST_BandMetadata(
+               (SELECT rast FROM raster_outdb_template WHERE rid = 1),
+               ARRAY[]::int[]
+       )
+       LIMIT 1
+), raster as (
+SELECT
+       ST_AddBand(
+               ST_MakeEmptyRaster(90, 90, 0., 0., 1, -1, 0, 0, 0),
+               1, foo.path, NULL::int[]
+       ) AS rast
+FROM foo
+)
+SELECT
+       ST_Value(rast, 1, 1)
+FROM raster
+UNION ALL
+SELECT
+       ST_Value(rast, 6, 45)
+FROM raster
+UNION ALL
+SELECT
+       ST_Value(rast, 90, 50)
+FROM raster
+UNION ALL
+SELECT
+       ST_Value(rast, 100, 100)
+FROM raster

diff --git a/raster/test/regress/rt_addband_expected b/raster/test/regress/rt_addband_expected
index 08d765db98e1f95057674bc590a2ffcded8e5f6c..347fdf91cab802f227bd59559106912145d65d5e 100644 (file)
--- a/raster/test/regress/rt_addband_expected
+++ b/raster/test/regress/rt_addband_expected
@@ -118,3 +118,7 @@ NOTICE:  RASTER_copyBand: Could not add band to raster. Returning original raste
 3|2|t|t
 4|1|t|t
 4|2|f|
+NOTICE:  Attempting to get pixel value with out of range raster coordinates: (99, 99)
+255
+90
+255

diff --git a/raster/test/regress/rt_utility_expected b/raster/test/regress/rt_utility_expected
index 589989e26bd7fb6c6bbe9223845f1c3974713cde..2eb99e50b0d5f18d6dc4103c370c2e13da570adb 100644 (file)
--- a/raster/test/regress/rt_utility_expected
+++ b/raster/test/regress/rt_utility_expected
@@ -37,18 +37,18 @@ Raster of 10x10 pixels has 3 bands and extent of BOX(0 -10,10 0)
     band 3 of pixtype 16BSI is in-db with no NODATA value
 Skewed raster of 10x10 pixels has 1 band and extent of BOX(0 -10,10 0.0001)
     band 1 of pixtype 8BUI is in-db with NODATA value of 0
-1|Raster of 90x90 pixels has 3 bands and extent of BOX(0 -90,90 0)
+1|Raster of 90x50 pixels has 3 bands and extent of BOX(0 -50,90 0)
     band 1 of pixtype 8BUI is out-db with no NODATA value
     band 2 of pixtype 8BUI is out-db with no NODATA value
     band 3 of pixtype 8BUI is out-db with no NODATA value
-2|Raster of 90x90 pixels has 3 bands and extent of BOX(0 -90,90 0)
+2|Raster of 90x50 pixels has 3 bands and extent of BOX(0 -50,90 0)
     band 1 of pixtype 8BUI is out-db with no NODATA value
     band 2 of pixtype 8BUI is out-db with no NODATA value
     band 3 of pixtype 8BUI is out-db with no NODATA value
-3|Raster of 90x90 pixels has 2 bands and extent of BOX(0 -90,90 0)
+3|Raster of 90x50 pixels has 2 bands and extent of BOX(0 -50,90 0)
     band 1 of pixtype 8BUI is in-db with NODATA value of 0
     band 2 of pixtype 8BUI is out-db with no NODATA value
-4|Raster of 90x90 pixels has 2 bands and extent of BOX(0 -90,90 0)
+4|Raster of 90x50 pixels has 2 bands and extent of BOX(0 -50,90 0)
     band 1 of pixtype 8BUI is out-db with NODATA value of 255
     band 2 of pixtype 8BUI is in-db with NODATA value of 0
 ms1|64