Changes between Version 164 and Version 165 of WKTRaster/SpecificationWorking03

Show
Ignore:
Timestamp:
11/07/11 21:25:46 (20 months ago)
Author:
dustymugs
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WKTRaster/SpecificationWorking03

    v164 v165  
    14461446 
    14471447 
    1448 1. ST_MapAlgebra2Expr( 
     14481. ST_MapAlgebraExpr( 
    14491449        rast1 raster, band1 integer,[[BR]] 
    14501450        rast2 raster, band2 integer,[[BR]] 
     
    14761476 
    14771477{{{ 
    1478 ST_MapAlgebra2Expr(r1.rast, 1, r2.rast, 2, 'rast1', '32BF', 'INTERSECTION') 
    1479  
    1480 ST_MapAlgebra2Expr(r1.rast, 1, r2.rast, 2, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL) 
    1481  
    1482 ST_MapAlgebra2Expr(r1.rast, 1, r2.rast, 2, 'CASE WHEN rast2 IS NOT NULL THEN NULL ELSE rast1 END', '32BF', 'FIRST', NULL, 'rast1', NULL) 
    1483  
    1484 ST_MapAlgebra2Expr(r1.rast, 1, r2.rast, 2, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL) 
    1485 }}} 
    1486  
    1487 2. ST_MapAlgebra2Expr( 
     1478ST_MapAlgebraExpr(r1.rast, 1, r2.rast, 2, 'rast1', '32BF', 'INTERSECTION') 
     1479 
     1480ST_MapAlgebraExpr(r1.rast, 1, r2.rast, 2, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL) 
     1481 
     1482ST_MapAlgebraExpr(r1.rast, 1, r2.rast, 2, 'CASE WHEN rast2 IS NOT NULL THEN NULL ELSE rast1 END', '32BF', 'FIRST', NULL, 'rast1', NULL) 
     1483 
     1484ST_MapAlgebraExpr(r1.rast, 1, r2.rast, 2, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL) 
     1485}}} 
     1486 
     14872. ST_MapAlgebraExpr( 
    14881488        rast1 raster,[[BR]] 
    14891489        rast2 raster,[[BR]] 
     
    14951495 
    14961496{{{ 
    1497 ST_MapAlgebra2Expr(r1.rast, r2.rast, 'rast1', '32BF', 'INTERSECTION') 
    1498  
    1499 ST_MapAlgebra2Expr(r1.rast, r2.rast, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL) 
    1500  
    1501 ST_MapAlgebra2Expr(r1.rast, r2.rast, 'CASE WHEN rast2 IS NOT NULL THEN NULL ELSE rast1 END', '32BF', 'FIRST', NULL, 'rast1', NULL) 
    1502  
    1503 ST_MapAlgebra2Expr(r1.rast, r2.rast, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL) 
     1497ST_MapAlgebraExpr(r1.rast, r2.rast, 'rast1', '32BF', 'INTERSECTION') 
     1498 
     1499ST_MapAlgebraExpr(r1.rast, r2.rast, '((rast1 + rast2)/2.)::numeric', '32BF', 'UNION', 'rast2', 'rast1', NULL) 
     1500 
     1501ST_MapAlgebraExpr(r1.rast, r2.rast, 'CASE WHEN rast2 IS NOT NULL THEN NULL ELSE rast1 END', '32BF', 'FIRST', NULL, 'rast1', NULL) 
     1502 
     1503ST_MapAlgebraExpr(r1.rast, r2.rast, 'CASE WHEN rast1 IS NOT NULL THEN NULL ELSE rast2 END', '32BF', 'SECOND', 'rast2', NULL, NULL) 
    15041504}}} 
    15051505