fixed name of line constructor as documentation reports it.

LineFromMultiPoint().

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

diff --git a/doc/postgis.xml b/doc/postgis.xml
index 4c6cfb97a2f7f3f6e606fb94b72ac7ac2eda2a28..f28dea72a385db0128a64bb51896380b7aa4e0bf 100644 (file)
--- a/doc/postgis.xml
+++ b/doc/postgis.xml
@@ -3734,6 +3734,31 @@ FROM geometry_table;</literallayout>
                    <para>Creates a LineString from a MultiPoint geometry.</para>
                  </listitem>
                </varlistentry>
+
+               <varlistentry>
+                 <term>Collect(geometry set)</term>
+
+                 <listitem>
+                   <para>This function returns a GEOMETRYCOLLECTION or a MULTI object from a set
+                   of geometries. The collect() function is an "aggregate" function
+                   in the terminology of PostgreSQL. That means that it operators on
+                   lists of data, in the same way the sum() and mean() functions do.
+                   For example, "SELECT COLLECT(GEOM) FROM GEOMTABLE GROUP BY
+                   ATTRCOLUMN" will return a separate GEOMETRYCOLLECTION for each
+                   distinct value of ATTRCOLUMN.</para>
+                 </listitem>
+               </varlistentry>
+
+               <varlistentry>
+                 <term>Collect(geometry, geometry)</term>
+
+                 <listitem>
+                   <para>This function returns a geometry being a collection
+                   of two input geometries. Output type can be a MULTI* or 
+                   a GEOMETRYCOLLECTION.</para>
+                 </listitem>
+               </varlistentry>
+
          </variablelist>
       </sect2>
 
@@ -3790,30 +3815,6 @@ FROM geometry_table;</literallayout>
                    distance() queries, to add an index filter to the query.</para>
                  </listitem>
                </varlistentry>
-
-               <varlistentry>
-                 <term>collect(geometry set)</term>
-
-                 <listitem>
-                   <para>This function returns a GEOMETRYCOLLECTION object from a set
-                   of geometries. The collect() function is an "aggregate" function
-                   in the terminology of PostgreSQL. That means that it operators on
-                   lists of data, in the same way the sum() and mean() functions do.
-                   For example, "SELECT COLLECT(GEOM) FROM GEOMTABLE GROUP BY
-                   ATTRCOLUMN" will return a separate GEOMETRYCOLLECTION for each
-                   distinct value of ATTRCOLUMN.</para>
-                 </listitem>
-               </varlistentry>
-
-               <varlistentry>
-                 <term>memcollect(geometry set)</term>
-
-                 <listitem>
-                   <para>This does the the same of collect(geometry), only more
-                   memory-friendly (uses less memory and more processor time).</para>
-                 </listitem>
-               </varlistentry>
-
         <varlistentry>
           <term>extent(geometry set)</term>
 

diff --git a/lwgeom/lwpostgis.sql.in b/lwgeom/lwpostgis.sql.in
index a1e522f7aef49add9aa2cb038a1fa9ac0ff9600c..bb6eb981d109c3026cc6e6799e209742073d4a47 100644 (file)
--- a/lwgeom/lwpostgis.sql.in
+++ b/lwgeom/lwpostgis.sql.in
@@ -1692,7 +1692,7 @@ CREATEFUNCTION makeline_garray (geometry[])
        AS '@MODULE_FILENAME@', 'LWGEOM_makeline_garray'
        LANGUAGE 'C';
 
-CREATEFUNCTION line_from_multipoint(geometry)
+CREATEFUNCTION LineFromMultiPoint(geometry)
        RETURNS geometry
        AS '@MODULE_FILENAME@', 'LWGEOM_makeline'
        LANGUAGE 'C';