[mapserver-commits] r12728 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2011-10-31 07:41:56 -0700 (Mon, 31 Oct 2011)
New Revision: 12728

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maputil.c
Log:
Fixed layer with inline feature to support multiple classes (#4070)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-10-31 07:58:26 UTC (rev 12727)
+++ trunk/mapserver/HISTORY.TXT	2011-10-31 14:41:56 UTC (rev 12728)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
 -------------------------------------------------
 
+- Fixed layer with inline feature to support multiple classes (#4070)
+
 - Add support for rfc45 anchorpoint on marker symbols (#4066)
 
 - Add initial gap support for line marker symbols (#3879)

Modified: trunk/mapserver/maputil.c
===================================================================
--- trunk/mapserver/maputil.c	2011-10-31 07:58:26 UTC (rev 12727)
+++ trunk/mapserver/maputil.c	2011-10-31 14:41:56 UTC (rev 12728)
@@ -514,21 +514,6 @@
 {
   int i, iclass;
 
-  /* INLINE features do not work with expressions, allow the classindex */
-  /* value set prior to calling this function to carry through. */
-  if(layer->connectiontype == MS_INLINE) {
-    if(shape->classindex < 0 || shape->classindex >= layer->numclasses) return(-1);
-
-    if(map->scaledenom > 0) {  /* verify scaledenom here */
-      if((layer->class[shape->classindex]->maxscaledenom > 0) && (map->scaledenom > layer->class[shape->classindex]->maxscaledenom))
-        return(-1); /* can skip this feature */
-      if((layer->class[shape->classindex]->minscaledenom > 0) && (map->scaledenom <= layer->class[shape->classindex]->minscaledenom))
-        return(-1); /* can skip this feature */
-    }
-
-    return(shape->classindex);
-  }
-
   if (layer->numclasses > 0) {
     if (classgroup == NULL || numclasses <=0)
       numclasses = layer->numclasses;
@@ -549,6 +534,9 @@
            continue; /* can skip this one, next class */
         }
 
+       if (layer->connectiontype == MS_INLINE)
+           return (iclass);
+
        /* verify the minfeaturesize */
        if ((shape->type == MS_SHAPE_LINE || shape->type == MS_SHAPE_POLYGON) && (layer->class[iclass]->minfeaturesize > 0))
        {