]> granicus.if.org Git - postgis/commitdiff
Fix typo in geometry test
authorRegina Obe <lr@pcorp.us>
Thu, 11 Dec 2008 19:38:50 +0000 (19:38 +0000)
committerRegina Obe <lr@pcorp.us>
Thu, 11 Dec 2008 19:38:50 +0000 (19:38 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@3381 b70326c6-7e19-0410-871a-916f4a2858ee

doc/xsl/postgis_gardentest.sql.xsl

index dcefc7ab40a67a1e835b484df61caf483cf36f61..11d1b4a347282209ba2e4cf69e26942920d4e46d 100644 (file)
                        <xsl:for-each select="refsynopsisdiv/funcsynopsis/funcprototype">\r
 <xsl:if test="count(paramdef/parameter) = 0">SELECT  <xsl:value-of select="funcdef/function" />();\r
 </xsl:if>\r
-<!--Start Test aggregate functions \r
+<!--Start Test aggregate and unary functions \r
  TODO: Make this section less verbose -->\r
 <!--Point Aggregate/geom accessor test -->\r
 <xsl:if test="contains(paramdef/type,'geometry set') or (count(paramdef/parameter) = 1 and contains(paramdef/type, 'geometry'))">\r
 <!-- If output is geometry show ewkt rep -->\r
        <xsl:choose>\r
-         <xsl:when test="contains(funcdef/function, 'geometry')">\r
+         <xsl:when test="contains(funcdef, 'geometry ')">\r
                SELECT ST_AsEWKT(<xsl:value-of select="funcdef/function" />(the_geom)),\r
        ST_AsEWKT(<xsl:value-of select="funcdef/function" />(ST_Multi(the_geom)))\r
          </xsl:when>\r
                <xsl:value-of select="funcdef/function" />(ST_Multi(the_geom))\r
          </xsl:otherwise>\r
        </xsl:choose>\r
-       FROM (SELECT ST_Point(i,j) As the_geom \r
+       FROM (SELECT ST_SetSRID(ST_Point(i,j),4326) As the_geom \r
                FROM generate_series(-60,50,5) As i \r
                        CROSS JOIN generate_series(40,70, 5) j) As foo;  \r
 </xsl:if>\r
 <!--Multi/Line Aggregate/accessor test -->\r
 <xsl:if test="contains(paramdef/type,'geometry set') or (count(paramdef/parameter) = 1 and contains(paramdef/type, 'geometry'))">\r
        <xsl:choose>\r
-         <xsl:when test="contains(funcdef/function, 'geometry')">\r
+         <xsl:when test="contains(funcdef, 'geometry ')">\r
 SELECT ST_AsEWKT(<xsl:value-of select="funcdef/function" />(the_geom)),\r
        ST_AsEWKT(<xsl:value-of select="funcdef/function" />(ST_Multi(the_geom)))\r
          </xsl:when>\r
@@ -49,7 +49,7 @@ SELECT ST_AsEWKT(<xsl:value-of select="funcdef/function" />(the_geom)),
                <xsl:value-of select="funcdef/function" />(ST_Multi(the_geom))\r
          </xsl:otherwise>\r
        </xsl:choose>\r
-       FROM (SELECT ST_MakeLine(ST_Point(i,j),ST_Point(j,i))  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(-60,50,5) As i \r
                        CROSS JOIN generate_series(40,70, 5) j) As foo;  \r
 </xsl:if>\r
@@ -57,7 +57,7 @@ SELECT ST_AsEWKT(<xsl:value-of select="funcdef/function" />(the_geom)),
 <xsl:if test="contains(paramdef/type,'geometry set') or (count(paramdef/parameter) = 1 and contains(paramdef/type, 'geometry'))">\r
 <!-- If output is geometry show ewkt rep -->\r
        <xsl:choose>\r
-         <xsl:when test="contains(funcdef/function, 'geometry')">\r
+         <xsl:when test="contains(funcdef, 'geometry ')">\r
                SELECT ST_AsEWKT(<xsl:value-of select="funcdef/function" />(the_geom)),\r
        ST_AsEWKT(<xsl:value-of select="funcdef/function" />(ST_Multi(the_geom)))\r
          </xsl:when>\r
@@ -66,11 +66,11 @@ SELECT ST_AsEWKT(<xsl:value-of select="funcdef/function" />(the_geom)),
                <xsl:value-of select="funcdef/function" />(ST_Multi(the_geom))\r
          </xsl:otherwise>\r
        </xsl:choose>\r
-       FROM (SELECT ST_Buffer(ST_Point(i,j), j)  As the_geom \r
+       FROM (SELECT ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j)  As the_geom \r
                FROM generate_series(-60,50,5) As i \r
                        CROSS JOIN generate_series(40,70, 5) j) As foo;  \r
 </xsl:if>\r
-<!--End Test aggregate functions -->\r
+<!--End Test aggregate and unary functions -->\r
                        </xsl:for-each>\r
                </xsl:for-each>\r
        </xsl:template>\r