Add functions to read and write text_symbolizer_properties and char_properties from/to XML.
This commit is contained in:
Hermann Kraus
parent
cc048986d8
commit
6695fa0f5f
1 changed files with 273 additions and 0 deletions
|
|
@ -22,11 +22,16 @@
|
||||||
|
|
||||||
#include <mapnik/text_placements.hpp>
|
#include <mapnik/text_placements.hpp>
|
||||||
#include <mapnik/text_placements_simple.hpp>
|
#include <mapnik/text_placements_simple.hpp>
|
||||||
|
#include <mapnik/text_placements_list.hpp>
|
||||||
|
#include <mapnik/expression_string.hpp>
|
||||||
|
#include <mapnik/text_processing.hpp>
|
||||||
|
#include <mapnik/ptree_helpers.hpp>
|
||||||
|
|
||||||
#include <boost/tuple/tuple.hpp>
|
#include <boost/tuple/tuple.hpp>
|
||||||
#include <boost/spirit/include/qi.hpp>
|
#include <boost/spirit/include/qi.hpp>
|
||||||
#include <boost/spirit/include/phoenix_core.hpp>
|
#include <boost/spirit/include/phoenix_core.hpp>
|
||||||
#include <boost/spirit/include/phoenix_stl.hpp>
|
#include <boost/spirit/include/phoenix_stl.hpp>
|
||||||
|
#include <boost/optional.hpp>
|
||||||
|
|
||||||
namespace mapnik {
|
namespace mapnik {
|
||||||
|
|
||||||
|
|
@ -36,6 +41,274 @@ using boost::spirit::ascii::space;
|
||||||
using phoenix::push_back;
|
using phoenix::push_back;
|
||||||
using phoenix::ref;
|
using phoenix::ref;
|
||||||
using qi::_1;
|
using qi::_1;
|
||||||
|
using boost::optional;
|
||||||
|
|
||||||
|
text_symbolizer_properties::text_symbolizer_properties() :
|
||||||
|
label_placement(POINT_PLACEMENT),
|
||||||
|
halign(H_AUTO),
|
||||||
|
jalign(J_MIDDLE),
|
||||||
|
valign(V_AUTO),
|
||||||
|
label_spacing(0),
|
||||||
|
label_position_tolerance(0),
|
||||||
|
avoid_edges(false),
|
||||||
|
minimum_distance(0.0),
|
||||||
|
minimum_padding(0.0),
|
||||||
|
max_char_angle_delta(22.5 * M_PI/180.0),
|
||||||
|
force_odd_labels(false),
|
||||||
|
allow_overlap(false),
|
||||||
|
text_ratio(0),
|
||||||
|
wrap_width(0),
|
||||||
|
processor()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void text_symbolizer_properties::set_values_from_xml(boost::property_tree::ptree const &sym, std::map<std::string,font_set> const & fontsets)
|
||||||
|
{
|
||||||
|
optional<label_placement_e> placement_ = get_opt_attr<label_placement_e>(sym, "placement");
|
||||||
|
if (placement_) label_placement = *placement_;
|
||||||
|
optional<vertical_alignment_e> valign_ = get_opt_attr<vertical_alignment_e>(sym, "vertical-alignment");
|
||||||
|
if (valign_) valign = *valign_;
|
||||||
|
optional<unsigned> text_ratio_ = get_opt_attr<unsigned>(sym, "text-ratio");
|
||||||
|
if (text_ratio_) text_ratio = *text_ratio_;
|
||||||
|
optional<unsigned> wrap_width_ = get_opt_attr<unsigned>(sym, "wrap-width");
|
||||||
|
if (wrap_width_) wrap_width = *wrap_width_;
|
||||||
|
optional<unsigned> label_position_tolerance_ = get_opt_attr<unsigned>(sym, "label-position-tolerance");
|
||||||
|
if (label_position_tolerance_) label_position_tolerance = *label_position_tolerance_;
|
||||||
|
optional<unsigned> spacing_ = get_opt_attr<unsigned>(sym, "spacing");
|
||||||
|
if (spacing_) label_spacing = *spacing_;
|
||||||
|
optional<unsigned> minimum_distance_ = get_opt_attr<unsigned>(sym, "minimum-distance");
|
||||||
|
if (minimum_distance_) minimum_distance = *minimum_distance_;
|
||||||
|
optional<unsigned> min_padding_ = get_opt_attr<unsigned>(sym, "minimum-padding");
|
||||||
|
if (min_padding_) minimum_padding = *min_padding_;
|
||||||
|
optional<unsigned> min_path_length_ = get_opt_attr<unsigned>(sym, "minimum-path-length");
|
||||||
|
if (min_path_length_) minimum_path_length = *min_path_length_;
|
||||||
|
optional<boolean> avoid_edges_ = get_opt_attr<boolean>(sym, "avoid-edges");
|
||||||
|
if (avoid_edges_) avoid_edges = *avoid_edges_;
|
||||||
|
optional<boolean> allow_overlap_ = get_opt_attr<boolean>(sym, "allow-overlap");
|
||||||
|
if (allow_overlap_) allow_overlap = *allow_overlap_;
|
||||||
|
optional<horizontal_alignment_e> halign_ = get_opt_attr<horizontal_alignment_e>(sym, "horizontal-alignment");
|
||||||
|
if (halign_) halign = *halign_;
|
||||||
|
optional<justify_alignment_e> jalign_ = get_opt_attr<justify_alignment_e>(sym, "justify-alignment");
|
||||||
|
if (jalign_) jalign = *jalign_;
|
||||||
|
/* Attributes needing special care */
|
||||||
|
optional<std::string> orientation_ = get_opt_attr<std::string>(sym, "orientation");
|
||||||
|
if (orientation_) orientation = parse_expression(*orientation_, "utf8");
|
||||||
|
optional<double> dx = get_opt_attr<double>(sym, "dx");
|
||||||
|
if (dx) displacement.get<0>() = *dx;
|
||||||
|
optional<double> dy = get_opt_attr<double>(sym, "dy");
|
||||||
|
if (dy) displacement.get<1>() = *dy;
|
||||||
|
optional<double> max_char_angle_delta_ = get_opt_attr<double>(sym, "max-char-angle-delta");
|
||||||
|
if (max_char_angle_delta_) max_char_angle_delta=(*max_char_angle_delta_)*(M_PI/180);
|
||||||
|
processor.from_xml(sym, fontsets);
|
||||||
|
optional<std::string> name_ = get_opt_attr<std::string>(sym, "name");
|
||||||
|
if (name_) {
|
||||||
|
std::clog << "### WARNING: Using 'name' in TextSymbolizer/ShieldSymbolizer is deprecated!\n";
|
||||||
|
processor.set_old_style_expression(parse_expression(*name_, "utf8"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void text_symbolizer_properties::to_xml(boost::property_tree::ptree &node, bool explicit_defaults, text_symbolizer_properties const &dfl) const
|
||||||
|
{
|
||||||
|
if (orientation)
|
||||||
|
{
|
||||||
|
const std::string & orientationstr = to_expression_string(*orientation);
|
||||||
|
if (!dfl.orientation || orientationstr != to_expression_string(*(dfl.orientation)) || explicit_defaults) {
|
||||||
|
set_attr(node, "orientation", orientationstr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (displacement.get<0>() != dfl.displacement.get<0>() || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "dx", displacement.get<0>());
|
||||||
|
}
|
||||||
|
if (displacement.get<1>() != dfl.displacement.get<1>() || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "dy", displacement.get<1>());
|
||||||
|
}
|
||||||
|
if (label_placement != dfl.label_placement || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "placement", label_placement);
|
||||||
|
}
|
||||||
|
if (valign != dfl.valign || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "vertical-alignment", valign);
|
||||||
|
}
|
||||||
|
if (text_ratio != dfl.text_ratio || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "text-ratio", text_ratio);
|
||||||
|
}
|
||||||
|
if (wrap_width != dfl.wrap_width || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "wrap-width", wrap_width);
|
||||||
|
}
|
||||||
|
if (label_position_tolerance != dfl.label_position_tolerance || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "label-position-tolerance", label_position_tolerance);
|
||||||
|
}
|
||||||
|
if (label_spacing != dfl.label_spacing || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "spacing", label_spacing);
|
||||||
|
}
|
||||||
|
if (minimum_distance != dfl.minimum_distance || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "minimum-distance", minimum_distance);
|
||||||
|
}
|
||||||
|
if (minimum_padding != dfl.minimum_padding || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "minimum-padding", minimum_padding);
|
||||||
|
}
|
||||||
|
if (minimum_path_length != dfl.minimum_path_length || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "minimum-path-length", minimum_path_length);
|
||||||
|
}
|
||||||
|
if (allow_overlap != dfl.allow_overlap || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "allow-overlap", allow_overlap);
|
||||||
|
}
|
||||||
|
if (avoid_edges != dfl.avoid_edges || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "avoid-edges", avoid_edges);
|
||||||
|
}
|
||||||
|
if (max_char_angle_delta != dfl.max_char_angle_delta || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "max-char-angle-delta", max_char_angle_delta);
|
||||||
|
}
|
||||||
|
if (halign != dfl.halign || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "horizontal-alignment", halign);
|
||||||
|
}
|
||||||
|
if (jalign != dfl.jalign || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "justify-alignment", jalign);
|
||||||
|
}
|
||||||
|
if (valign != dfl.valign || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "vertical-alignment", valign);
|
||||||
|
}
|
||||||
|
processor.to_xml(node, explicit_defaults, dfl.processor);
|
||||||
|
}
|
||||||
|
|
||||||
|
char_properties::char_properties() :
|
||||||
|
text_size(10.0),
|
||||||
|
character_spacing(0),
|
||||||
|
line_spacing(0),
|
||||||
|
text_opacity(1.0),
|
||||||
|
wrap_before(false),
|
||||||
|
wrap_char(' '),
|
||||||
|
text_transform(NONE),
|
||||||
|
fill(color(0,0,0)),
|
||||||
|
halo_fill(color(255,255,255)),
|
||||||
|
halo_radius(0)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void char_properties::set_values_from_xml(boost::property_tree::ptree const &sym, std::map<std::string,font_set> const & fontsets)
|
||||||
|
{
|
||||||
|
optional<double> text_size_ = get_opt_attr<double>(sym, "size");
|
||||||
|
if (text_size_) text_size = *text_size_;
|
||||||
|
optional<double> character_spacing_ = get_opt_attr<double>(sym, "character-spacing");
|
||||||
|
if (character_spacing_) character_spacing = *character_spacing_;
|
||||||
|
optional<color> fill_ = get_opt_attr<color>(sym, "fill");
|
||||||
|
if (fill_) fill = *fill_;
|
||||||
|
optional<color> halo_fill_ = get_opt_attr<color>(sym, "halo-fill");
|
||||||
|
if (halo_fill_) halo_fill = *halo_fill_;
|
||||||
|
optional<double> halo_radius_ = get_opt_attr<double>(sym, "halo-radius");
|
||||||
|
if (halo_radius_) halo_radius = *halo_radius_;
|
||||||
|
optional<boolean> wrap_before_ = get_opt_attr<boolean>(sym, "wrap-before");
|
||||||
|
if (wrap_before_) wrap_before = *wrap_before_;
|
||||||
|
optional<text_transform_e> tconvert_ = get_opt_attr<text_transform_e>(sym, "text-transform");
|
||||||
|
if (tconvert_) text_transform = *tconvert_;
|
||||||
|
optional<double> line_spacing_ = get_opt_attr<double>(sym, "line-spacing");
|
||||||
|
if (line_spacing_) line_spacing = *line_spacing_;
|
||||||
|
optional<double> opacity_ = get_opt_attr<double>(sym, "opacity");
|
||||||
|
if (opacity_) text_opacity = *opacity_;
|
||||||
|
optional<std::string> wrap_char_ = get_opt_attr<std::string>(sym, "wrap-character");
|
||||||
|
if (wrap_char_ && (*wrap_char_).size() > 0) wrap_char = ((*wrap_char_)[0]);
|
||||||
|
optional<std::string> face_name_ = get_opt_attr<std::string>(sym, "face-name");
|
||||||
|
if (face_name_)
|
||||||
|
{
|
||||||
|
face_name = *face_name_;
|
||||||
|
}
|
||||||
|
optional<std::string> fontset_name_ = get_opt_attr<std::string>(sym, "fontset-name");
|
||||||
|
if (fontset_name_) {
|
||||||
|
std::map<std::string,font_set>::const_iterator itr = fontsets.find(*fontset_name_);
|
||||||
|
if (itr != fontsets.end())
|
||||||
|
{
|
||||||
|
fontset = itr->second;
|
||||||
|
} else
|
||||||
|
{
|
||||||
|
throw config_error("Unable to find any fontset named '" + *fontset_name_ + "'");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!face_name.empty() && !fontset.get_name().empty())
|
||||||
|
{
|
||||||
|
throw config_error(std::string("Can't have both face-name and fontset-name"));
|
||||||
|
}
|
||||||
|
if (face_name.empty() && fontset.get_name().empty())
|
||||||
|
{
|
||||||
|
throw config_error(std::string("Must have face-name or fontset-name"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void char_properties::to_xml(boost::property_tree::ptree &node, bool explicit_defaults, char_properties const &dfl) const
|
||||||
|
{
|
||||||
|
const std::string & fontset_name = fontset.get_name();
|
||||||
|
const std::string & dfl_fontset_name = dfl.fontset.get_name();
|
||||||
|
if (fontset_name != dfl_fontset_name || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "fontset-name", fontset_name);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (face_name != dfl.face_name || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "face-name", face_name);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (text_size != dfl.text_size || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "size", text_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fill != dfl.fill || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "fill", fill);
|
||||||
|
}
|
||||||
|
if (halo_radius != dfl.halo_radius || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "halo-radius", halo_radius);
|
||||||
|
}
|
||||||
|
if (halo_fill != dfl.halo_fill || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "halo-fill", halo_fill);
|
||||||
|
}
|
||||||
|
if (wrap_before != dfl.wrap_before || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "wrap-before", wrap_before);
|
||||||
|
}
|
||||||
|
if (wrap_char != dfl.wrap_char || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "wrap-character", std::string(1, wrap_char));
|
||||||
|
}
|
||||||
|
if (text_transform != dfl.text_transform || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "text-transform", text_transform);
|
||||||
|
}
|
||||||
|
if (line_spacing != dfl.line_spacing || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "line-spacing", line_spacing);
|
||||||
|
}
|
||||||
|
if (character_spacing != dfl.character_spacing || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "character-spacing", character_spacing);
|
||||||
|
}
|
||||||
|
// for shield_symbolizer this is later overridden
|
||||||
|
if (text_opacity != dfl.text_opacity || explicit_defaults)
|
||||||
|
{
|
||||||
|
set_attr(node, "opacity", text_opacity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue