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

apply small patch from David Eastcott which fixes a problem with the insertion of character envelope fragments (as a result of overlap rejection) into the detector which in turn causes rejection of other text placement that should have been rendered.

Browse source
This commit is contained in:
Dane Springmeyer 2009-12-13 23:29:02 +00:00
parent 19194dd8fa
commit 798b0731e5
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/placement_finder.cpp
View file

@ -92,7 +92,7 @@ namespace mapnik
dimensions(), dimensions(),
text_size(sym.get_text_size()) text_size(sym.get_text_size())
{} {}
placement::~placement() {} placement::~placement() {}
template<typename T> template<typename T>
@ -353,6 +353,8 @@ namespace mapnik
x = (string_width / 2.0) - line_width; x = (string_width / 2.0) - line_width;
// save each character rendering position and build envelope as go thru loop // save each character rendering position and build envelope as go thru loop
std::queue< Envelope<double> > c_envelopes;
for (unsigned i = 0; i < p.info.num_characters(); i++) for (unsigned i = 0; i < p.info.num_characters(); i++)
{ {
character_info ci; character_info ci;
@ -397,20 +399,26 @@ namespace mapnik
current_placement->starting_y - y - max_character_height); current_placement->starting_y - y - max_character_height);
} }
if (!dimensions_.intersects(e) || // if there is an overlap with existing envelopes, then exit - no placement
(!p.allow_overlap && !detector_.has_point_placement(e,p.minimum_distance))) if (!dimensions_.intersects(e) || (!p.allow_overlap && !detector_.has_point_placement(e,p.minimum_distance)))
{
return; return;
}
if (p.avoid_edges && !dimensions_.contains(e)) return; if (p.avoid_edges && !dimensions_.contains(e))
return;
p.envelopes.push(e); c_envelopes.push(e); // add character's envelope to temp storage
} }
x += cwidth; // move position to next character x += cwidth; // move position to next character
} }
// since there was no early exit, add the character envelopes to the placements' envelopes
while( !c_envelopes.empty() )
{
p.envelopes.push( c_envelopes.front() );
c_envelopes.pop();
}
p.placements.push_back(current_placement.release()); p.placements.push_back(current_placement.release());
//update_detector(p);
} }