[mapserver-commits] r9547 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2009-11-13 15:39:50 -0500 (Fri, 13 Nov 2009)
New Revision: 9547

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapogcfilter.c
Log:
Support multi-polygons geometries for filters embedded in an SLD (#3097)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-11-12 10:10:58 UTC (rev 9546)
+++ trunk/mapserver/HISTORY.TXT	2009-11-13 20:39:50 UTC (rev 9547)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- OGC SLD: support multi-polygons geometries for filters embedded in an SLD (#3097)
+
 - [WMC] embedded SLD in context does not work with namespace prefix (#3115)
 
 - Support name aliases used in sld text symbolizer (#3114)

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2009-11-12 10:10:58 UTC (rev 9546)
+++ trunk/mapserver/mapogcfilter.c	2009-11-13 20:39:50 UTC (rev 9547)
@@ -1737,6 +1737,10 @@
                     psGMLElement= CPLGetXMLNode(psXMLNode, "Polygon");
                     if (psGMLElement)
                       bPolygon = 1;
+                    else if ((psGMLElement= CPLGetXMLNode(psXMLNode, "MultiPolygon")))
+                    {
+                          bPolygon = 1;
+                    }
                     else
                     {
                         psGMLElement= CPLGetXMLNode(psXMLNode, "LineString");
@@ -1808,6 +1812,10 @@
                 psGMLElement = CPLGetXMLNode(psXMLNode, "Polygon");
                 if (psGMLElement)
                   bPolygon = 1;
+                else if ((psGMLElement= CPLGetXMLNode(psXMLNode, "MultiPolygon")))
+                {
+                      bPolygon = 1;
+                }
                 else if ((psGMLElement= CPLGetXMLNode(psXMLNode, "LineString")))
                 {
                     if (psGMLElement)