Permalink
Browse files

Fix cluster filter propagation to the source layer (#5364)

  • Loading branch information...
szekerest committed Jan 5, 2017
1 parent 940ae5e commit 7dc87fe671930f5e191a0c3dbff4b0c75b44149a
Showing with 4 additions and 1 deletion.
  1. +4 −1 mapcluster.c
View
@@ -1511,7 +1511,10 @@ int msClusterLayerTranslateFilter(layerObj *layer, expressionObj *filter, char *
return MS_FAILURE;
}
- return layerinfo->srcLayer.vtable->LayerTranslateFilter(&layerinfo->srcLayer, filter, filteritem);
+ if (layerinfo->srcLayer.filter.type == MS_EXPRESSION && layerinfo->srcLayer.filter.tokens == NULL)
+ msTokenizeExpression(&(layerinfo->srcLayer.filter), layer->items, &(layer->numitems));
+
+ return layerinfo->srcLayer.vtable->LayerTranslateFilter(&layerinfo->srcLayer, &layerinfo->srcLayer.filter, filteritem);
}
char* msClusterLayerEscapeSQLParam(layerObj *layer, const char* pszString)

0 comments on commit 7dc87fe

Please sign in to comment.