#2698 put in converter for geomjson and fix tests to catch geomkml

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

diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index 97f5a0a9100f3dc4c780a02164781e16cc007456..7446ac1d0dcd4e2fe52669addaf25f521caa6e04 100644 (file)
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -466,7 +466,7 @@ SELECT '<xsl:value-of select="$log_label" /> Geography: End Testing';
                                <xsl:variable name='fnname'><xsl:value-of select="funcdef/function"/></xsl:variable>
                                <xsl:variable name='fndef'><xsl:value-of select="funcdef"/></xsl:variable>
                                <xsl:variable name='numparams'><xsl:value-of select="count(paramdef/parameter)" /></xsl:variable>
-                               <xsl:variable name='numparamgeoms'><xsl:value-of select="count(paramdef/type[contains(text(),'geometry') or contains(text(),'geography') or contains(text(),'box') or contains(text(), 'bytea')]) + count(paramdef/parameter[contains(text(),'WKT')]) + count(paramdef/parameter[contains(text(),'geomgml')])" /></xsl:variable>
+                               <xsl:variable name='numparamgeoms'><xsl:value-of select="count(paramdef/type[contains(text(),'geometry') or contains(text(),'geography') or contains(text(),'box') or contains(text(), 'bytea')]) + count(paramdef/parameter[contains(text(),'WKT')]) + count(paramdef/parameter[contains(text(),'geomgml')]) + count(paramdef/parameter[contains(text(),'geomjson')]) + count(paramdef/parameter[contains(text(),'geomkml')])" /></xsl:variable>
                                <xsl:variable name='numparamgeogs'><xsl:value-of select="count(paramdef/type[contains(text(),'geography')] )" /></xsl:variable>
                                <xsl:variable name='log_label'><xsl:value-of select="funcdef/function" />(<xsl:value-of select="$fnargs" />)</xsl:variable>
 
@@ -614,6 +614,9 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
                                        <xsl:when test="(contains(parameter,'geomkml'))">
                                                <xsl:text>ST_AsKML(foo1.the_geom)</xsl:text>
                                        </xsl:when>
+                                       <xsl:when test="(contains(parameter,'geomjson'))">
+                                               <xsl:text>ST_AsGeoJSON(foo1.the_geom)</xsl:text>
+                                       </xsl:when>
                                        <xsl:when test="(contains(type,'box') or type = 'geometry' or type = 'geometry ' or contains(type,'geometry set')) and (position() = 1 or count($func/paramdef/type[contains(text(),'geometry') or contains(text(),'box') or contains(text(), 'WKT') or contains(text(), 'bytea')]) = '1')">
                                                <xsl:text>foo1.the_geom</xsl:text>
                                        </xsl:when>