Make label expressions consistent with class expressions by allowing …

…them to work off an item (labelitem).
MapServer · Nov 3, 2013 · a93fa60 · a93fa60
1 parent d4b3dbb
commit a93fa60
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/maputil.c b/maputil.c
@@ -692,7 +692,7 @@ int msGetLabelStatus(mapObj *map, layerObj *layer, shapeObj *shape, labelObj *lb
   assert(layer && lbl);
   if(!msScaleInBounds(map->scaledenom,lbl->minscaledenom,lbl->maxscaledenom))
     return MS_OFF;
-  if(msEvalExpression(layer, shape, &(lbl->expression), -1) != MS_TRUE)
+  if(msEvalExpression(layer, shape, &(lbl->expression), layer->labelitemindex) != MS_TRUE)
     return MS_OFF;
   /* TODO: check for minfeaturesize here ? */
   return MS_ON;