From dc568e069e88b2301e4728cbd5ec80874be7d36e Mon Sep 17 00:00:00 2001 From: Bborie Park Date: Fri, 14 Dec 2012 20:25:45 +0000 Subject: [PATCH] Quiet down ST_SameAlignment(raster, raster) as it was way too talkative git-svn-id: http://svn.osgeo.org/postgis/trunk@10827 b70326c6-7e19-0410-871a-916f4a2858ee --- raster/rt_pg/rt_pg.c | 3 ++- raster/test/regress/rt_asraster_expected | 7 ------- raster/test/regress/rt_gdalwarp_expected | 16 ---------------- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/raster/rt_pg/rt_pg.c b/raster/rt_pg/rt_pg.c index 50e7b9a06..968cce5c5 100644 --- a/raster/rt_pg/rt_pg.c +++ b/raster/rt_pg/rt_pg.c @@ -13167,7 +13167,8 @@ Datum RASTER_sameAlignment(PG_FUNCTION_ARGS) PG_RETURN_NULL(); } - if (reason != NULL) + /* only output reason if not aligned */ + if (reason != NULL && !aligned) elog(NOTICE, "%s", reason); PG_RETURN_BOOL(aligned); diff --git a/raster/test/regress/rt_asraster_expected b/raster/test/regress/rt_asraster_expected index 8fde45d6c..79b1cd977 100644 --- a/raster/test/regress/rt_asraster_expected +++ b/raster/test/regress/rt_asraster_expected @@ -10,13 +10,6 @@ NOTICE: The geometry's SRID (993310) is not the same as the raster's SRID (9921 NOTICE: The geometry's SRID (993310) is not the same as the raster's SRID (992163). The geometry will be transformed to the raster's projection NOTICE: The geometry's SRID (993310) is not the same as the raster's SRID (992163). The geometry will be transformed to the raster's projection NOTICE: The geometry's SRID (993310) is not the same as the raster's SRID (992163). The geometry will be transformed to the raster's projection -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned NOTICE: The rasters have different scales on the X axis NOTICE: The rasters have different scales on the X axis NOTICE: The rasters have different scales on the X axis diff --git a/raster/test/regress/rt_gdalwarp_expected b/raster/test/regress/rt_gdalwarp_expected index 75ba9623a..08cf1eee3 100644 --- a/raster/test/regress/rt_gdalwarp_expected +++ b/raster/test/regress/rt_gdalwarp_expected @@ -112,23 +112,7 @@ NOTICE: Values must be provided for both X and Y when specifying the scale. Re 5.7|992163|10|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600991.000|t|t|t 5.8|992163|10|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600001.000|t|t|t 5.9|992163|10|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600009.000|t|t|t -NOTICE: The rasters are aligned NOTICE: The rasters (pixel corner coordinates) are not aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned -NOTICE: The rasters are aligned t|f|t 1|0|0|500|500|1|-1|0|0|0|1 2|0|0|500|100|1|-1|0|0|0|1 -- 2.40.0