Permalink
Browse files

Make label expressions consistent with class expressions by allowing …

…them to work off an item (labelitem).
  • Loading branch information...
Steve Lime
Steve Lime committed Nov 3, 2013
1 parent d4b3dbb commit a93fa607174c4958ae5a5be2f7e173a449765ef2
Showing with 1 addition and 1 deletion.
  1. +1 −1 maputil.c
View
@@ -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;

0 comments on commit a93fa60

Please sign in to comment.