From 8c8e5dadd5a1013b51c0fd146459943611fffe7b Mon Sep 17 00:00:00 2001 From: Bborie Park Date: Tue, 3 Jul 2012 22:29:34 +0000 Subject: [PATCH] Renamed "hasnodata" function parameter to "exclude_nodata_value" git-svn-id: http://svn.osgeo.org/postgis/trunk@10019 b70326c6-7e19-0410-871a-916f4a2858ee --- raster/rt_pg/rtpostgis.sql.in.c | 8 ++++---- raster/rt_pg/rtpostgis_drop.sql.in.c | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/raster/rt_pg/rtpostgis.sql.in.c b/raster/rt_pg/rtpostgis.sql.in.c index 4e1cf499b..2dc880255 100644 --- a/raster/rt_pg/rtpostgis.sql.in.c +++ b/raster/rt_pg/rtpostgis.sql.in.c @@ -2170,17 +2170,17 @@ CREATE OR REPLACE FUNCTION st_bandmetadata( -- Raster Pixel Accessors ----------------------------------------------------------------------- -CREATE OR REPLACE FUNCTION st_value(rast raster, band integer, x integer, y integer, hasnodata boolean DEFAULT TRUE) +CREATE OR REPLACE FUNCTION st_value(rast raster, band integer, x integer, y integer, exclude_nodata_value boolean DEFAULT TRUE) RETURNS float8 AS 'MODULE_PATHNAME','RASTER_getPixelValue' LANGUAGE 'c' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION st_value(rast raster, x integer, y integer, hasnodata boolean DEFAULT TRUE) +CREATE OR REPLACE FUNCTION st_value(rast raster, x integer, y integer, exclude_nodata_value boolean DEFAULT TRUE) RETURNS float8 AS $$ SELECT st_value($1, 1, $2, $3, $4) $$ LANGUAGE 'sql' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION st_value(rast raster, band integer, pt geometry, hasnodata boolean DEFAULT TRUE) +CREATE OR REPLACE FUNCTION st_value(rast raster, band integer, pt geometry, exclude_nodata_value boolean DEFAULT TRUE) RETURNS float8 AS $$ DECLARE @@ -2203,7 +2203,7 @@ CREATE OR REPLACE FUNCTION st_value(rast raster, band integer, pt geometry, hasn $$ LANGUAGE 'plpgsql' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION st_value(rast raster, pt geometry, hasnodata boolean DEFAULT TRUE) +CREATE OR REPLACE FUNCTION st_value(rast raster, pt geometry, exclude_nodata_value boolean DEFAULT TRUE) RETURNS float8 AS $$ SELECT st_value($1, 1, $2, $3) $$ LANGUAGE 'sql' IMMUTABLE STRICT; diff --git a/raster/rt_pg/rtpostgis_drop.sql.in.c b/raster/rt_pg/rtpostgis_drop.sql.in.c index 98a28250a..d729a21d2 100644 --- a/raster/rt_pg/rtpostgis_drop.sql.in.c +++ b/raster/rt_pg/rtpostgis_drop.sql.in.c @@ -335,3 +335,9 @@ DROP FUNCTION IF EXISTS st_intersection(raster, integer, raster, integer, text, DROP FUNCTION IF EXISTS st_intersection(raster, integer, raster, integer, regprocedure); DROP FUNCTION IF EXISTS st_intersection(raster, raster, text, regprocedure); DROP FUNCTION IF EXISTS st_intersection(raster, raster, regprocedure); + +-- parameter name change +DROP FUNCTION IF EXISTS st_value(raster, integer, integer, integer, boolean); +DROP FUNCTION IF EXISTS st_value(raster, integer, integer, boolean); +DROP FUNCTION IF EXISTS st_value(raster, integer, geometry, boolean); +DROP FUNCTION IF EXISTS st_value(raster, geometry, boolean); -- 2.40.0