Finish off adding multi garden geometries

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

diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index b78018f0c588a086992dc70f85ba5e46b58655de..e5ab330f82a8ce33de88c7f18b7a09b4f41df883 100644 (file)
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -89,24 +89,47 @@
                        CROSS JOIN generate_series(40,70, 15) As j\r
                        WHERE NOT(i = j)) As s)</pgis:gset>\r
                        \r
-               <pgis:gset ID='MultiPolySet' GeometryType='MULTIPOLYGON'>(SELECT ST_Collect(s.the_geom) As the_geom\r
+               <pgis:gset ID='MultiPolySet' GeometryType='POLYGON'>(SELECT ST_Collect(ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j))  As the_geom \r
+               FROM generate_series(-10,50,10) As i \r
+                       CROSS JOIN generate_series(40,70, 20) As j)</pgis:gset>\r
+                       \r
+               <pgis:gset ID='MultiPointSet3D' GeometryType='MULTIPOINT'>(SELECT ST_Collect(ST_SetSRID(ST_MakePoint(i,j,k),4326)) As the_geom \r
+               FROM generate_series(-10,50,20) As i \r
+                       CROSS JOIN generate_series(40,70, 20) j\r
+                       CROSS JOIN generate_series(1,3) k\r
+                       )</pgis:gset>\r
+                       \r
+               <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 \r
+               FROM generate_series(-10,50,20) As i \r
+                       CROSS JOIN generate_series(40,70, 20) j\r
+                       CROSS JOIN generate_series(1,2) k\r
+                       )</pgis:gset>\r
+                       \r
+               <pgis:gset ID='MultiPolySet3D' GeometryType='MULTIPOLYGON'>(SELECT ST_Collect(s.the_geom) As the_geom\r
                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 \r
                FROM generate_series(-10,50,20) As i \r
                        CROSS JOIN generate_series(50,70, 20) As j\r
                        CROSS JOIN generate_series(1,2) As m\r
                        ) As s)</pgis:gset>\r
+                       \r
                <pgis:gset ID='MultiPointMSet' GeometryType='MULTIPOINTM'>(SELECT ST_Collect(s.the_geom) As the_geom\r
                FROM (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) As s)</pgis:gset>\r
-                       \r
+                               \r
                <pgis:gset ID='MultiLineMSet' GeometryType='MULTILINESTRINGM'>(SELECT ST_Collect(s.the_geom) As the_geom\r
                FROM (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)) As s)</pgis:gset>\r
+                       \r
+               <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 \r
+               FROM generate_series(-10,50,20) As i \r
+                       CROSS JOIN generate_series(50,70, 20) As j\r
+                       CROSS JOIN generate_series(1,2) As m\r
+                       )</pgis:gset>\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