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

Revert "+ fix shield/text positioning - we still need to floor both text and shield"

Browse source 
floor is removed from position calculation now, resulting in better marker and text matching.
Refs #1078.

This reverts commit 009a1e45a7.
This commit is contained in:
Hermann Kraus 2012-02-17 00:59:20 +01:00
parent 465a7621bc
commit 7b22d69932
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/agg/process_shield_symbolizer.cpp
View file

@ -27,9 +27,9 @@
#include <mapnik/svg/svg_converter.hpp> #include <mapnik/svg/svg_converter.hpp>
#include <mapnik/svg/svg_renderer.hpp> #include <mapnik/svg/svg_renderer.hpp>
#include <mapnik/svg/svg_path_adapter.hpp> #include <mapnik/svg/svg_path_adapter.hpp>
#include <mapnik/symbolizer_helpers.hpp> #include <mapnik/symbolizer_helpers.hpp>
// stl
#include <cmath>
// boost // boost
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
@ -57,8 +57,8 @@ void agg_renderer<T>::process(shield_symbolizer const& sym,
std::pair<int, int> marker_pos = helper.get_marker_position(placement->placements[ii]); std::pair<int, int> marker_pos = helper.get_marker_position(placement->placements[ii]);
render_marker(marker_pos.first, marker_pos.second, helper.get_marker(), helper.get_transform(), sym.get_opacity()); render_marker(marker_pos.first, marker_pos.second, helper.get_marker(), helper.get_transform(), sym.get_opacity());
double x = std::floor(placement->placements[ii].starting_x); double x = placement->placements[ii].starting_x;
double y = std::floor(placement->placements[ii].starting_y); double y = placement->placements[ii].starting_y;
ren.prepare_glyphs(&(placement->placements[ii])); ren.prepare_glyphs(&(placement->placements[ii]));
ren.render(x, y); ren.render(x, y);
} }