From: Sandro Santilli <strk@keybit.net>
Date: Thu, 28 Oct 2004 07:56:12 +0000 (+0000)
Subject: fixed name of line constructor as documentation reports it.
X-Git-Tag: pgis_1_0_0RC1~234
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7b666a227e21bc84d87ecae99fae08690bab6c8;p=postgis

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 4c6cfb97a..f28dea72a 100644
--- 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 a1e522f7a..bb6eb981d 100644
--- 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';