[mapserver-commits] r10459 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2010-08-18 15:19:33 +0000 (Wed, 18 Aug 2010)
New Revision: 10459

Modified:
   trunk/mapserver/mapogcfilter.c
   trunk/mapserver/mapwfs.c
Log:
check for inversed axis in ogc filter bbox request

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2010-08-17 15:39:29 UTC (rev 10458)
+++ trunk/mapserver/mapogcfilter.c	2010-08-18 15:19:33 UTC (rev 10459)
@@ -3983,6 +3983,16 @@
             }
         }
     }
+    if (bValid && ppszSRS)
+    {
+        projectionObj sProjTmp;
+        msInitProjection(&sProjTmp);
+        if (msLoadProjectionStringEPSG(&sProjTmp, *ppszSRS) == 0)
+        {
+            msAxisNormalizePoints( &sProjTmp, 1, &psBbox->minx, &psBbox->miny);
+            msAxisNormalizePoints( &sProjTmp, 1, &psBbox->maxx, &psBbox->maxy);
+        }
+    }
     return bValid;
 }
 

Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2010-08-17 15:39:29 UTC (rev 10458)
+++ trunk/mapserver/mapwfs.c	2010-08-18 15:19:33 UTC (rev 10459)
@@ -159,7 +159,17 @@
     if (strncasecmp(srs, "EPSG:",5) == 0)
       code = srs+5;
     else if (strncasecmp(srs, "urn:ogc:def:crs:EPSG:",21) == 0)
-      code = srs+21;
+    {
+        if (srs[21] == ':')
+          code = srs+21;
+        else
+          code = srs+20;
+
+         while( *code != ':' && *code != '\0')
+           code++;
+         if( *code == ':' )
+           code++;
+    }
     else if (strncasecmp(srs, "urn:EPSG:geographicCRS:",23) == 0)
       code = srs + 23;
     else