More documentation changes regarding deprecation status of

ST_MapAlgebraFct() variants. Added news item regarding deprecation status of ST_MapAlgebraFct and ST_MapAlgebraFctNgb variants

git-svn-id: http://svn.osgeo.org/postgis/trunk@10420 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/NEWS b/NEWS
index b1abe3318eb3902cb7442474de24cf846288af00..c9ef5375e6da4c4d1b501c4bcd8b99eb29494d9e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ PostGIS 2.1.0
 * Deprecated signatures
 
   - ST_Estimated_Extent renamed to ST_EstimatedExtent
+  - ST_MapAlgebraFctNgb and 1 and 2 raster variants of ST_MapAlgebraFct.
+    Use ST_MapAlgebra instead
 
 * New Features *
 

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index 089aad6cf498131ac84817f687da1aafafe92605..499f2cb878b3c2ad0b73f3e5ab974fb25fd3b874 100644 (file)
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -7253,6 +7253,7 @@ FROM dummy_rast;
                                <para>Returns the hypothetical illumination of an elevation raster band using the azimuth, altitude, brightness, and elevation scale inputs. Utilizes map algebra and applies the hill shade equation to neighboring pixels.</para>
                                <para>The hill shade equation is: <programlisting>max_bright * ( (cos(zenith)*cos(slope)) + (sin(zenith)*sin(slope)*cos(azimuth - aspect)) )</programlisting>.</para>
                                <para>Availability: 2.0.0 </para>
+                               <para>Enhanced: 2.1.0 Uses <xref linkend="RT_ST_MapAlgebra" /> and runs <xref linkend="RT_ST_InvDistWeight4ma" /> before running the hillshade operation</para>
                        
                        </refsection>
                                
@@ -7264,7 +7265,7 @@ FROM dummy_rast;
 
                        <refsection>
                                <title>See Also</title>
-                               <para><xref linkend="RT_ST_MapAlgebraFctNgb" /></para>
+                               <para><xref linkend="RT_ST_MapAlgebra" /></para>
                 <para><xref linkend="RT_ST_Aspect" /></para>
                 <para><xref linkend="RT_ST_Slope" /></para>
                        </refsection>
@@ -7318,6 +7319,7 @@ FROM dummy_rast;
                 <para>The equation for the pixel aspect of cell E is: atan2((((G + 2H + I) - (A + 2B + C))  / 8), -(((C + 2F + I) - (A + 2D + G)) / 8))</para>
 
                                <para>Availability: 2.0.0 </para>
+                               <para>Enhanced: 2.1.0 Uses <xref linkend="RT_ST_MapAlgebra" /> and runs <xref linkend="RT_ST_InvDistWeight4ma" /> before running the hillshade operation</para>
                        
                        </refsection>
                                
@@ -7329,7 +7331,7 @@ FROM dummy_rast;
 
                        <refsection>
                                <title>See Also</title>
-                               <para><xref linkend="RT_ST_MapAlgebraFctNgb" /></para>
+                               <para><xref linkend="RT_ST_MapAlgebra" /></para>
                 <para><xref linkend="RT_ST_HillShade" /></para>
                 <para><xref linkend="RT_ST_Slope" /></para>
                        </refsection>
@@ -7383,6 +7385,7 @@ FROM dummy_rast;
                 <para>The equation for the pixel slope of cell E is: atan(sqrt(((c + 2f + i) - (a + 2d + g) / 8)^2 + (((g + 2h + i) - (a + 2b + c)) / 8) ^ 2))</para>
 
                                <para>Availability: 2.0.0 </para>
+                               <para>Enhanced: 2.1.0 Uses <xref linkend="RT_ST_MapAlgebra" /> and runs <xref linkend="RT_ST_InvDistWeight4ma" /> before running the hillshade operation</para>
                        
                        </refsection>
                                
@@ -7394,7 +7397,7 @@ FROM dummy_rast;
 
                        <refsection>
                                <title>See Also</title>
-                               <para><xref linkend="RT_ST_MapAlgebraFctNgb" /></para>
+                               <para><xref linkend="RT_ST_MapAlgebra" /></para>
                 <para><xref linkend="RT_ST_HillShade" /></para>
                 <para><xref linkend="RT_ST_Aspect" /></para>
                        </refsection>
@@ -7667,13 +7670,11 @@ CREATE OR REPLACE FUNCTION sample_callbackfunc(value double precision[][][], pos
                                        Variant 4 operate upon two rasters with one band per raster. See example Variant 4.
                                </para>
 
-<!-- enable once these functions are deprecated
                                <warning>
                                        <para>
-                                               The functions <xref linkend="RT_ST_MapAlgebraExpr" />, <xref linkend="RT_ST_MapAlgebraExpr2" />, <xref linkend="RT_ST_MapAlgebraFct" />, <xref linkend="RT_ST_MapAlgebraFct2" /> and <xref linkend="RT_ST_MapAlgebraFctNgb" /> are deprecated as of PostGIS 2.1.0 and use of these functions are strongly discouraged. These functions will be removed from PostGIS as of 2.2.0.
+                                               The functions <!--<xref linkend="RT_ST_MapAlgebraExpr" />, <xref linkend="RT_ST_MapAlgebraExpr2" />, --><xref linkend="RT_ST_MapAlgebraFct" />, <xref linkend="RT_ST_MapAlgebraFct2" /> and <xref linkend="RT_ST_MapAlgebraFctNgb" /> are deprecated as of PostGIS 2.1.0 and use of these functions are strongly discouraged. These functions may be removed in a future version of PostGIS.
                                        </para>
                                </warning>
--->
 
                                <para>Availability: 2.1.0</para>
 
@@ -8348,6 +8349,12 @@ FROM prunion;</programlisting>
 
                 <note><para>The <type>text[]</type> argument to the <varname>userfunction</varname> is required, regardless of whether you choose to pass any arguments to your user function for processing or not.</para></note>
 
+                               <warning>
+                                       <para>
+                                               <xref linkend="RT_ST_MapAlgebraFct" /> is deprecated as of 2.1.0. Use <xref linkend="RT_ST_MapAlgebra" /> instead.
+                                       </para>
+                               </warning>
+
                                <para>Availability: 2.0.0</para>
                        </refsection>
 
@@ -8542,6 +8549,12 @@ WHERE rid=167;
 
                 <note><para>The <type>text[]</type> argument to the <varname>tworastuserfunc</varname> is required, regardless of whether you choose to pass any arguments to your user function for processing or not.</para></note>
 
+                               <warning>
+                                       <para>
+                                               <xref linkend="RT_ST_MapAlgebraFct2" /> is deprecated as of 2.1.0. Use <xref linkend="RT_ST_MapAlgebra" /> instead.
+                                       </para>
+                               </warning>
+
                                <para>Availability: 2.0.0</para>
                        </refsection>
 
@@ -8758,6 +8771,13 @@ SELECT ST_MapAlgebraFct(m1.rast, 1, m1.rast, 3,
                                                <listitem><para>Arguments to pass into the user function.</para></listitem>
                                        </varlistentry>
                                </variablelist>
+
+                               <warning>
+                                       <para>
+                                               <xref linkend="RT_ST_MapAlgebraFctNgb" /> is deprecated as of 2.1.0. Use <xref linkend="RT_ST_MapAlgebra" /> instead.
+                                       </para>
+                               </warning>
+
                        <para>Availability: 2.0.0 </para>
                        
                
@@ -9129,40 +9149,71 @@ WHERE ST_Intersects(rast,  ST_GeomFromText('LINESTRING(230486 887771, 230500 887
        </sect1>
 
        <sect1 id="Raster_Processing_Builtin_Functions">
-       <title>Raster Processing Builtin Functions</title>
-        <refentry id="RT_ST_Min4ma">
+               <title>Raster Processing Builtin Functions</title>
+               <refentry id="RT_ST_Min4ma">
                        <refnamediv>
                                <refname>ST_Min4ma</refname>
-                               <refpurpose>Raster processing function that calculates the minimum pixel value in a neighborhood.</refpurpose>
+                               <refpurpose>
+                                       Raster processing function that calculates the minimum pixel value in a neighborhood.
+                               </refpurpose>
                        </refnamediv>
                
                        <refsynopsisdiv>
                                <funcsynopsis>
-                                 <funcprototype>
-                                       <funcdef>float8 <function>ST_Min4ma</function></funcdef>
-                                       <paramdef><type>float8[][]</type> <parameter>matrix</parameter></paramdef>
-                    <paramdef><type>text </type> <parameter>nodatamode</parameter></paramdef>
-                    <paramdef><type>text[]</type> <parameter>VARIADIC args</parameter></paramdef>
-                                 </funcprototype>
+                                       <funcprototype>
+                                               <funcdef>float8 <function>ST_Min4ma</function></funcdef>
+                                               <paramdef><type>float8[][]</type> <parameter>matrix</parameter></paramdef>
+                                               <paramdef><type>text </type> <parameter>nodatamode</parameter></paramdef>
+                                               <paramdef><type>text[]</type> <parameter>VARIADIC args</parameter></paramdef>
+                                       </funcprototype>
+
+                                       <funcprototype>
+                                               <funcdef>double precision <function>ST_Min4ma</function></funcdef>
+                                               <paramdef><type>double precision[][][]</type> <parameter>value</parameter></paramdef>
+                                               <paramdef><type>integer[][] </type> <parameter>pos</parameter></paramdef>
+                                               <paramdef><type>text[]</type> <parameter>VARIADIC userargs</parameter></paramdef>
+                                       </funcprototype>
                                </funcsynopsis>
                        </refsynopsisdiv>
-               
+
                        <refsection>
                                <title>Description</title>
 
-                <para>Calculate the minimum pixel value in a neighborhood of pixels.</para>
-                       
-                <note>
-                    <para>This function is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
-                </note>
+                               <para>
+                                       Calculate the minimum pixel value in a neighborhood of pixels.
+                               </para>
 
-                <para>Availability: 2.0.0</para>
-            </refsection>
-                               
-                               <refsection>
-                                       <title>Examples</title>
-                               
-                                       <programlisting>SELECT 
+                               <para>
+                                       For Variant 2, a substitution value for NODATA pixels can be specified by passing that value to userargs.
+                               </para>
+
+                               <note>
+                                       <para>
+                                               Variant 1 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.
+                                       </para>
+                               </note>
+
+                               <note>
+                                       <para>
+                                               Variant 2 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebra" />.
+                                       </para>
+                               </note>
+
+                               <warning>
+                                       <para>
+                                               Use of Variant 1 is discouraged since <xref linkend="RT_ST_MapAlgebraFctNgb" /> has been deprecated as of 2.1.0.
+                                       </para>
+                               </warning>
+
+                               <para>Availability: 2.0.0</para>
+                               <para>Enhanced: 2.1.0 Addition of Variant 2</para>
+                       </refsection>
+
+                       <refsection>
+                               <title>Examples</title>
+
+                               <programlisting>
+SELECT 
     rid,
     st_value(
         st_mapalgebrafctngb(rast, 1, NULL, 1, 1, 'st_min4ma(float[][],text,text[])'::regprocedure, 'ignore', NULL), 2, 2
@@ -9174,20 +9225,20 @@ WHERE rid = 2;
    2 |      250
 (1 row)
                                </programlisting>
-                       
                        </refsection>
                
                        <refsection>
                                <title>See Also</title>
                                <para>
-                    <xref linkend="RT_ST_MapAlgebraFctNgb" />,
-                    <xref linkend="RT_ST_Max4ma" />,
-                    <xref linkend="RT_ST_Sum4ma" />,
-                    <xref linkend="RT_ST_Mean4ma" />,
-                    <xref linkend="RT_ST_Range4ma" />,
-                    <xref linkend="RT_ST_Distinct4ma" />
-                    <xref linkend="RT_ST_StdDev4ma" />
-                </para>
+                                       <xref linkend="RT_ST_MapAlgebraFctNgb" />, 
+                                       <xref linkend="RT_ST_MapAlgebra" />, 
+                                       <xref linkend="RT_ST_Max4ma" />, 
+                                       <xref linkend="RT_ST_Sum4ma" />,
+                                       <xref linkend="RT_ST_Mean4ma" />, 
+                                       <xref linkend="RT_ST_Range4ma" />, 
+                                       <xref linkend="RT_ST_Distinct4ma" />, 
+                                       <xref linkend="RT_ST_StdDev4ma" />
+                               </para>
                        </refsection>
                </refentry>
 
@@ -9205,6 +9256,13 @@ WHERE rid = 2;
                     <paramdef><type>text</type> <parameter>nodatamode</parameter></paramdef>
                     <paramdef><type>text[]</type> <parameter>VARIADIC args</parameter></paramdef>
                                  </funcprototype>
+
+                                       <funcprototype>
+                                               <funcdef>double precision <function>ST_Max4ma</function></funcdef>
+                                               <paramdef><type>double precision[][][]</type> <parameter>value</parameter></paramdef>
+                                               <paramdef><type>integer[][] </type> <parameter>pos</parameter></paramdef>
+                                               <paramdef><type>text[]</type> <parameter>VARIADIC userargs</parameter></paramdef>
+                                       </funcprototype>
                                </funcsynopsis>
                        </refsynopsisdiv>
                
@@ -9213,11 +9271,28 @@ WHERE rid = 2;
 
                 <para>Calculate the maximum pixel value in a neighborhood of pixels.</para>
                        
+                               <para>
+                                       For Variant 2, a substitution value for NODATA pixels can be specified by passing that value to userargs.
+                               </para>
+
                 <note>
-                    <para>This function is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
+                    <para>Variant 1 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
                 </note>
 
+                               <note>
+                                       <para>
+                                               Variant 2 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebra" />.
+                                       </para>
+                               </note>
+
+                               <warning>
+                                       <para>
+                                               Use of Variant 1 is discouraged since <xref linkend="RT_ST_MapAlgebraFctNgb" /> has been deprecated as of 2.1.0.
+                                       </para>
+                               </warning>
+
                 <para>Availability: 2.0.0</para>
+                               <para>Enhanced: 2.1.0 Addition of Variant 2</para>
             </refsection>
                                
                                <refsection>
@@ -9241,14 +9316,15 @@ WHERE rid = 2;
                        <refsection>
                                <title>See Also</title>
                                <para>
-                    <xref linkend="RT_ST_MapAlgebraFctNgb" />,
-                    <xref linkend="RT_ST_Min4ma" />,
-                    <xref linkend="RT_ST_Sum4ma" />,
-                    <xref linkend="RT_ST_Mean4ma" />,
-                    <xref linkend="RT_ST_Range4ma" />,
-                    <xref linkend="RT_ST_Distinct4ma" />
-                    <xref linkend="RT_ST_StdDev4ma" />
-                </para>
+                                       <xref linkend="RT_ST_MapAlgebraFctNgb" />, 
+                                       <xref linkend="RT_ST_MapAlgebra" />, 
+                                       <xref linkend="RT_ST_Min4ma" />, 
+                                       <xref linkend="RT_ST_Sum4ma" />, 
+                                       <xref linkend="RT_ST_Mean4ma" />, 
+                                       <xref linkend="RT_ST_Range4ma" />, 
+                                       <xref linkend="RT_ST_Distinct4ma" />, 
+                                       <xref linkend="RT_ST_StdDev4ma" />
+                               </para>
                        </refsection>
                </refentry>
 
@@ -9266,6 +9342,13 @@ WHERE rid = 2;
                     <paramdef><type>text</type> <parameter>nodatamode</parameter></paramdef>
                     <paramdef><type>text[]</type> <parameter>VARIADIC args</parameter></paramdef>
                                  </funcprototype>
+
+                                       <funcprototype>
+                                               <funcdef>double precision <function>ST_Sum4ma</function></funcdef>
+                                               <paramdef><type>double precision[][][]</type> <parameter>value</parameter></paramdef>
+                                               <paramdef><type>integer[][] </type> <parameter>pos</parameter></paramdef>
+                                               <paramdef><type>text[]</type> <parameter>VARIADIC userargs</parameter></paramdef>
+                                       </funcprototype>
                                </funcsynopsis>
                        </refsynopsisdiv>
                
@@ -9274,11 +9357,28 @@ WHERE rid = 2;
 
                 <para>Calculate the sum of all pixel values in a neighborhood of pixels.</para>
                        
+                               <para>
+                                       For Variant 2, a substitution value for NODATA pixels can be specified by passing that value to userargs.
+                               </para>
+
                 <note>
-                    <para>This function is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
+                    <para>Variant 1 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
                 </note>
 
+                               <note>
+                                       <para>
+                                               Variant 2 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebra" />.
+                                       </para>
+                               </note>
+
+                               <warning>
+                                       <para>
+                                               Use of Variant 1 is discouraged since <xref linkend="RT_ST_MapAlgebraFctNgb" /> has been deprecated as of 2.1.0.
+                                       </para>
+                               </warning>
+
                 <para>Availability: 2.0.0</para>
+                               <para>Enhanced: 2.1.0 Addition of Variant 2</para>
             </refsection>
                                
                                <refsection>
@@ -9302,14 +9402,15 @@ WHERE rid = 2;
                        <refsection>
                                <title>See Also</title>
                                <para>
-                    <xref linkend="RT_ST_MapAlgebraFctNgb" />,
-                    <xref linkend="RT_ST_Min4ma" />,
-                    <xref linkend="RT_ST_Max4ma" />,
-                    <xref linkend="RT_ST_Mean4ma" />,
-                    <xref linkend="RT_ST_Range4ma" />,
-                    <xref linkend="RT_ST_Distinct4ma" />
-                    <xref linkend="RT_ST_StdDev4ma" />
-                </para>
+                                       <xref linkend="RT_ST_MapAlgebraFctNgb" />, 
+                                       <xref linkend="RT_ST_MapAlgebra" />, 
+                                       <xref linkend="RT_ST_Min4ma" />, 
+                                       <xref linkend="RT_ST_Max4ma" />, 
+                                       <xref linkend="RT_ST_Mean4ma" />, 
+                                       <xref linkend="RT_ST_Range4ma" />, 
+                                       <xref linkend="RT_ST_Distinct4ma" />, 
+                                       <xref linkend="RT_ST_StdDev4ma" />
+                               </para>
                        </refsection>
                </refentry>
 
@@ -9327,6 +9428,13 @@ WHERE rid = 2;
                     <paramdef><type>text</type> <parameter>nodatamode</parameter></paramdef>
                     <paramdef><type>text[]</type> <parameter>VARIADIC args</parameter></paramdef>
                                  </funcprototype>
+
+                                       <funcprototype>
+                                               <funcdef>double precision <function>ST_Mean4ma</function></funcdef>
+                                               <paramdef><type>double precision[][][]</type> <parameter>value</parameter></paramdef>
+                                               <paramdef><type>integer[][] </type> <parameter>pos</parameter></paramdef>
+                                               <paramdef><type>text[]</type> <parameter>VARIADIC userargs</parameter></paramdef>
+                                       </funcprototype>
                                </funcsynopsis>
                        </refsynopsisdiv>
                
@@ -9335,11 +9443,28 @@ WHERE rid = 2;
 
                 <para>Calculate the mean pixel value in a neighborhood of pixels.</para>
                        
+                               <para>
+                                       For Variant 2, a substitution value for NODATA pixels can be specified by passing that value to userargs.
+                               </para>
+
                 <note>
-                    <para>This function is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
+                    <para>Variant 1 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
                 </note>
 
+                               <note>
+                                       <para>
+                                               Variant 2 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebra" />.
+                                       </para>
+                               </note>
+
+                               <warning>
+                                       <para>
+                                               Use of Variant 1 is discouraged since <xref linkend="RT_ST_MapAlgebraFctNgb" /> has been deprecated as of 2.1.0.
+                                       </para>
+                               </warning>
+
                 <para>Availability: 2.0.0</para>
+                               <para>Enhanced: 2.1.0 Addition of Variant 2</para>
             </refsection>
                                
                                <refsection>
@@ -9363,13 +9488,14 @@ WHERE rid = 2;
                        <refsection>
                                <title>See Also</title>
                                <para>
-                    <xref linkend="RT_ST_MapAlgebraFctNgb" />,
-                    <xref linkend="RT_ST_Min4ma" />,
-                    <xref linkend="RT_ST_Max4ma" />,
-                    <xref linkend="RT_ST_Sum4ma" />,
-                    <xref linkend="RT_ST_Range4ma" />,
-                    <xref linkend="RT_ST_StdDev4ma" />
-                </para>
+                                       <xref linkend="RT_ST_MapAlgebraFctNgb" />, 
+                                       <xref linkend="RT_ST_MapAlgebra" />, 
+                                       <xref linkend="RT_ST_Min4ma" />, 
+                                       <xref linkend="RT_ST_Max4ma" />, 
+                                       <xref linkend="RT_ST_Sum4ma" />, 
+                                       <xref linkend="RT_ST_Range4ma" />, 
+                                       <xref linkend="RT_ST_StdDev4ma" />
+                               </para>
                        </refsection>
                </refentry>
 
@@ -9387,6 +9513,13 @@ WHERE rid = 2;
                     <paramdef><type>text</type> <parameter>nodatamode</parameter></paramdef>
                     <paramdef><type>text[]</type> <parameter>VARIADIC args</parameter></paramdef>
                                  </funcprototype>
+
+                                       <funcprototype>
+                                               <funcdef>double precision <function>ST_Range4ma</function></funcdef>
+                                               <paramdef><type>double precision[][][]</type> <parameter>value</parameter></paramdef>
+                                               <paramdef><type>integer[][] </type> <parameter>pos</parameter></paramdef>
+                                               <paramdef><type>text[]</type> <parameter>VARIADIC userargs</parameter></paramdef>
+                                       </funcprototype>
                                </funcsynopsis>
                        </refsynopsisdiv>
                
@@ -9395,11 +9528,28 @@ WHERE rid = 2;
 
                 <para>Calculate the range of pixel values in a neighborhood of pixels.</para>
                        
+                               <para>
+                                       For Variant 2, a substitution value for NODATA pixels can be specified by passing that value to userargs.
+                               </para>
+
                 <note>
-                    <para>This function is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
+                    <para>Variant 1 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
                 </note>
 
+                               <note>
+                                       <para>
+                                               Variant 2 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebra" />.
+                                       </para>
+                               </note>
+
+                               <warning>
+                                       <para>
+                                               Use of Variant 1 is discouraged since <xref linkend="RT_ST_MapAlgebraFctNgb" /> has been deprecated as of 2.1.0.
+                                       </para>
+                               </warning>
+
                 <para>Availability: 2.0.0</para>
+                               <para>Enhanced: 2.1.0 Addition of Variant 2</para>
             </refsection>
                                
                                <refsection>
@@ -9423,14 +9573,15 @@ WHERE rid = 2;
                        <refsection>
                                <title>See Also</title>
                                <para>
-                    <xref linkend="RT_ST_MapAlgebraFctNgb" />,
-                    <xref linkend="RT_ST_Min4ma" />,
-                    <xref linkend="RT_ST_Max4ma" />,
-                    <xref linkend="RT_ST_Sum4ma" />,
-                    <xref linkend="RT_ST_Mean4ma" />,
-                    <xref linkend="RT_ST_Distinct4ma" />
-                    <xref linkend="RT_ST_StdDev4ma" />
-                </para>
+                                       <xref linkend="RT_ST_MapAlgebraFctNgb" />, 
+                                       <xref linkend="RT_ST_MapAlgebra" />, 
+                                       <xref linkend="RT_ST_Min4ma" />, 
+                                       <xref linkend="RT_ST_Max4ma" />, 
+                                       <xref linkend="RT_ST_Sum4ma" />, 
+                                       <xref linkend="RT_ST_Mean4ma" />, 
+                                       <xref linkend="RT_ST_Distinct4ma" />, 
+                                       <xref linkend="RT_ST_StdDev4ma" />
+                               </para>
                        </refsection>
                </refentry>
         
@@ -9448,6 +9599,13 @@ WHERE rid = 2;
                     <paramdef><type>text</type> <parameter>nodatamode</parameter></paramdef>
                     <paramdef><type>text[]</type> <parameter>VARIADIC args</parameter></paramdef>
                                  </funcprototype>
+
+                                       <funcprototype>
+                                               <funcdef>double precision <function>ST_Distinct4ma</function></funcdef>
+                                               <paramdef><type>double precision[][][]</type> <parameter>value</parameter></paramdef>
+                                               <paramdef><type>integer[][] </type> <parameter>pos</parameter></paramdef>
+                                               <paramdef><type>text[]</type> <parameter>VARIADIC userargs</parameter></paramdef>
+                                       </funcprototype>
                                </funcsynopsis>
                        </refsynopsisdiv>
                
@@ -9457,10 +9615,23 @@ WHERE rid = 2;
                 <para>Calculate the number of unique pixel values in a neighborhood of pixels.</para>
                        
                 <note>
-                    <para>This function is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
+                    <para>Variant 1 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
                 </note>
 
+                               <note>
+                                       <para>
+                                               Variant 2 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebra" />.
+                                       </para>
+                               </note>
+
+                               <warning>
+                                       <para>
+                                               Use of Variant 1 is discouraged since <xref linkend="RT_ST_MapAlgebraFctNgb" /> has been deprecated as of 2.1.0.
+                                       </para>
+                               </warning>
+
                 <para>Availability: 2.0.0</para>
+                               <para>Enhanced: 2.1.0 Addition of Variant 2</para>
             </refsection>
                                
                                <refsection>
@@ -9484,13 +9655,14 @@ WHERE rid = 2;
                        <refsection>
                                <title>See Also</title>
                                <para>
-                    <xref linkend="RT_ST_MapAlgebraFctNgb" />,
-                    <xref linkend="RT_ST_Min4ma" />,
-                    <xref linkend="RT_ST_Max4ma" />,
-                    <xref linkend="RT_ST_Sum4ma" />,
-                    <xref linkend="RT_ST_Mean4ma" />,
-                    <xref linkend="RT_ST_Distinct4ma" />
-                    <xref linkend="RT_ST_StdDev4ma" />
+                                       <xref linkend="RT_ST_MapAlgebraFctNgb" />, 
+                                       <xref linkend="RT_ST_MapAlgebra" />, 
+                                       <xref linkend="RT_ST_Min4ma" />, 
+                                       <xref linkend="RT_ST_Max4ma" />, 
+                                       <xref linkend="RT_ST_Sum4ma" />, 
+                                       <xref linkend="RT_ST_Mean4ma" />, 
+                                       <xref linkend="RT_ST_Distinct4ma" />, 
+                                       <xref linkend="RT_ST_StdDev4ma" />
                 </para>
                        </refsection>
                </refentry>
@@ -9509,6 +9681,13 @@ WHERE rid = 2;
                     <paramdef><type>text </type> <parameter>nodatamode</parameter></paramdef>
                     <paramdef><type>text[]</type> <parameter>VARIADIC args</parameter></paramdef>
                                  </funcprototype>
+
+                                       <funcprototype>
+                                               <funcdef>double precision <function>ST_StdDev4ma</function></funcdef>
+                                               <paramdef><type>double precision[][][]</type> <parameter>value</parameter></paramdef>
+                                               <paramdef><type>integer[][] </type> <parameter>pos</parameter></paramdef>
+                                               <paramdef><type>text[]</type> <parameter>VARIADIC userargs</parameter></paramdef>
+                                       </funcprototype>
                                </funcsynopsis>
                        </refsynopsisdiv>
                
@@ -9518,10 +9697,23 @@ WHERE rid = 2;
                 <para>Calculate the standard deviation of pixel values in a neighborhood of pixels.</para>
                        
                 <note>
-                    <para>This function is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
+                    <para>Variant 1 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebraFctNgb" />.</para>
                 </note>
 
+                               <note>
+                                       <para>
+                                               Variant 2 is a specialized callback function for use as a callback parameter to <xref linkend="RT_ST_MapAlgebra" />.
+                                       </para>
+                               </note>
+
+                               <warning>
+                                       <para>
+                                               Use of Variant 1 is discouraged since <xref linkend="RT_ST_MapAlgebraFctNgb" /> has been deprecated as of 2.1.0.
+                                       </para>
+                               </warning>
+
                 <para>Availability: 2.0.0</para>
+                               <para>Enhanced: 2.1.0 Addition of Variant 2</para>
             </refsection>
                                
                                <refsection>
@@ -9545,14 +9737,15 @@ WHERE rid = 2;
                        <refsection>
                                <title>See Also</title>
                                <para>
-                    <xref linkend="RT_ST_MapAlgebraFctNgb" />,
-                    <xref linkend="RT_ST_Min4ma" />,
-                    <xref linkend="RT_ST_Max4ma" />,
-                    <xref linkend="RT_ST_Sum4ma" />,
-                    <xref linkend="RT_ST_Mean4ma" />,
-                    <xref linkend="RT_ST_Distinct4ma" />
-                    <xref linkend="RT_ST_StdDev4ma" />
-                </para>
+                                       <xref linkend="RT_ST_MapAlgebraFctNgb" />, 
+                                       <xref linkend="RT_ST_MapAlgebra" />, 
+                                       <xref linkend="RT_ST_Min4ma" />, 
+                                       <xref linkend="RT_ST_Max4ma" />, 
+                                       <xref linkend="RT_ST_Sum4ma" />, 
+                                       <xref linkend="RT_ST_Mean4ma" />, 
+                                       <xref linkend="RT_ST_Distinct4ma" />, 
+                                       <xref linkend="RT_ST_StdDev4ma" />
+                               </para>
                        </refsection>
                </refentry>
 
@@ -9616,7 +9809,7 @@ WHERE rid = 2;
                        <refsection>
                                <title>See Also</title>
                                <para>
-                                       <xref linkend="RT_ST_MapAlgebraFctNgb" />, 
+                                       <xref linkend="RT_ST_MapAlgebra" />, 
                                        <xref linkend="RT_ST_MinDist4ma" />
                                </para>
                        </refsection>