[postgis-commits] svn - r3617 - in trunk/doc: . xsl

[postgis-commits at postgis.refractions.net]

Author: robe
Date: 2009-02-02 10:26:53 -0800 (Mon, 02 Feb 2009)
New Revision: 3617

Modified:
   trunk/doc/reference_new.xml
   trunk/doc/xsl/postgis_gardentest.sql.xsl
Log:
Typo in docs confusing gardentester. Also change ST_Collect use to ST_Union so we are testing with valid polygons (reduces union intersection error messages)

Modified: trunk/doc/reference_new.xml
===================================================================
--- trunk/doc/reference_new.xml	2009-02-02 18:06:53 UTC (rev 3616)
+++ trunk/doc/reference_new.xml	2009-02-02 18:26:53 UTC (rev 3617)
@@ -1693,7 +1693,7 @@
 
 		  <funcprototype>
 			<funcdef>geometry <function>ST_LineFromWKB</function></funcdef>
-			<paramdef><type>bytea </type> <parameter>WKT</parameter></paramdef>
+			<paramdef><type>bytea </type> <parameter>WKB</parameter></paramdef>
 			<paramdef><type>integer </type> <parameter>srid</parameter></paramdef>
 		  </funcprototype>
 		</funcsynopsis>

Modified: trunk/doc/xsl/postgis_gardentest.sql.xsl
===================================================================
--- trunk/doc/xsl/postgis_gardentest.sql.xsl	2009-02-02 18:06:53 UTC (rev 3616)
+++ trunk/doc/xsl/postgis_gardentest.sql.xsl	2009-02-02 18:26:53 UTC (rev 3617)
@@ -89,7 +89,7 @@
 			CROSS JOIN generate_series(40,70, 15) As j
 			WHERE NOT(i = j)) As s)</pgis:gset>
 			
-		<pgis:gset ID='MultiPolySet' GeometryType='POLYGON'>(SELECT ST_Collect(ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j))  As the_geom 
+		<pgis:gset ID='MultiPolySet' GeometryType='POLYGON'>(SELECT ST_Multi(ST_Union(ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j)))  As the_geom 
 		FROM generate_series(-10,50,10) As i 
 			CROSS JOIN generate_series(40,70, 20) As j)</pgis:gset>
 			
@@ -99,13 +99,13 @@
 			CROSS JOIN generate_series(1,3) k
 			)</pgis:gset>
 			
-		<pgis:gset ID='MultiLineSet3D' GeometryType='MULTILINESTRING'>(SELECT ST_Collect(ST_SetSRID(ST_MakeLine(ST_MakePoint(i,j,k), ST_MakePoint(i+k,j+k,k)),4326)) As the_geom 
+		<pgis:gset ID='MultiLineSet3D' GeometryType='MULTILINESTRING'>(SELECT ST_Multi(ST_Union(ST_SetSRID(ST_MakeLine(ST_MakePoint(i,j,k), ST_MakePoint(i+k,j+k,k)),4326))) As the_geom 
 		FROM generate_series(-10,50,20) As i 
 			CROSS JOIN generate_series(40,70, 20) j
 			CROSS JOIN generate_series(1,2) k
 			)</pgis:gset>
 			
-		<pgis:gset ID='MultiPolySet3D' GeometryType='MULTIPOLYGON'>(SELECT ST_Collect(s.the_geom) As the_geom
+		<pgis:gset ID='MultiPolySet3D' GeometryType='MULTIPOLYGON'>(SELECT ST_Multi(ST_Union(s.the_geom)) As the_geom
 		FROM (SELECT ST_MakePolygon(ST_AddPoint(ST_AddPoint(ST_MakeLine(ST_SetSRID(ST_MakePointM(i+m,j,m),4326),ST_SetSRID(ST_MakePointM(j+m,i-m,m),4326)),ST_SetSRID(ST_MakePointM(i,j,m),4326)),ST_SetSRID(ST_MakePointM(i+m,j,m),4326)))  As the_geom 
 		FROM generate_series(-10,50,20) As i 
 			CROSS JOIN generate_series(50,70, 20) As j
@@ -125,7 +125,7 @@
 			CROSS JOIN generate_series(1,2) As m
 			WHERE NOT(i = j)) As s)</pgis:gset>
 			
-		<pgis:gset ID='MultiPolygonMSet' GeometryType='MULTIPOLYGONM'>(SELECT ST_Collect(ST_MakePolygon(ST_AddPoint(ST_AddPoint(ST_MakeLine(ST_SetSRID(ST_MakePointM(i+m,j,m),4326),ST_SetSRID(ST_MakePointM(j+m,i-m,m),4326)),ST_SetSRID(ST_MakePointM(i,j,m),4326)),ST_SetSRID(ST_MakePointM(i+m,j,m),4326))))  As the_geom 
+		<pgis:gset ID='MultiPolygonMSet' GeometryType='MULTIPOLYGONM'>(SELECT ST_Multi(ST_Union(ST_MakePolygon(ST_AddPoint(ST_AddPoint(ST_MakeLine(ST_SetSRID(ST_MakePointM(i+m,j,m),4326),ST_SetSRID(ST_MakePointM(j+m,i-m,m),4326)),ST_SetSRID(ST_MakePointM(i,j,m),4326)),ST_SetSRID(ST_MakePointM(i+m,j,m),4326)))))  As the_geom 
 		FROM generate_series(-10,50,20) As i 
 			CROSS JOIN generate_series(50,70, 20) As j
 			CROSS JOIN generate_series(1,2) As m