Skip to content

Commit

Permalink
Implement RFC91 Layer Filter Normalization (#4974)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sdlime @tbonfort
sdlime authored and tbonfort committed Sep 1, 2014
1 parent 529e26e commit 9991eed
Show file tree
Hide file tree
Showing 31 changed files with 5,006 additions and 4,501 deletions.
7 changes: 3 additions & 4 deletions mapcopy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
#include "mapserver.h"
#include "mapsymbol.h"



#include "mapcopy.h"

/***********************************************************************
Expand Down Expand Up @@ -199,15 +197,16 @@ int msCopyFontSet(fontSetObj *dst, fontSetObj *src, mapObj *map)
}

/***********************************************************************
* msCopyExpression( *
* msCopyExpression() *
* *
* Copy an expressionObj, but only its string and type *
* Copy an expressionObj, but only its string, type and flags *
**********************************************************************/

int msCopyExpression(expressionObj *dst, expressionObj *src)
{
MS_COPYSTRING(dst->string, src->string);
MS_COPYSTELEM(type);
MS_COPYSTELEM(flags);
dst->compiled = MS_FALSE;

return MS_SUCCESS;
Expand Down
8 changes: 6 additions & 2 deletions mapdraw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,6 @@ int msDrawVectorLayer(mapObj *map, layerObj *layer, imageObj *image)
if((layer->labelminscaledenom != -1) && (map->scaledenom < layer->labelminscaledenom)) annotate = MS_FALSE;
}


/* open this layer */
status = msLayerOpen(layer);
if(status != MS_SUCCESS) return MS_FAILURE;
Expand All @@ -879,8 +878,13 @@ int msDrawVectorLayer(mapObj *map, layerObj *layer, imageObj *image)
(strncasecmp(layer->styleitem, "javascript://", 13) == 0)) {
status = msLayerWhichItems(layer, MS_TRUE, NULL);
}
else
else {
status = msLayerWhichItems(layer, MS_FALSE, NULL);
}

/* translate filter (if necessary) */
if(!msLayerSupportsCommonFilters(layer))
status = msLayerTranslateFilter(layer, &layer->filter, layer->filteritem);

if(status != MS_SUCCESS) {
msLayerClose(layer);
Expand Down
76 changes: 41 additions & 35 deletions mapfile.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1669,8 +1669,8 @@ void initLabel(labelObj *label)
label->bindings[i].index = -1;
}

initExpression(&(label->expression));
initExpression(&(label->text));
msInitExpression(&(label->expression));
msInitExpression(&(label->text));

label->leader = NULL;

Expand Down Expand Up @@ -1710,8 +1710,8 @@ int freeLabel(labelObj *label)
for(i=0; i<MS_LABEL_BINDING_LENGTH; i++)
msFree(label->bindings[i].item);

freeExpression(&(label->expression));
freeExpression(&(label->text));
msFreeExpression(&(label->expression));
msFreeExpression(&(label->text));

if(label->leader) {
freeLabelLeader(label->leader);
Expand Down Expand Up @@ -1804,7 +1804,7 @@ static int loadLabel(labelObj *label)
if(loadExpression(&(label->expression)) == -1) return(-1); /* loadExpression() cleans up previously allocated expression */
if(msyysource == MS_URL_TOKENS) {
msSetError(MS_MISCERR, "URL-based EXPRESSION configuration not supported." , "loadLabel()");
freeExpression(&(label->expression));
msFreeExpression(&(label->expression));
return(-1);
}
break;
Expand Down Expand Up @@ -1977,7 +1977,7 @@ static int loadLabel(labelObj *label)
if(loadExpression(&(label->text)) == -1) return(-1); /* loadExpression() cleans up previously allocated expression */
if(msyysource == MS_URL_TOKENS) {
msSetError(MS_MISCERR, "URL-based TEXT configuration not supported for labels." , "loadLabel()");
freeExpression(&(label->text));
msFreeExpression(&(label->text));
return(-1);
}
if((label->text.type != MS_STRING) && (label->text.type != MS_EXPRESSION)) {
Expand Down Expand Up @@ -2145,16 +2145,17 @@ char* msWriteLabelToString(labelObj *label)
return (char*)buffer.data;
}

void initExpression(expressionObj *exp)
void msInitExpression(expressionObj *exp)
{
exp->type = MS_STRING;
exp->string = NULL;
exp->native_string = NULL;
exp->compiled = MS_FALSE;
exp->flags = 0;
exp->tokens = exp->curtoken = NULL;
}

void freeExpressionTokens(expressionObj *exp)
void msFreeExpressionTokens(expressionObj *exp)
{
tokenListNodeObjPtr node = NULL;
tokenListNodeObjPtr nextNode = NULL;
Expand All @@ -2166,6 +2167,8 @@ void freeExpressionTokens(expressionObj *exp)
while (node != NULL) {
nextNode = node->next;

msFree(node->tokensrc); /* not set very often */

switch(node->token) {
case MS_TOKEN_BINDING_DOUBLE:
case MS_TOKEN_BINDING_INTEGER:
Expand All @@ -2192,23 +2195,26 @@ void freeExpressionTokens(expressionObj *exp)
}
}

void freeExpression(expressionObj *exp)
void msFreeExpression(expressionObj *exp)
{
if(!exp) return;
msFree(exp->string);
msFree(exp->native_string);
if((exp->type == MS_REGEX) && exp->compiled) ms_regfree(&(exp->regex));
freeExpressionTokens(exp);
initExpression(exp); /* re-initialize */
msFreeExpressionTokens(exp);
msInitExpression(exp); /* re-initialize */
}

int loadExpression(expressionObj *exp)
{
/* TODO: should we fall freeExpression if exp->string != NULL? We do some checking to avoid a leak but is it enough... */
/* TODO: should we fall msFreeExpression if exp->string != NULL? We do some checking to avoid a leak but is it enough... */

msyystring_icase = MS_TRUE;
if((exp->type = getSymbol(6, MS_STRING,MS_EXPRESSION,MS_REGEX,MS_ISTRING,MS_IREGEX,MS_LIST)) == -1) return(-1);
if (exp->string != NULL)
if (exp->string != NULL) {
msFree(exp->string);
msFree(exp->native_string);
}
exp->string = msStrdup(msyystring_buffer);

if(exp->type == MS_ISTRING) {
Expand Down Expand Up @@ -2251,7 +2257,7 @@ int loadExpressionString(expressionObj *exp, char *value)
msyystring = value;
msyylex(); /* sets things up but processes no tokens */

freeExpression(exp); /* we're totally replacing the old expression so free (which re-inits) to start over */
msFreeExpression(exp); /* we're totally replacing the old expression so free (which re-inits) to start over */

msyystring_icase = MS_TRUE;
if((exp->type = getSymbol2(5, MS_EXPRESSION,MS_REGEX,MS_IREGEX,MS_ISTRING,MS_LIST)) != -1) {
Expand Down Expand Up @@ -2424,15 +2430,15 @@ void initCluster(clusterObj *cluster)
cluster->maxdistance = 10;
cluster->buffer = 0;
cluster->region = NULL;
initExpression(&(cluster->group));
initExpression(&(cluster->filter));
msInitExpression(&(cluster->group));
msInitExpression(&(cluster->filter));
}

void freeCluster(clusterObj *cluster)
{
msFree(cluster->region);
freeExpression(&(cluster->group));
freeExpression(&(cluster->filter));
msFreeExpression(&(cluster->group));
msFreeExpression(&(cluster->filter));
}

int loadCluster(clusterObj *cluster)
Expand Down Expand Up @@ -2570,7 +2576,7 @@ int initStyle(styleObj *style)
style->autoangle= MS_FALSE;
style->opacity = 100; /* fully opaque */

initExpression(&(style->_geomtransform));
msInitExpression(&(style->_geomtransform));
style->_geomtransform.type = MS_GEOMTRANSFORM_NONE;

style->patternlength = 0; /* solid line */
Expand Down Expand Up @@ -2900,7 +2906,7 @@ int freeStyle(styleObj *style)
}

msFree(style->symbolname);
freeExpression(&style->_geomtransform);
msFreeExpression(&style->_geomtransform);
msFree(style->rangeitem);

for(i=0; i<MS_STYLE_BINDING_LENGTH; i++)
Expand Down Expand Up @@ -3059,10 +3065,10 @@ int initClass(classObj *class)
class->debug = MS_OFF;
MS_REFCNT_INIT(class);

initExpression(&(class->expression));
msInitExpression(&(class->expression));
class->name = NULL;
class->title = NULL;
initExpression(&(class->text));
msInitExpression(&(class->text));

class->template = NULL;

Expand Down Expand Up @@ -3098,8 +3104,8 @@ int freeClass(classObj *class)
return MS_FAILURE;
}

freeExpression(&(class->expression));
freeExpression(&(class->text));
msFreeExpression(&(class->expression));
msFreeExpression(&(class->text));
msFree(class->name);
msFree(class->title);
msFree(class->template);
Expand Down Expand Up @@ -3293,8 +3299,8 @@ void resetClassStyle(classObj *class)
}
class->numlabels = 0;

freeExpression(&(class->text));
initExpression(&(class->text));
msFreeExpression(&(class->text));
msInitExpression(&(class->text));

/* reset styles */
for(i=0; i<class->numstyles; i++) {
Expand Down Expand Up @@ -3367,7 +3373,7 @@ int loadClass(classObj *class, layerObj *layer)
if(msyysource == MS_URL_TOKENS) {
if(msValidateParameter(class->expression.string, msLookupHashTable(&(class->validation), "expression"), msLookupHashTable(&(layer->validation), "expression"), msLookupHashTable(&(map->web.validation), "expression"), NULL) != MS_SUCCESS) {
msSetError(MS_MISCERR, "URL-based EXPRESSION configuration failed pattern validation." , "loadClass()");
freeExpression(&(class->expression));
msFreeExpression(&(class->expression));
return(-1);
}
}
Expand Down Expand Up @@ -3454,7 +3460,7 @@ int loadClass(classObj *class, layerObj *layer)
if(msyysource == MS_URL_TOKENS) {
if(msValidateParameter(class->text.string, msLookupHashTable(&(class->validation), "text"), msLookupHashTable(&(layer->validation), "text"), msLookupHashTable(&(map->web.validation), "text"), NULL) != MS_SUCCESS) {
msSetError(MS_MISCERR, "URL-based TEXT configuration failed pattern validation." , "loadClass()");
freeExpression(&(class->text));
msFreeExpression(&(class->text));
return(-1);
}
}
Expand Down Expand Up @@ -3780,7 +3786,7 @@ int initLayer(layerObj *layer, mapObj *map)

layer->resultcache= NULL;

initExpression(&(layer->filter));
msInitExpression(&(layer->filter));
layer->filteritem = NULL;
layer->filteritemindex = -1;

Expand Down Expand Up @@ -3812,10 +3818,10 @@ int initLayer(layerObj *layer, mapObj *map)
layer->maskimage = NULL;
layer->grid = NULL;

initExpression(&(layer->_geomtransform));
msInitExpression(&(layer->_geomtransform));
layer->_geomtransform.type = MS_GEOMTRANSFORM_NONE;

initExpression(&(layer->utfdata));
msInitExpression(&(layer->utfdata));
layer->utfitem = NULL;
layer->utfitemindex = -1;

Expand Down Expand Up @@ -3884,7 +3890,7 @@ int freeLayer(layerObj *layer)
msFree(layer->classgroup);

msFreeProjection(&(layer->projection));
freeExpression(&layer->_geomtransform);
msFreeExpression(&layer->_geomtransform);

freeCluster(&layer->cluster);

Expand Down Expand Up @@ -3916,7 +3922,7 @@ int freeLayer(layerObj *layer)
msFree(layer->styleitem);

msFree(layer->filteritem);
freeExpression(&(layer->filter));
msFreeExpression(&(layer->filter));

msFree(layer->requires);
msFree(layer->labelrequires);
Expand Down Expand Up @@ -3945,7 +3951,7 @@ int freeLayer(layerObj *layer)
msFree(layer->grid);
}

freeExpression(&(layer->utfdata));
msFreeExpression(&(layer->utfdata));
msFree(layer->utfitem);

for(i=0;i<layer->sortBy.nProperties;i++)
Expand Down Expand Up @@ -4200,7 +4206,7 @@ int loadLayer(layerObj *layer, mapObj *map)
if(msyysource == MS_URL_TOKENS) {
if(msValidateParameter(layer->filter.string, msLookupHashTable(&(layer->validation), "filter"), msLookupHashTable(&(map->web.validation), "filter"), NULL, NULL) != MS_SUCCESS) {
msSetError(MS_MISCERR, "URL-based FILTER configuration failed pattern validation." , "loadLayer()");
freeExpression(&(layer->filter));
msFreeExpression(&(layer->filter));
return(-1);
}
}
Expand Down
Loading

0 comments on commit 9991eed

Please sign in to comment.