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

store value_unicode_string in boost::optional<value_unicode_string const&>

Browse source
This commit is contained in:
artemp 2015-06-30 12:16:26 +02:00
parent eca58770d9
commit 6c54adc389
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/mapnik/label_collision_detector.hpp
View file

@ -33,6 +33,8 @@
// stl
#include <vector>
// boost
#include <boost/optional.hpp>
namespace mapnik
{
@ -133,16 +135,16 @@ public:
{
label(box2d<double> const& b, double a)
: box(b),
text(),
angle(a)
angle(a),
text()
{}
label(box2d<double> const& b, mapnik::value_unicode_string const& t, double a)
: box(b), text(t), angle(a) {}
label(box2d<double> const& b, double a, mapnik::value_unicode_string const& t)
: box(b), angle(a), text(t) {}
box2d<double> box;
mapnik::value_unicode_string text;
double angle = 0.0;
boost::optional<mapnik::value_unicode_string const&> text;
};
private:
@ -228,7 +230,7 @@ public:
for ( ;itr != end; ++itr)
{
if (itr->get().box.intersects(margin_box) || (text == itr->get().text && itr->get().box.intersects(repeat_box)))
if (itr->get().box.intersects(margin_box) || (itr->get().text && text == *itr->get().text && itr->get().box.intersects(repeat_box)))
{
return false;
}
@ -244,7 +246,7 @@ public:
void insert(box2d<double> const& box, mapnik::value_unicode_string const& text, double angle = 0.0)
{
tree_.insert(label(box, text, angle), box);
tree_.insert(label(box, angle, text), box);
}
void clear()