xml: support 'label-spacing' as alias to 'spacing' - refs #1427

This commit is contained in:
Dane Springmeyer 2012-08-21 14:50:24 -07:00
parent 6a0df52b1c
commit d1d782254b

View File

@ -94,6 +94,11 @@ void text_symbolizer_properties::from_xml(xml_node const &sym, fontset_map const
if (label_position_tolerance_) label_position_tolerance = *label_position_tolerance_;
optional<unsigned> spacing_ = sym.get_opt_attr<unsigned>("spacing");
if (spacing_) label_spacing = *spacing_;
else {
// https://github.com/mapnik/mapnik/issues/1427
spacing_ = sym.get_opt_attr<unsigned>("label-spacing");
if (spacing_) label_spacing = *spacing_;
}
optional<unsigned> minimum_distance_ = sym.get_opt_attr<unsigned>("minimum-distance");
if (minimum_distance_) minimum_distance = *minimum_distance_;
optional<unsigned> min_padding_ = sym.get_opt_attr<unsigned>("minimum-padding");