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

Remove duplicate code.

Browse source
This commit is contained in:
Hermann Kraus 2012-08-11 02:48:56 +02:00
parent f10d5b107f
commit 48290546d9
2 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/text/placement_finder_ng.hpp
View file

@ -74,6 +74,7 @@ private:
bool single_line_placement(vertex_cache &pp, text_upright_e orientation);
void path_move_dx(vertex_cache &pp);
static double normalize_angle(double angle);
double get_spacing(double path_length, double layout_width) const;
Feature const& feature_;
DetectorType &detector_;
box2d<double> const& extent_;

43
src/text/placement_finder_ng.cpp
View file

@ -253,23 +253,13 @@ bool placement_finder_ng::find_point_on_line_placements(T & path)
{
if (pp.length() == 0.0)
{
return find_point_placement(pp.current_position());
success = find_point_placement(pp.current_position()) || success;
continue;
}
int num_labels = 1;
if (info_->properties.label_spacing > 0)
num_labels = static_cast<int> (floor(pp.length() / info_->properties.label_spacing * scale_factor_));
if (info_->properties.force_odd_labels && num_labels % 2 == 0)
num_labels--;
if (num_labels <= 0)
num_labels = 1;
double spacing = pp.length() / num_labels;
double spacing = get_spacing(pp.length(), 0);
pp.forward(spacing/2.); // first label should be placed at half the spacing
path_move_dx(pp);
do
{
success = find_point_placement(pp.current_position()) || success;
@ -290,19 +280,11 @@ bool placement_finder_ng::find_line_placements(T & path)
||
(pp.length() < layout_.width())) continue;
int num_labels = 1;
if (info_->properties.label_spacing > 0)
num_labels = static_cast<int>(floor(pp.length() / (info_->properties.label_spacing * scale_factor_ + layout_.width())));
if (info_->properties.force_odd_labels && num_labels % 2 == 0)
num_labels--;
if (num_labels <= 0)
num_labels = 1;
double spacing = pp.length() / num_labels;
double spacing = get_spacing(pp.length(), layout_.width());
// first label should be placed at half the spacing
pp.forward(spacing/2.-layout_.width()/2.);
path_move_dx(pp);
//TODO: label_position_tolerance
do
{
success = single_line_placement(pp, info_->properties.upright) || success;
@ -408,6 +390,21 @@ double placement_finder_ng::normalize_angle(double angle)
return angle;
}
double placement_finder_ng::get_spacing(double path_length, double layout_width) const
{
int num_labels = 1;
if (info_->properties.label_spacing > 0)
num_labels = static_cast<int>(floor(
path_length / (info_->properties.label_spacing * scale_factor_ + layout_width)));
if (info_->properties.force_odd_labels && num_labels % 2 == 0)
num_labels--;
if (num_labels <= 0)
num_labels = 1;
return path_length / num_labels;
}
/*********************************************************************************************/