Changes between Version 164 and Version 165 of WKTRaster/SpecificationWorking03

Timestamp:

Nov 7, 2011, 9:25:46 PM (13 years ago)

Author:

Bborie Park

Comment:

—

WKTRaster/SpecificationWorking03

@@ -1446 +1446 @@
 
 
-1. ST_MapAlgebra2Expr(
+1. ST_MapAlgebraExpr(
         rast1 raster, band1 integer,[[BR]]
         rast2 raster, band2 integer,[[BR]]
@@ -1476 +1476 @@
 
 {{{
-ST_MapAlgebra2Expr(r1.rast, 1, r2.rast, 2, 'rast1', '32BF', 'INTERSECTION')
-
-ST_MapAlgebra2Expr(r1.rast, 1, r2.rast, 2, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL)
-
-ST_MapAlgebra2Expr(r1.rast, 1, r2.rast, 2, 'CASE WHEN rast2 IS NOT NULL THEN NULL ELSE rast1 END', '32BF', 'FIRST', NULL, 'rast1', NULL)
-
-ST_MapAlgebra2Expr(r1.rast, 1, r2.rast, 2, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL)
-}}}
-
-2. ST_MapAlgebra2Expr(
+ST_MapAlgebraExpr(r1.rast, 1, r2.rast, 2, 'rast1', '32BF', 'INTERSECTION')
+
+ST_MapAlgebraExpr(r1.rast, 1, r2.rast, 2, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL)
+
+ST_MapAlgebraExpr(r1.rast, 1, r2.rast, 2, 'CASE WHEN rast2 IS NOT NULL THEN NULL ELSE rast1 END', '32BF', 'FIRST', NULL, 'rast1', NULL)
+
+ST_MapAlgebraExpr(r1.rast, 1, r2.rast, 2, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL)
+}}}
+
+2. ST_MapAlgebraExpr(
         rast1 raster,[[BR]]
         rast2 raster,[[BR]]
@@ -1495 +1495 @@
 
 {{{
-ST_MapAlgebra2Expr(r1.rast, r2.rast, 'rast1', '32BF', 'INTERSECTION')
-
-ST_MapAlgebra2Expr(r1.rast, r2.rast, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL)
-
-ST_MapAlgebra2Expr(r1.rast, r2.rast, 'CASE WHEN rast2 IS NOT NULL THEN NULL ELSE rast1 END', '32BF', 'FIRST', NULL, 'rast1', NULL)
-
-ST_MapAlgebra2Expr(r1.rast, r2.rast, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL)
+ST_MapAlgebraExpr(r1.rast, r2.rast, 'rast1', '32BF', 'INTERSECTION')
+
+ST_MapAlgebraExpr(r1.rast, r2.rast, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL)
+
+ST_MapAlgebraExpr(r1.rast, r2.rast, 'CASE WHEN rast2 IS NOT NULL THEN NULL ELSE rast1 END', '32BF', 'FIRST', NULL, 'rast1', NULL)
+
+ST_MapAlgebraExpr(r1.rast, r2.rast, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL)
 }}}