[postgis-commits] svn - r3397 - trunk/doc/xsl

[postgis-commits at postgis.refractions.net]

Author: robe
Date: 2008-12-13 19:10:56 -0800 (Sat, 13 Dec 2008)
New Revision: 3397

Modified:
   trunk/doc/xsl/postgis_gardentest.sql.xsl
Log:
Add logic to test for unary functions that take box2d/3d and add 3d geometries to garden set.

Modified: trunk/doc/xsl/postgis_gardentest.sql.xsl
===================================================================
--- trunk/doc/xsl/postgis_gardentest.sql.xsl	2008-12-14 01:50:44 UTC (rev 3396)
+++ trunk/doc/xsl/postgis_gardentest.sql.xsl	2008-12-14 03:10:56 UTC (rev 3397)
@@ -11,15 +11,15 @@
 	<xsl:output method="text" />
 	<pgis:gardens>
 		<pgis:gset ID='PointSet' GeometryType='POINT'>(SELECT ST_SetSRID(ST_Point(i,j),4326) As the_geom 
-		FROM generate_series(-10,50,10) As i 
-			CROSS JOIN generate_series(40,70, 10) j)</pgis:gset>
+		FROM generate_series(-10,50,15) As i 
+			CROSS JOIN generate_series(40,70, 15) j)</pgis:gset>
 		<pgis:gset ID='LineSet' GeometryType='LINESTRING'>(SELECT ST_MakeLine(ST_SetSRID(ST_Point(i,j),4326),ST_SetSRID(ST_Point(j,i),4326))  As the_geom 
 		FROM generate_series(-10,50,10) As i 
-			CROSS JOIN generate_series(40,70, 10) As j
+			CROSS JOIN generate_series(40,70, 15) As j
 			WHERE NOT(i = j))</pgis:gset>
 		<pgis:gset ID='PolySet' GeometryType='POLYGON'>(SELECT 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, 10) As j)</pgis:gset>
+			CROSS JOIN generate_series(40,70, 20) As j)</pgis:gset>
 		<pgis:gset ID='PointMSet' GeometryType='POINTM'>(SELECT ST_SetSRID(ST_MakePointM(i,j,m),4326) As the_geom 
 		FROM generate_series(-10,50,10) As i 
 			CROSS JOIN generate_series(50,70, 20) AS j
@@ -30,10 +30,24 @@
 			CROSS JOIN generate_series(1,2) As m
 			WHERE NOT(i = j))</pgis:gset>
 		<pgis:gset ID='PolygonMSet' GeometryType='POLYGONM'>(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,10) As i 
+		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
 			)</pgis:gset>
+		<pgis:gset ID='PointSet3D' GeometryType='POINT'>(SELECT ST_SetSRID(ST_MakePoint(i,j,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='LineSet3D' GeometryType='LINESTRING'>(SELECT 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='PolygonSet3D' GeometryType='POLYGON'>(SELECT ST_SetSRID(ST_MakePolygon(ST_AddPoint(ST_AddPoint(ST_MakeLine(ST_MakePoint(i+m,j,m),ST_MakePoint(j+m,i-m,m)),ST_MakePoint(i,j,m)),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)</pgis:gset>
 	</pgis:gardens>
 
 	<xsl:template match='/chapter'>
@@ -71,7 +85,7 @@
 </xsl:if>
 <!--Start Test aggregate and unary functions -->
 <!--Garden Aggregator/Unary function with input gsets test -->
-<xsl:if test="contains(paramdef/type,'geometry set') or (count(paramdef/parameter) = 1 and contains(paramdef/type, 'geometry'))">
+<xsl:if test="contains(paramdef/type,'geometry set') or (count(paramdef/parameter) = 1 and (contains(paramdef/type, 'geometry') or contains(paramdef/type, 'box')))">
 	<xsl:variable name='fnname'><xsl:value-of select="funcdef/function"/></xsl:variable>
 	<xsl:variable name='fndef'><xsl:value-of select="funcdef"/></xsl:variable>
 	<xsl:for-each select="document('')//pgis:gardens/pgis:gset">