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

cosmetic changes and comments

Browse source
This commit is contained in:
Alberto Valverde 2010-03-19 09:33:25 +00:00
parent 915cc0a265
commit f5409000f3
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/glyph_symbolizer.cpp
View file

@ -11,10 +11,12 @@ text_path_ptr glyph_symbolizer::get_text_path(face_set_ptr const& faces,
UnicodeString char_ = eval_char(feature); UnicodeString char_ = eval_char(feature);
double angle = eval_angle(feature); double angle = eval_angle(feature);
// calculate displacement so glyph is rotated along center (default is // calculate displacement so glyph is rotated along center (default pivot is
// lowerbottom corner) // lowerbottom corner)
string_info info(char_); string_info info(char_);
faces->get_string_info(info); faces->get_string_info(info);
// XXX: Perhaps this limitation can be overcomed?
if (info.num_characters() != 1) if (info.num_characters() != 1)
{ {
throw config_error("'char' length must be exactly 1"); throw config_error("'char' length must be exactly 1");
@ -38,8 +40,12 @@ text_path_ptr glyph_symbolizer::get_text_path(face_set_ptr const& faces,
UnicodeString glyph_symbolizer::eval_char(Feature const& feature) const UnicodeString glyph_symbolizer::eval_char(Feature const& feature) const
{ {
expression_ptr expr = get_char(); expression_ptr expr = get_char();
if (!expr) throw config_error("No 'char' expression"); if (!expr)
value_type result = boost::apply_visitor(evaluate<Feature,value_type>(feature),*expr); throw config_error("No 'char' expression");
value_type result = boost::apply_visitor(
evaluate<Feature,value_type>(feature),
*expr
);
return result.to_unicode(); return result.to_unicode();
} }
@ -62,7 +68,6 @@ double glyph_symbolizer::eval_angle(Feature const& feature) const
} }
if (angle<0) if (angle<0)
angle += 2*M_PI; angle += 2*M_PI;
} }
return angle; return angle;
} }