Permalink
Browse files

Use explicit PROCESSING FORCE_DRAW_LABEL_CACHE=FLUSH to keep room for…

… future options (#5100)
  • Loading branch information...
dmorissette committed Jun 22, 2015
1 parent 729fa9c commit e39aae5e81000324afea9abae4788426ab4bfdb4
Showing with 6 additions and 2 deletions.
  1. +6 −2 mapdraw.c
View
@@ -328,6 +328,8 @@ imageObj *msDrawMap(mapObj *map, int querymap)
for(i=0; i<map->numlayers; i++) {
if(map->layerorder[i] != -1) {
+ char *force_draw_label_cache = NULL;
+
lp = (GET_LAYER(map, map->layerorder[i]));
if(lp->postlabelcache) /* wait to draw */
@@ -391,9 +393,11 @@ imageObj *msDrawMap(mapObj *map, int querymap)
}
/* Flush layer cache in-between layers if requested by PROCESSING directive*/
- if (msLayerGetProcessingKey(lp, "FORCE_DRAW_LABEL_CACHE")) {
+ force_draw_label_cache = msLayerGetProcessingKey(lp, "FORCE_DRAW_LABEL_CACHE");
+ if (force_draw_label_cache &&
+ strncasecmp(force_draw_label_cache,"FLUSH",5)==0) {
if(map->debug >= MS_DEBUGLEVEL_V)
- msDebug("msDrawMap(): PROCESSING FORCE_DRAW_LABEL_CACHE found.\n");
+ msDebug("msDrawMap(): PROCESSING FORCE_DRAW_LABEL_CACHE=FLUSH found.\n");
if(msDrawLabelCache(map, image) != MS_SUCCESS) {
msFreeImage(image);
#if defined(USE_WMS_LYR) || defined(USE_WFS_LYR)

0 comments on commit e39aae5

Please sign in to comment.