sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix stroke-width size not included in markers ellipse bounding box

Browse source
This commit is contained in:
Joris Valette 2016-06-03 11:08:45 +02:00
parent deb5102aac
commit 7ca86b0947
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/marker_helpers.cpp
View file

@ -37,6 +37,7 @@ void build_ellipse(symbolizer_base const& sym, mapnik::feature_impl & feature, a
{ {
double width = 0.0; double width = 0.0;
double height = 0.0; double height = 0.0;
double half_stroke_width = 0.0;
if (has_key(sym,keys::width) && has_key(sym,keys::height)) if (has_key(sym,keys::width) && has_key(sym,keys::height))
{ {
width = get<double>(sym, keys::width, feature, vars, 0.0); width = get<double>(sym, keys::width, feature, vars, 0.0);
@ -50,6 +51,10 @@ void build_ellipse(symbolizer_base const& sym, mapnik::feature_impl & feature, a
{ {
width = height = get<double>(sym, keys::height, feature, vars, 0.0); width = height = get<double>(sym, keys::height, feature, vars, 0.0);
} }
if (has_key(sym,keys::stroke_width))
{
half_stroke_width = get<double>(sym, keys::stroke_width, feature, vars, 0.0) / 2.0;
}
svg::svg_converter_type styled_svg(svg_path, marker_ellipse.attributes()); svg::svg_converter_type styled_svg(svg_path, marker_ellipse.attributes());
styled_svg.push_attr(); styled_svg.push_attr();
styled_svg.begin_path(); styled_svg.begin_path();
@ -59,6 +64,10 @@ void build_ellipse(symbolizer_base const& sym, mapnik::feature_impl & feature, a
styled_svg.pop_attr(); styled_svg.pop_attr();
double lox,loy,hix,hiy; double lox,loy,hix,hiy;
styled_svg.bounding_rect(&lox, &loy, &hix, &hiy); styled_svg.bounding_rect(&lox, &loy, &hix, &hiy);
lox -= half_stroke_width;
loy -= half_stroke_width;
hix += half_stroke_width;
hiy += half_stroke_width;
styled_svg.set_dimensions(width,height); styled_svg.set_dimensions(width,height);
marker_ellipse.set_dimensions(width,height); marker_ellipse.set_dimensions(width,height);
marker_ellipse.set_bounding_box(lox,loy,hix,hiy); marker_ellipse.set_bounding_box(lox,loy,hix,hiy);