Changed testing of extent geometry

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

diff --git a/raster/test/regress/loader/Tiled8x8.select.expected b/raster/test/regress/loader/Tiled8x8.select.expected
index 1ce118fc04837bfb79c133384bb1cc415614f3b8..5dac569548f5e46936b24c067f47492f2d00c413 100644 (file)
--- a/raster/test/regress/loader/Tiled8x8.select.expected
+++ b/raster/test/regress/loader/Tiled8x8.select.expected
@@ -1,4 +1,4 @@
-0|1.0000000000|-1.0000000000|8|8|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{f,f,f}|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))
+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

diff --git a/raster/test/regress/loader/Tiled8x8.select.sql b/raster/test/regress/loader/Tiled8x8.select.sql
index a4767052c762742de8e1f6b27c64946b29273f39..25c943490d9c0fa39d031dc6ff6e5d1f29cc769e 100644 (file)
--- a/raster/test/regress/loader/Tiled8x8.select.sql
+++ b/raster/test/regress/loader/Tiled8x8.select.sql
@@ -1,4 +1,19 @@
-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
+       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_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)
+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;