revise to test && against table and also put in some floating points to make tests...

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

diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index aa3fb20ccdfff3e1b28ecabce49c39059bf720a7..f4a18ddd94d7903e9064a746d40e877b4ec4b2a4 100644 (file)
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -30,17 +30,17 @@
        <xsl:variable name='var_matrix'>'FF1FF0102'</xsl:variable>\r
        <pgis:gardens>\r
                <pgis:gset ID='PointSet' GeometryType='POINT'>(SELECT ST_SetSRID(ST_Point(i,j),4326) As the_geom\r
-               FROM generate_series(-10,50,15) As i\r
+               FROM (SELECT a*1.11111111 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(40,70, 15) j\r
                        ORDER BY i,j\r
                        )</pgis:gset>\r
                <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
+               FROM (SELECT a*1.11111111 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(40,70, 15) As 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*0.05)  As the_geom\r
-               FROM generate_series(-10,50,10) As i\r
+               FROM (SELECT a*1.11111111 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(40,70, 20) As j\r
                        ORDER BY i, i*j, j)</pgis:gset>\r
                <pgis:gset ID='PointMSet' GeometryType='POINTM'>(SELECT ST_SetSRID(ST_MakePointM(i,j,m),4326) As the_geom\r
@@ -190,6 +190,16 @@ BEGIN;
        INSERT INTO pgis_geoggarden(the_geog)\r
        SELECT the_geom\r
        FROM (<xsl:value-of select="." />) As foo;\r
+COMMIT;\r
+       -- test operators\r
+       SELECT 'start overlap test';\r
+BEGIN;\r
+       SELECT ST_AsText(a.the_geog) As a_geog, ST_AsText(b.the_geog) As b_geog, a.the_geog &amp;&amp; b.the_geog\r
+               FROM pgis_geoggarden As a CROSS JOIN pgis_geoggarden As b\r
+               WHERE a.the_geog &amp;&amp; b.the_geog OR ST_DWithin(a.the_geog, b.the_geog,1000);\r
+COMMIT;\r
+       SELECT 'end overlap test';\r
+BEGIN; \r
        SELECT 'BEFORE DROP' As look_at, * FROM geography_columns;\r
        DROP TABLE pgis_geoggarden;\r
        SELECT 'AFTER DROP' As look_at, * FROM geography_columns;\r

diff --git a/doc/xsl/postgis_gardentest_subset.sql.xsl b/doc/xsl/postgis_gardentest_subset.sql.xsl
index f101319f7f513d92537acff5d7a09221a2fcbe4d..2eda7cb387fc036c738bcff1323db3409d45b60c 100644 (file)
--- a/doc/xsl/postgis_gardentest_subset.sql.xsl
+++ b/doc/xsl/postgis_gardentest_subset.sql.xsl
@@ -27,55 +27,55 @@
        <xsl:variable name='var_spheroid'>'SPHEROID["GRS_1980",6378137,298.257222101]'</xsl:variable>\r
        <xsl:variable name='var_matrix'>'FF1FF0102'</xsl:variable>\r
        <pgis:gardens>\r
-               <pgis:gset ID='PointSet' GeometryType='POINT'>(SELECT ST_SetSRID(ST_Point(i,j),4326) As the_geom\r
-               FROM generate_series(-10,50,15) As i\r
+       <pgis:gset ID='PointSet' GeometryType='POINT'>(SELECT ST_SetSRID(ST_Point(i,j),4326) As the_geom\r
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(40,70, 15) j\r
                        ORDER BY i,j\r
                        )</pgis:gset>\r
                <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
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(40,70, 15) As 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*0.05)  As the_geom\r
-               FROM generate_series(-10,50,10) As i\r
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(40,70, 20) As j\r
                        ORDER BY i, i*j, j)</pgis:gset>\r
                <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
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(50,70, 20) AS j\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
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(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
                        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
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(50,70, 20) As j\r
                        CROSS JOIN generate_series(1,2) As m\r
                        ORDER BY i, j, m, i*j*m\r
                        )</pgis:gset>\r
                <pgis:gset ID='PointSet3D' GeometryType='POINTZ'>(SELECT ST_SetSRID(ST_MakePoint(i,j,k),4326) As the_geom\r
-               FROM generate_series(-10,50,20) As i\r
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(40,70, 20) j\r
                        CROSS JOIN generate_series(1,2) k\r
                        ORDER BY i,i*j, j*k, i + j + k)</pgis:gset>\r
                <pgis:gset ID='LineSet3D' GeometryType='LINESTRINGZ'>(SELECT 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
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(40,70, 20) j\r
                        CROSS JOIN generate_series(1,2) k\r
                        ORDER BY i, j, i+j+k, k, i*j*k)</pgis:gset>\r
                <pgis:gset ID='PolygonSet3D' GeometryType='POLYGONZ'>(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\r
-               FROM generate_series(-10,50,20) As i\r
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(50,70, 20) As j\r
                        CROSS JOIN generate_series(1,2) As m\r
                        ORDER BY i, j, i+j+m, m, i*j*m)</pgis:gset>\r
 \r
                <pgis:gset ID='GCSet3D' GeometryType='GEOMETRYCOLLECTIONZ' SkipUnary='1'>(SELECT ST_Collect(ST_Collect(ST_SetSRID(ST_MakePoint(i,j,m),4326),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\r
-               FROM generate_series(-10,50,20) As i\r
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(50,70, 20) As j\r
                        CROSS JOIN generate_series(1,2) As m\r
                        )</pgis:gset>\r
@@ -83,49 +83,49 @@
 <!-- MULTIs start here -->\r
                <pgis:gset ID='MultiPointSet' GeometryType='MULTIPOINT'>(SELECT ST_Collect(s.the_geom) As the_geom\r
                FROM (SELECT ST_SetSRID(ST_Point(i,j),4326) As the_geom\r
-               FROM generate_series(-10,50,15) As i\r
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(40,70, 15) j\r
                        ) As s)</pgis:gset>\r
 \r
                <pgis:gset ID='MultiLineSet' GeometryType='MULTILINESTRING'>(SELECT ST_Collect(s.the_geom) As the_geom\r
                FROM (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
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        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_Multi(ST_Union(ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j*0.05)))  As the_geom\r
-               FROM generate_series(-10,50,10) As i\r
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(40,70, 25) As j)</pgis:gset>\r
 \r
                <pgis:gset ID='MultiPointSet3D' GeometryType='MULTIPOINTZ'>(SELECT ST_Collect(ST_SetSRID(ST_MakePoint(i,j,k),4326)) As the_geom\r
-               FROM generate_series(-10,50,20) As i\r
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(40,70, 25) j\r
                        CROSS JOIN generate_series(1,3) k\r
                        )</pgis:gset>\r
 \r
                <pgis:gset ID='MultiLineSet3D' GeometryType='MULTILINESTRINGZ'>(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\r
-               FROM generate_series(-10,50,20) As i\r
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(40,70, 25) j\r
                        CROSS JOIN generate_series(1,2) k\r
                        )</pgis:gset>\r
 \r
                <pgis:gset ID='MultiPolySet3D' GeometryType='MULTIPOLYGONZ'>(SELECT ST_Multi(ST_Union(s.the_geom)) As the_geom\r
                FROM (SELECT ST_MakePolygon(ST_AddPoint(ST_AddPoint(ST_MakeLine(ST_SetSRID(ST_MakePoint(i+m,j,m),4326),ST_SetSRID(ST_MakePoint(j+m,i-m,m),4326)),ST_SetSRID(ST_MakePoint(i,j,m),4326)),ST_SetSRID(ST_MakePoint(i+m,j,m),4326)))  As the_geom\r
-               FROM generate_series(-10,50,20) As i\r
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(50,70, 25) 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
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(50,70, 25) AS j\r
                        CROSS JOIN generate_series(1,2) As m\r
                        ) As s)</pgis:gset>\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,20) As i\r
+               FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)\r
                        CROSS JOIN generate_series(50,70, 25) As j\r
                        CROSS JOIN generate_series(1,2) As m\r
                        WHERE NOT(i = j)) As s)</pgis:gset>\r