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

making TextSymbolizer label placement consistant with agg renderer to give more similar output

Browse source
This commit is contained in:
Marcin Rudowski 2011-01-23 22:45:28 +00:00
parent d270a555eb
commit 5a55d99f9a
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/cairo_renderer.cpp
View file

@ -1217,7 +1217,20 @@ void cairo_renderer_base::process(text_symbolizer const& sym,
geom.label_position(&label_x, &label_y); geom.label_position(&label_x, &label_y);
prj_trans.backward(label_x, label_y, z); prj_trans.backward(label_x, label_y, z);
t_.forward(&label_x, &label_y); t_.forward(&label_x, &label_y);
finder.find_point_placement(text_placement, label_x, label_y);
double angle = 0.0;
expression_ptr angle_expr = sym.get_orientation();
if (angle_expr)
{
// apply rotation
value_type result = boost::apply_visitor(evaluate<Feature,value_type>(feature),*angle_expr);
angle = result.to_double();
}
finder.find_point_placement(text_placement,label_x,label_y,
angle, sym.get_vertical_alignment(),sym.get_line_spacing(),
sym.get_character_spacing(),sym.get_horizontal_alignment(),
sym.get_justify_alignment());
finder.update_detector(text_placement); finder.update_detector(text_placement);
} }
else //LINE_PLACEMENT else //LINE_PLACEMENT