[mapserver-commits] r13101 - trunk/mapserver

[svn at osgeo.org]

Author: pramsey
Date: 2012-02-08 15:16:31 -0800 (Wed, 08 Feb 2012)
New Revision: 13101

Modified:
   trunk/mapserver/mappostgis.c
Log:
Update to use ST_ function variant to match PostGIS 2.0


Modified: trunk/mapserver/mappostgis.c
===================================================================
--- trunk/mapserver/mappostgis.c	2012-02-08 20:27:23 UTC (rev 13100)
+++ trunk/mapserver/mappostgis.c	2012-02-08 23:16:31 UTC (rev 13101)
@@ -1569,7 +1569,7 @@
     }
 
     if ( strSRID ) {
-        static char *strBoxTemplate = "GeomFromText('POLYGON((%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g))',%s)";
+        static char *strBoxTemplate = "ST_GeomFromText('POLYGON((%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g))',%s)";
         /* 10 doubles + 1 integer + template characters */
         sz = 10 * 22 + strlen(strSRID) + strlen(strBoxTemplate);
         strBox = (char*)msSmallMalloc(sz+1); /* add space for terminating NULL */
@@ -1585,7 +1585,7 @@
                 return NULL;
             }
         } else {
-            static char *strBoxTemplate = "GeomFromText('POLYGON((%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g))')";
+            static char *strBoxTemplate = "ST_GeomFromText('POLYGON((%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g))')";
             /* 10 doubles + template characters */
             sz = 10 * 22 + strlen(strBoxTemplate);
             strBox = (char*)msSmallMalloc(sz+1); /* add space for terminating NULL */