add null and empty geometry collection to garden variety geometry list

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

diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index d50b01310d446e66546356554fe47d4ca4f0ecda..5773a2fb212c698370c94b5b19b3ac7eaad72d68 100644 (file)
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -13,7 +13,7 @@
        <xsl:variable name='fnexclude14'>AddGeometryColumn DropGeometryColumn DropGeometryTable</xsl:variable>\r
        <xsl:variable name='fnexclude'>AddGeometryColumn DropGeometryColumn DropGeometryTable Populate_Geometry_Columns ST_CurveToLine ST_GeoHash ST_LineCrossingDirection ST_LineToCurve ST_IsValidReason ST_ContainsProperly ST_MinimumBoundingCircle</xsl:variable>\r
        <!--This is just a place holder to state functions not supported in 1.3 or tested separately -->\r
-       \r
+\r
        <xsl:variable name='var_srid'>3395</xsl:variable>\r
        <xsl:variable name='var_position'>1</xsl:variable>\r
        <xsl:variable name='var_integer1'>3</xsl:variable>\r
@@ -36,7 +36,7 @@
                <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\r
                FROM generate_series(-10,50,10) As i\r
                        CROSS JOIN generate_series(40,70, 15) As j\r
-                       WHERE NOT(i = j) \r
+                       WHERE NOT(i = j)\r
                        ORDER BY i, i*j)</pgis:gset>\r
                <pgis:gset ID='PolySet' GeometryType='POLYGON'>(SELECT ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j)  As the_geom\r
                FROM generate_series(-10,50,10) As i\r
@@ -45,13 +45,13 @@
                <pgis:gset ID='PointMSet' GeometryType='POINTM'>(SELECT ST_SetSRID(ST_MakePointM(i,j,m),4326) As the_geom\r
                FROM generate_series(-10,50,10) As i\r
                        CROSS JOIN generate_series(50,70, 20) AS j\r
-                       CROSS JOIN generate_series(1,2) As m \r
+                       CROSS JOIN generate_series(1,2) As m\r
                        ORDER BY i, j, i*j*m)</pgis:gset>\r
                <pgis:gset ID='LineMSet' GeometryType='LINESTRINGM'>(SELECT ST_MakeLine(ST_SetSRID(ST_MakePointM(i,j,m),4326),ST_SetSRID(ST_MakePointM(j,i,m),4326))  As the_geom\r
                FROM generate_series(-10,50,10) As i\r
                        CROSS JOIN generate_series(50,70, 20) As j\r
                        CROSS JOIN generate_series(1,2) As m\r
-                       WHERE NOT(i = j) \r
+                       WHERE NOT(i = j)\r
                        ORDER BY i, j, m, i*j*m)</pgis:gset>\r
                <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\r
                FROM generate_series(-10,50,20) As i\r
@@ -137,7 +137,15 @@
                        CROSS JOIN generate_series(1,2) As m\r
                        )</pgis:gset>\r
 \r
-       \r
+               <!--This are special case geometries -->\r
+               <pgis:gset ID="Empty" GeometryType="GEOMETRY">(SELECT ST_GeomFromText('GEOMETRYCOLLECTION EMPTY',4326) As the_geom\r
+                       UNION ALL SELECT ST_GeomFromText('POLYGON EMPTY',4326) As the_geom\r
+               )\r
+               </pgis:gset>\r
+\r
+               <pgis:gset ID="NULL" GeometryType="GEOMETRY">(SELECT CAST(Null As geometry) As the_geom)\r
+\r
+\r
        <!-- TODO: Finish off MULTI list -->\r
        </pgis:gardens>\r
        <!--This is just a placeholder to hold geometries that will crash server when hitting against some functions\r