diff --git a/bindings/python/mapnik/__init__.py b/bindings/python/mapnik/__init__.py index 6ad1f4838..26a61e649 100644 --- a/bindings/python/mapnik/__init__.py +++ b/bindings/python/mapnik/__init__.py @@ -987,17 +987,6 @@ class _TextSymbolizer(TextSymbolizer,_injector): self.properties.maximum_angle_char_delta = maximum_angle_char_delta - - @property - def force_odd_labels(self): - return self.properties.force_odd_labels - - @force_odd_labels.setter - def force_odd_labels(self, force_odd_labels): - self.properties.force_odd_labels = force_odd_labels - - - @property def allow_overlap(self): return self.properties.allow_overlap diff --git a/bindings/python/mapnik_text_placement.cpp b/bindings/python/mapnik_text_placement.cpp index 65b71b27f..d588dd245 100644 --- a/bindings/python/mapnik_text_placement.cpp +++ b/bindings/python/mapnik_text_placement.cpp @@ -427,7 +427,6 @@ void export_text_placement() .def_readwrite("minimum_padding", &text_symbolizer_properties::minimum_padding) .def_readwrite("minimum_path_length", &text_symbolizer_properties::minimum_path_length) .def_readwrite("maximum_angle_char_delta", &text_symbolizer_properties::max_char_angle_delta) - .def_readwrite("force_odd_labels", &text_symbolizer_properties::force_odd_labels) .def_readwrite("allow_overlap", &text_symbolizer_properties::allow_overlap) .def_readwrite("largest_bbox_only", &text_symbolizer_properties::largest_bbox_only) .def_readwrite("layout_defaults", &text_symbolizer_properties::layout_defaults) diff --git a/include/mapnik/text/text_properties.hpp b/include/mapnik/text/text_properties.hpp index a1d673887..dbf431ca9 100644 --- a/include/mapnik/text/text_properties.hpp +++ b/include/mapnik/text/text_properties.hpp @@ -132,7 +132,6 @@ struct text_properties_expressions symbolizer_base::value_type minimum_padding = 0.0; symbolizer_base::value_type minimum_path_length = 0.0; symbolizer_base::value_type max_char_angle_delta = 22.5; - symbolizer_base::value_type force_odd_labels = false; symbolizer_base::value_type allow_overlap = false; symbolizer_base::value_type largest_bbox_only = true; symbolizer_base::value_type upright = enumeration_wrapper(UPRIGHT_AUTO); @@ -175,8 +174,6 @@ struct MAPNIK_DECL text_symbolizer_properties double minimum_padding; double minimum_path_length; double max_char_angle_delta; - // Always try render an odd amount of labels - bool force_odd_labels; bool allow_overlap; // Only consider geometry with largest bbox (polygons) bool largest_bbox_only; diff --git a/src/group/group_symbolizer_helper.cpp b/src/group/group_symbolizer_helper.cpp index 493bfb5dc..a03e13150 100644 --- a/src/group/group_symbolizer_helper.cpp +++ b/src/group/group_symbolizer_helper.cpp @@ -182,11 +182,6 @@ double group_symbolizer_helper::get_spacing(double path_length) const num_labels = static_cast(floor( path_length / (placement_->properties.label_spacing * scale_factor_))); } - - if (placement_->properties.force_odd_labels && num_labels % 2 == 0) - { - --num_labels; - } if (num_labels <= 0) { num_labels = 1; diff --git a/src/text/placement_finder.cpp b/src/text/placement_finder.cpp index e43e71c70..cad774ada 100644 --- a/src/text/placement_finder.cpp +++ b/src/text/placement_finder.cpp @@ -369,11 +369,6 @@ double placement_finder::get_spacing(double path_length, double layout_width) co num_labels = static_cast(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; diff --git a/src/text/text_properties.cpp b/src/text/text_properties.cpp index c6f1af561..1aa3558d3 100644 --- a/src/text/text_properties.cpp +++ b/src/text/text_properties.cpp @@ -48,7 +48,6 @@ text_symbolizer_properties::text_symbolizer_properties() minimum_padding(0.0), minimum_path_length(0.0), max_char_angle_delta(22.5 * M_PI/180.0), - force_odd_labels(false), allow_overlap(false), largest_bbox_only(true), upright(UPRIGHT_AUTO), @@ -67,7 +66,6 @@ void text_symbolizer_properties::evaluate_text_properties(feature_impl const& fe minimum_padding = boost::apply_visitor(extract_value(feature,attrs), expressions.minimum_padding); minimum_path_length = boost::apply_visitor(extract_value(feature,attrs), expressions.minimum_path_length); max_char_angle_delta = boost::apply_visitor(extract_value(feature,attrs), expressions.max_char_angle_delta) * M_PI/180; - force_odd_labels = boost::apply_visitor(extract_value(feature,attrs), expressions.force_odd_labels); allow_overlap = boost::apply_visitor(extract_value(feature,attrs), expressions.allow_overlap); largest_bbox_only = boost::apply_visitor(extract_value(feature,attrs), expressions.largest_bbox_only); upright = boost::apply_visitor(extract_value(feature,attrs), expressions.upright); @@ -125,7 +123,6 @@ void text_symbolizer_properties::text_properties_from_xml(xml_node const& node) set_property_from_xml(expressions.avoid_edges, "avoid-edges", node); set_property_from_xml(expressions.allow_overlap, "allow-overlap", node); set_property_from_xml(expressions.largest_bbox_only, "largest-bbox-only", node); - set_property_from_xml(expressions.force_odd_labels, "force-odd-labels", node); set_property_from_xml(expressions.max_char_angle_delta, "max-char-angle-delta", node); set_property_from_xml(expressions.upright, "upright", node); } @@ -211,7 +208,6 @@ void text_symbolizer_properties::add_expressions(expression_set & output) const if (is_expression(expressions.minimum_padding)) output.insert(boost::get(expressions.minimum_padding)); if (is_expression(expressions.minimum_path_length)) output.insert(boost::get(expressions.minimum_path_length)); if (is_expression(expressions.max_char_angle_delta)) output.insert(boost::get(expressions.max_char_angle_delta)); - if (is_expression(expressions.force_odd_labels)) output.insert(boost::get(expressions.force_odd_labels)); if (is_expression(expressions.allow_overlap)) output.insert(boost::get(expressions.allow_overlap)); if (is_expression(expressions.largest_bbox_only)) output.insert(boost::get(expressions.largest_bbox_only)); if (is_expression(expressions.upright)) output.insert(boost::get(expressions.upright)); diff --git a/tests/python_tests/object_test.py b/tests/python_tests/object_test.py index 769adbec9..8d78519a3 100644 --- a/tests/python_tests/object_test.py +++ b/tests/python_tests/object_test.py @@ -133,7 +133,6 @@ # eq_(s.face_name, 'DejaVu Sans Bold') # eq_(s.allow_overlap, False) # eq_(s.fill, mapnik.Color('#000000')) -# eq_(s.force_odd_labels, False) # eq_(s.halo_fill, mapnik.Color('rgb(255,255,255)')) # eq_(s.halo_radius, 0) # eq_(s.label_placement, mapnik.label_placement.POINT_PLACEMENT)