self-hosted/postgis
self-hosted/postgis
1
0
Fork 0
mirror of https://git.osgeo.org/gitea/postgis/postgis synced 2024-10-24 00:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed ST_MapAlgebra2Expr to ST_MapAlgebra after concensus with Pierre and Regina.

Browse source 
git-svn-id: http://svn.osgeo.org/postgis/trunk@8111 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Bborie Park 2011-11-08 05:27:51 +00:00
parent 4a340dd97c
commit 53e28c2724
5 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
raster/rt_pg/rtpostgis.sql.in.c
View file

@ -1663,7 +1663,7 @@ CREATE OR REPLACE FUNCTION st_mapalgebrafct(rast raster, userfunction regprocedu
-----------------------------------------------------------------------
-- Two Raster ST_MapAlgebra
-----------------------------------------------------------------------
CREATE OR REPLACE FUNCTION st_mapalgebra2expr(
CREATE OR REPLACE FUNCTION st_mapalgebraexpr(
rast1 raster, band1 integer,
rast2 raster, band2 integer,
expression text,
@ -1674,7 +1674,7 @@ CREATE OR REPLACE FUNCTION st_mapalgebra2expr(
AS 'MODULE_PATHNAME', 'RASTER_mapAlgebra2Expr'
LANGUAGE 'C' IMMUTABLE;
CREATE OR REPLACE FUNCTION st_mapalgebra2expr(
CREATE OR REPLACE FUNCTION st_mapalgebraexpr(
rast1 raster,
rast2 raster,
expression text,
@ -1682,7 +1682,7 @@ CREATE OR REPLACE FUNCTION st_mapalgebra2expr(
nodata1expr text DEFAULT NULL, nodata2expr text DEFAULT NULL, nodatanodataval double precision DEFAULT NULL
)
RETURNS raster
AS $$ SELECT st_mapalgebra2expr($1, 1, $2, 1, $3, $4, $5, $6, $7, $8) $$
AS $$ SELECT st_mapalgebraexpr($1, 1, $2, 1, $3, $4, $5, $6, $7, $8) $$
LANGUAGE 'SQL' IMMUTABLE;
-----------------------------------------------------------------------

2
raster/test/regress/Makefile.in
View file

@ -88,7 +88,7 @@ TEST_UTILITY = \
create_rt_mapalgebra_test.sql \
rt_mapalgebraexpr.sql \
rt_mapalgebrafct.sql \
rt_mapalgebra2expr.sql \
rt_mapalgebraexpr_2raster.sql \
rt_reclass.sql \
rt_resample.sql \
rt_asraster.sql \

2
raster/test/regress/rt_mapalgebraexpr.sql
View file

@ -15,7 +15,7 @@ SELECT ST_Value(rast, 1, 1), ST_Value(ST_MapAlgebraExpr(rast, 1, NULL, 'rast + 2
-- Test 'rast' expression
SELECT ST_Value(rast, 1, 1), ST_Value(ST_MapAlgebraExpr(rast, 1, NULL, 'rast', 2), 1, 1) FROM ST_TestRaster(0, 0, -1) rast;
SELECT ST_Value(rast, 1, 1), ST_Value(ST_MapAlgebraExpr(ST_SetBandNoDataValue(rast, NULL), 1, NULL, 'rast', NULL), 1, 1) FROM ST_TestRaster(0, 0, -1) rast;
SELECT ST_Value(rast, 1, 1), ST_Value(ST_MapAlgebraExpr(ST_SetBandNoDataValue(rast, NULL), 1, NULL, 'rast'), 1, 1) FROM ST_TestRaster(0, 0, -1) rast;
-- Test pixeltype
SELECT ST_Value(rast, 1, 1), ST_Value(ST_MapAlgebraExpr(rast, 1, '4BUI', 'rast + 20', 2), 1, 1) FROM ST_TestRaster(0, 0, 100) rast;

40
raster/test/regress/rt_mapalgebra2expr.sql → raster/test/regress/rt_mapalgebraexpr_2raster.sql
View file

@ -55,7 +55,7 @@ DROP FUNCTION make_test_raster(integer, integer, integer, double precision, doub
-- INTERSECTION
INSERT INTO raster_mapalgebra_out
(SELECT r1.rid, r2.rid, 'INTERSECTION', st_mapalgebra2expr(
(SELECT r1.rid, r2.rid, 'INTERSECTION', st_mapalgebraexpr(
r1.rast, r2.rast, 'rast1', '32BF', 'INTERSECTION'
)
FROM raster_mapalgebra r1
@ -64,7 +64,7 @@ INSERT INTO raster_mapalgebra_out
WHERE r1.rid = 0
AND r2.rid BETWEEN 1 AND 9
) UNION ALL (
SELECT r1.rid, r2.rid, 'INTERSECTION', st_mapalgebra2expr(
SELECT r1.rid, r2.rid, 'INTERSECTION', st_mapalgebraexpr(
r1.rast, r2.rast, 'rast1', '32BF', 'INTERSECTION'
)
FROM raster_mapalgebra r1
@ -75,28 +75,28 @@ INSERT INTO raster_mapalgebra_out
;
INSERT INTO raster_mapalgebra_out
SELECT NULL AS rid, rid, 'INTERSECTION', st_mapalgebra2expr(
SELECT NULL AS rid, rid, 'INTERSECTION', st_mapalgebraexpr(
NULL::raster, rast, 'rast1', '32BF', 'INTERSECTION'
)
FROM raster_mapalgebra
;
INSERT INTO raster_mapalgebra_out
SELECT rid, NULL AS rid, 'INTERSECTION', st_mapalgebra2expr(
SELECT rid, NULL AS rid, 'INTERSECTION', st_mapalgebraexpr(
rast, NULL::raster, 'rast1', '32BF', 'INTERSECTION'
)
FROM raster_mapalgebra
;
INSERT INTO raster_mapalgebra_out
SELECT NULL AS rid, NULL AS rid, 'INTERSECTION', st_mapalgebra2expr(
SELECT NULL AS rid, NULL AS rid, 'INTERSECTION', st_mapalgebraexpr(
NULL::raster, NULL::raster, 'rast1', '32BF', 'INTERSECTION'
)
;
-- UNION
INSERT INTO raster_mapalgebra_out
(SELECT r1.rid, r2.rid, 'UNION', st_mapalgebra2expr(
(SELECT r1.rid, r2.rid, 'UNION', st_mapalgebraexpr(
r1.rast, r2.rast, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL
)
FROM raster_mapalgebra r1
@ -105,7 +105,7 @@ INSERT INTO raster_mapalgebra_out
WHERE r1.rid = 0
AND r2.rid BETWEEN 1 AND 9
) UNION ALL (
SELECT r1.rid, r2.rid, 'UNION', st_mapalgebra2expr(
SELECT r1.rid, r2.rid, 'UNION', st_mapalgebraexpr(
r1.rast, r2.rast, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL
)
FROM raster_mapalgebra r1
@ -116,28 +116,28 @@ INSERT INTO raster_mapalgebra_out
;
INSERT INTO raster_mapalgebra_out
SELECT NULL AS rid, rid, 'UNION', st_mapalgebra2expr(
SELECT NULL AS rid, rid, 'UNION', st_mapalgebraexpr(
NULL::raster, rast, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL
)
FROM raster_mapalgebra
;
INSERT INTO raster_mapalgebra_out
SELECT rid, NULL AS rid, 'UNION', st_mapalgebra2expr(
SELECT rid, NULL AS rid, 'UNION', st_mapalgebraexpr(
rast, NULL::raster, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL
)
FROM raster_mapalgebra
;
INSERT INTO raster_mapalgebra_out
SELECT NULL AS rid, NULL AS rid, 'UNION', st_mapalgebra2expr(
SELECT NULL AS rid, NULL AS rid, 'UNION', st_mapalgebraexpr(
NULL::raster, NULL::raster, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL
)
;
-- FIRST
INSERT INTO raster_mapalgebra_out
(SELECT r1.rid, r2.rid, 'FIRST', st_mapalgebra2expr(
(SELECT r1.rid, r2.rid, 'FIRST', st_mapalgebraexpr(
r1.rast, r2.rast, 'CASE WHEN rast2 IS NOT NULL THEN NULL ELSE rast1 END', '32BF', 'FIRST', NULL, 'rast1', NULL
)
FROM raster_mapalgebra r1
@ -146,7 +146,7 @@ INSERT INTO raster_mapalgebra_out
WHERE r1.rid = 0
AND r2.rid BETWEEN 1 AND 9
) UNION ALL (
SELECT r1.rid, r2.rid, 'FIRST', st_mapalgebra2expr(
SELECT r1.rid, r2.rid, 'FIRST', st_mapalgebraexpr(
r1.rast, r2.rast, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL
)
FROM raster_mapalgebra r1
@ -157,28 +157,28 @@ INSERT INTO raster_mapalgebra_out
;
INSERT INTO raster_mapalgebra_out
SELECT NULL AS rid, rid, 'FIRST', st_mapalgebra2expr(
SELECT NULL AS rid, rid, 'FIRST', st_mapalgebraexpr(
NULL::raster, rast, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL
)
FROM raster_mapalgebra
;
INSERT INTO raster_mapalgebra_out
SELECT rid, NULL AS rid, 'FIRST', st_mapalgebra2expr(
SELECT rid, NULL AS rid, 'FIRST', st_mapalgebraexpr(
rast, NULL::raster, 'CASE WHEN rast2 IS NOT NULL THEN NULL ELSE rast1 END', '32BF', 'FIRST', NULL, 'rast1', NULL
)
FROM raster_mapalgebra
;
INSERT INTO raster_mapalgebra_out
SELECT NULL AS rid, NULL AS rid, 'FIRST', st_mapalgebra2expr(
SELECT NULL AS rid, NULL AS rid, 'FIRST', st_mapalgebraexpr(
NULL::raster, NULL::raster, 'CASE WHEN rast2 IS NOT NULL THEN NULL ELSE rast1 END', '32BF', 'FIRST', NULL, 'rast1', NULL
)
;
-- SECOND
INSERT INTO raster_mapalgebra_out
(SELECT r1.rid, r2.rid, 'SECOND', st_mapalgebra2expr(
(SELECT r1.rid, r2.rid, 'SECOND', st_mapalgebraexpr(
r1.rast, r2.rast, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL
)
FROM raster_mapalgebra r1
@ -187,7 +187,7 @@ INSERT INTO raster_mapalgebra_out
WHERE r1.rid = 0
AND r2.rid BETWEEN 1 AND 9
) UNION ALL (
SELECT r1.rid, r2.rid, 'SECOND', st_mapalgebra2expr(
SELECT r1.rid, r2.rid, 'SECOND', st_mapalgebraexpr(
r1.rast, r2.rast, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL
)
FROM raster_mapalgebra r1
@ -198,21 +198,21 @@ INSERT INTO raster_mapalgebra_out
;
INSERT INTO raster_mapalgebra_out
SELECT NULL AS rid, rid, 'SECOND', st_mapalgebra2expr(
SELECT NULL AS rid, rid, 'SECOND', st_mapalgebraexpr(
NULL::raster, rast, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL
)
FROM raster_mapalgebra
;
INSERT INTO raster_mapalgebra_out
SELECT rid, NULL AS rid, 'SECOND', st_mapalgebra2expr(
SELECT rid, NULL AS rid, 'SECOND', st_mapalgebraexpr(
rast, NULL::raster, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL
)
FROM raster_mapalgebra
;
INSERT INTO raster_mapalgebra_out
SELECT NULL AS rid, NULL AS rid, 'SECOND', st_mapalgebra2expr(
SELECT NULL AS rid, NULL AS rid, 'SECOND', st_mapalgebraexpr(
NULL::raster, NULL::raster, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL
)
;

0
raster/test/regress/rt_mapalgebra2expr_expected → raster/test/regress/rt_mapalgebraexpr_2raster_expected
View file