Skip to content

Commit

Permalink
Remove unused and undocumented style->position
Browse files Browse the repository at this point in the history
  • Loading branch information
@geographika
geographika committed May 23, 2021
1 parent 0d156a7 commit 8215fd8
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 92 deletions.
14 changes: 0 additions & 14 deletions mapfile.c
View file
Expand Up @@ -2398,7 +2398,6 @@ int initStyle(styleObj *style)
style->patternlength = 0; /* solid line */
style->gap = 0;
style->initialgap = -1;
style->position = MS_CC;
style->linecap = MS_CJC_DEFAULT_CAPS;
style->linejoin = MS_CJC_DEFAULT_JOINS;
style->linejoinmaxsize = MS_CJC_DEFAULT_JOIN_MAXSIZE;
Expand Down Expand Up @@ -2600,12 +2599,6 @@ int loadStyle(styleObj *style)
}
break;
}
case(POSITION):
/* if((s->position = getSymbol(3, MS_UC,MS_CC,MS_LC)) == -1) */
/* return(-1); */
if((style->position = getSymbol(9, MS_UL,MS_UC,MS_UR,MS_CL,MS_CC,MS_CR,MS_LL,MS_LC,MS_LR)) == -1)
return(-1);
break;
case(OUTLINEWIDTH):
if((symbol = getSymbol(2, MS_NUMBER,MS_BINDING)) == -1) return(MS_FAILURE);
if(symbol == MS_NUMBER) {
Expand Down Expand Up @@ -2832,13 +2825,6 @@ void writeStyle(FILE *stream, int indent, styleObj *style)
indent--;
}

if(style->position != MS_CC) {
writeKeyword(stream, indent, "POSITION", style->position, 9,
MS_UL, "UL", MS_UC, "UC", MS_UR, "UR", MS_CL, "CL",
MS_CC, "CC", MS_CR, "CR", MS_LL, "LL", MS_LC, "LC",
MS_LR, "LR");
}

if(style->numbindings > 0 && style->bindings[MS_STYLE_BINDING_SIZE].item)
writeAttributeBinding(stream, indent, "SIZE", &(style->bindings[MS_STYLE_BINDING_SIZE]));
else writeNumber(stream, indent, "SIZE", -1, style->size);
Expand Down
152 changes: 75 additions & 77 deletions mapscript/php/style.c
View file
Expand Up @@ -168,20 +168,19 @@ PHP_METHOD(styleObj, __get)
else IF_GET_DOUBLE("maxscaledenom", php_style->style->maxscaledenom)
else IF_GET_DOUBLE("minscaledenom", php_style->style->minscaledenom)
else IF_GET_LONG("patternlength", php_style->style->patternlength)
else IF_GET_LONG("position", php_style->style->position)
else IF_GET_LONG("linecap", php_style->style->linecap)
else IF_GET_LONG("linejoin", php_style->style->linejoin)
else IF_GET_LONG("linejoinmaxsize", php_style->style->linejoinmaxsize)
else IF_GET_DOUBLE("angle", php_style->style->angle)
else IF_GET_LONG("autoangle", php_style->style->autoangle)
else IF_GET_LONG("opacity", php_style->style->opacity)
else IF_GET_OBJECT("color", mapscript_ce_color, php_style->color, &php_style->style->color)
else IF_GET_OBJECT("outlinecolor", mapscript_ce_color, php_style->outlinecolor, &php_style->style->outlinecolor)
else IF_GET_OBJECT("backgroundcolor", mapscript_ce_color, php_style->backgroundcolor, &php_style->style->backgroundcolor)
else IF_GET_OBJECT("mincolor", mapscript_ce_color, php_style->mincolor, &php_style->style->mincolor)
else IF_GET_OBJECT("maxcolor", mapscript_ce_color, php_style->maxcolor, &php_style->style->maxcolor)
else {
mapscript_throw_exception("Property '%s' does not exist in this object." TSRMLS_CC, property);
else IF_GET_LONG("linecap", php_style->style->linecap)
else IF_GET_LONG("linejoin", php_style->style->linejoin)
else IF_GET_LONG("linejoinmaxsize", php_style->style->linejoinmaxsize)
else IF_GET_DOUBLE("angle", php_style->style->angle)
else IF_GET_LONG("autoangle", php_style->style->autoangle)
else IF_GET_LONG("opacity", php_style->style->opacity)
else IF_GET_OBJECT("color", mapscript_ce_color, php_style->color, &php_style->style->color)
else IF_GET_OBJECT("outlinecolor", mapscript_ce_color, php_style->outlinecolor, &php_style->style->outlinecolor)
else IF_GET_OBJECT("backgroundcolor", mapscript_ce_color, php_style->backgroundcolor, &php_style->style->backgroundcolor)
else IF_GET_OBJECT("mincolor", mapscript_ce_color, php_style->mincolor, &php_style->style->mincolor)
else IF_GET_OBJECT("maxcolor", mapscript_ce_color, php_style->maxcolor, &php_style->style->maxcolor)
else {
mapscript_throw_exception("Property '%s' does not exist in this object." TSRMLS_CC, property);
}
}

Expand Down Expand Up @@ -230,73 +229,72 @@ PHP_METHOD(styleObj, __set)
else IF_SET_LONG("rangeitemindex", php_style->style->rangeitemindex, value)
else IF_SET_DOUBLE("gap", php_style->style->gap, value)
else IF_SET_DOUBLE("initialgap", php_style->style->initialgap, value)
else IF_SET_LONG("position", php_style->style->position, value)
else IF_SET_LONG("linecap", php_style->style->linecap, value)
else IF_SET_LONG("linejoin", php_style->style->linejoin, value)
else IF_SET_LONG("linejoinmaxsize", php_style->style->linejoinmaxsize, value)
else IF_SET_DOUBLE("angle", php_style->style->angle, value)
else IF_SET_LONG("autoangle", php_style->style->autoangle, value)
else if (STRING_EQUAL("opacity", property)) {
int alpha;
convert_to_long(value);
php_style->style->opacity = Z_LVAL_P(value);

/* apply opacity as the alpha channel color(s) */
if(php_style->style->opacity < 100)
alpha = MS_NINT(php_style->style->opacity*2.55);
else
alpha = 255;

php_style->style->color.alpha = alpha;
php_style->style->outlinecolor.alpha = alpha;
php_style->style->backgroundcolor.alpha = alpha;
php_style->style->mincolor.alpha = alpha;
php_style->style->maxcolor.alpha = alpha;
} else if (STRING_EQUAL("symbolname", property)) {
convert_to_string(value);
if (php_style->style->symbolname) free(php_style->style->symbolname);
if (Z_STRVAL_P(value))
php_style->style->symbolname = msStrdup(Z_STRVAL_P(value));

/* The parent can be a classObj or a labelCacheMemberObj */
if (MAPSCRIPT_OBJCE(php_style->parent.val) == mapscript_ce_class) {
php_class = MAPSCRIPT_OBJ(php_class_object, php_style->parent.val);
/* Can a class have no layer object ? */
php_layer = MAPSCRIPT_OBJ(php_layer_object, php_class->parent.val);
if (ZVAL_IS_UNDEF(php_layer->parent.val)) {
mapscript_throw_exception("No map object associated with this style object." TSRMLS_CC);
return;
}
php_map = MAPSCRIPT_OBJ(php_map_object, php_layer->parent.val);
#ifdef disabled
} else if (MAPSCRIPT_OBJCE(php_style->parent.val) == mapscript_ce_labelcachemember) {
/* The parent is always a map */
php_labelcachemember = MAPSCRIPT_OBJ(php_labelcachemember_object, php_style->parent.val);
if (ZVAL_NOT_UNDEF(php_labelcachemember->parent.val)) {
mapscript_throw_exception("No map object associated with this style object." TSRMLS_CC);
return;
}
php_map = MAPSCRIPT_OBJ(php_map_object, php_labelcachemember->parent.val);
#endif
else IF_SET_LONG("linecap", php_style->style->linecap, value)
else IF_SET_LONG("linejoin", php_style->style->linejoin, value)
else IF_SET_LONG("linejoinmaxsize", php_style->style->linejoinmaxsize, value)
else IF_SET_DOUBLE("angle", php_style->style->angle, value)
else IF_SET_LONG("autoangle", php_style->style->autoangle, value)
else if (STRING_EQUAL("opacity", property)) {
int alpha;
convert_to_long(value);
php_style->style->opacity = Z_LVAL_P(value);

/* apply opacity as the alpha channel color(s) */
if(php_style->style->opacity < 100)
alpha = MS_NINT(php_style->style->opacity*2.55);
else
alpha = 255;

php_style->style->color.alpha = alpha;
php_style->style->outlinecolor.alpha = alpha;
php_style->style->backgroundcolor.alpha = alpha;
php_style->style->mincolor.alpha = alpha;
php_style->style->maxcolor.alpha = alpha;
} else if (STRING_EQUAL("symbolname", property)) {
convert_to_string(value);
if (php_style->style->symbolname) free(php_style->style->symbolname);
if (Z_STRVAL_P(value))
php_style->style->symbolname = msStrdup(Z_STRVAL_P(value));

/* The parent can be a classObj or a labelCacheMemberObj */
if (MAPSCRIPT_OBJCE(php_style->parent.val) == mapscript_ce_class) {
php_class = MAPSCRIPT_OBJ(php_class_object, php_style->parent.val);
/* Can a class have no layer object ? */
php_layer = MAPSCRIPT_OBJ(php_layer_object, php_class->parent.val);
if (ZVAL_IS_UNDEF(php_layer->parent.val)) {
mapscript_throw_exception("No map object associated with this style object." TSRMLS_CC);
return;
}

if (styleObj_setSymbolByName(php_style->style,
php_map->map,
php_style->style->symbolname) == -1) {
mapscript_throw_exception("Symbol not found." TSRMLS_CC);
php_map = MAPSCRIPT_OBJ(php_map_object, php_layer->parent.val);
#ifdef disabled
} else if (MAPSCRIPT_OBJCE(php_style->parent.val) == mapscript_ce_labelcachemember) {
/* The parent is always a map */
php_labelcachemember = MAPSCRIPT_OBJ(php_labelcachemember_object, php_style->parent.val);
if (ZVAL_NOT_UNDEF(php_labelcachemember->parent.val)) {
mapscript_throw_exception("No map object associated with this style object." TSRMLS_CC);
return;
}
} else if ( (STRING_EQUAL("color", property)) ||
(STRING_EQUAL("outlinecolor", property)) ||
(STRING_EQUAL("backgroundcolor", property)) ||
(STRING_EQUAL("maxcolor", property)) ||
(STRING_EQUAL("mincolor", property))) {
mapscript_throw_exception("Property '%s' is an object and can only be modified through its accessors." TSRMLS_CC, property);
} else if ( (STRING_EQUAL("patternlength", property))) {
mapscript_throw_exception("Property '%s' is read-only and cannot be set." TSRMLS_CC, property);
} else {
mapscript_throw_exception("Property '%s' does not exist in this object." TSRMLS_CC, property);
php_map = MAPSCRIPT_OBJ(php_map_object, php_labelcachemember->parent.val);
#endif
}

if (styleObj_setSymbolByName(php_style->style,
php_map->map,
php_style->style->symbolname) == -1) {
mapscript_throw_exception("Symbol not found." TSRMLS_CC);
return;
}
} else if ( (STRING_EQUAL("color", property)) ||
(STRING_EQUAL("outlinecolor", property)) ||
(STRING_EQUAL("backgroundcolor", property)) ||
(STRING_EQUAL("maxcolor", property)) ||
(STRING_EQUAL("mincolor", property))) {
mapscript_throw_exception("Property '%s' is an object and can only be modified through its accessors." TSRMLS_CC, property);
} else if ( (STRING_EQUAL("patternlength", property))) {
mapscript_throw_exception("Property '%s' is read-only and cannot be set." TSRMLS_CC, property);
} else {
mapscript_throw_exception("Property '%s' does not exist in this object." TSRMLS_CC, property);
}

}

Expand Down
1 change: 0 additions & 1 deletion mapserver.h
View file
Expand Up @@ -1062,7 +1062,6 @@ The :ref:`STYLE <style>` object. An instance of styleObj is associated with one

double gap; ///< See :ref:`GAP <mapfile-style-gap>` - moved from symbolObj in version 6.0
double initialgap; ///< See :ref:`INITIALGAP <mapfile-style-initialgap>`
int position; ///< See :ref:`POSITION <mapfile-style-position>` - moved from symbolObj in version 6.0

int linecap; ///< See :ref:`LINECAP <mapfile-style-linecap>`
int linejoin; ///< See :ref:`LINEJOIN <mapfile-style-linejoin>` - moved from symbolObj in version 6.0
Expand Down

0 comments on commit 8215fd8

Please sign in to comment.