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

fix collsion box for shields when scale_factor is used #2381

Browse source
This commit is contained in:
Dane Springmeyer 2014-08-21 23:36:27 -07:00
parent 3db8d34117
commit 5651a8b9db
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/symbolizer_helpers.hpp
View file

@ -111,6 +111,7 @@ protected:
text_placement_info_ptr placement_;
boost::scoped_ptr<placement_finder<DetectorT> > finder_;
double scale_factor_;
};
template <typename FaceManagerT, typename DetectorT>
@ -182,6 +183,7 @@ protected:
using text_symbolizer_helper<FaceManagerT, DetectorT>::point_placement_;
using text_symbolizer_helper<FaceManagerT, DetectorT>::angle_;
using text_symbolizer_helper<FaceManagerT, DetectorT>::finder_;
using text_symbolizer_helper<FaceManagerT, DetectorT>::scale_factor_;
};
} //namespace
#endif // SYMBOLIZER_HELPERS_HPP

4
src/symbolizer_helpers.cpp
View file

@ -62,7 +62,8 @@ text_symbolizer_helper<FaceManagerT, DetectorT>::text_symbolizer_helper(text_sym
angle_(0.0),
placement_valid_(false),
points_on_line_(false),
finder_(0)
finder_(0),
scale_factor_(scale_factor)
{
initialize_geometries();
if (!geometries_to_process_.size()) return;
@ -469,6 +470,7 @@ void shield_symbolizer_helper<FaceManagerT, DetectorT>::init_marker()
marker_ext_.init(px0, py0, px1, py1);
marker_ext_.expand_to_include(px2, py2);
marker_ext_.expand_to_include(px3, py3);
marker_ext_ *= scale_factor_;
}
template <typename FaceManagerT, typename DetectorT>