diff --git a/bindings/python/mapnik/__init__.py b/bindings/python/mapnik/__init__.py index 03681eabc..039e4182b 100644 --- a/bindings/python/mapnik/__init__.py +++ b/bindings/python/mapnik/__init__.py @@ -976,17 +976,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_symbolizer.cpp b/bindings/python/mapnik_symbolizer.cpp index 777bd90e5..728e6356a 100644 --- a/bindings/python/mapnik_symbolizer.cpp +++ b/bindings/python/mapnik_symbolizer.cpp @@ -345,9 +345,6 @@ void export_shield_symbolizer() .add_property("fontset", make_function(&shield_symbolizer::get_fontset,return_value_policy()), &shield_symbolizer::set_fontset) - .add_property("force_odd_labels", - &shield_symbolizer::get_force_odd_labels, - &shield_symbolizer::set_force_odd_labels) .add_property("halo_fill", make_function(&shield_symbolizer::get_halo_fill,return_value_policy()), &shield_symbolizer::set_halo_fill) diff --git a/bindings/python/mapnik_text_placement.cpp b/bindings/python/mapnik_text_placement.cpp index 7a6365f40..331d63cbf 100644 --- a/bindings/python/mapnik_text_placement.cpp +++ b/bindings/python/mapnik_text_placement.cpp @@ -431,7 +431,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("text_ratio", &text_symbolizer_properties::text_ratio) diff --git a/include/mapnik/text_properties.hpp b/include/mapnik/text_properties.hpp index ec03ba8de..a7dc15e54 100644 --- a/include/mapnik/text_properties.hpp +++ b/include/mapnik/text_properties.hpp @@ -163,8 +163,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/include/mapnik/text_symbolizer.hpp b/include/mapnik/text_symbolizer.hpp index caddea2ce..ba0b6c3c5 100644 --- a/include/mapnik/text_symbolizer.hpp +++ b/include/mapnik/text_symbolizer.hpp @@ -93,8 +93,6 @@ struct MAPNIK_DECL text_symbolizer : public symbolizer_base void set_label_spacing(double spacing); double get_label_position_tolerance() const func_deprecated; //distance the label can be moved on the line to fit, if 0 the default is used void set_label_position_tolerance(double tolerance); - bool get_force_odd_labels() const func_deprecated; // try render an odd amount of labels - void set_force_odd_labels(bool force); double get_max_char_angle_delta() const func_deprecated; // maximum change in angle between adjacent characters void set_max_char_angle_delta(double angle); double get_text_size() const func_deprecated; diff --git a/src/placement_finder.cpp b/src/placement_finder.cpp index 19ee790c2..09e5d4d02 100644 --- a/src/placement_finder.cpp +++ b/src/placement_finder.cpp @@ -144,8 +144,6 @@ void placement_finder::find_point_placements(T & shape_path) if (p.label_spacing > 0) num_labels = static_cast (floor(total_distance / pi.get_actual_label_spacing())); - if (p.force_odd_labels && num_labels % 2 == 0) - num_labels--; if (num_labels <= 0) num_labels = 1; @@ -589,8 +587,6 @@ void placement_finder::find_line_placements(PathT & shape_path) if (p.label_spacing > 0) num_labels = static_cast(floor(total_distance / (pi.get_actual_label_spacing() + string_width_))); - if (p.force_odd_labels && (num_labels % 2 == 0)) - num_labels--; if (num_labels <= 0) num_labels = 1; diff --git a/src/text_properties.cpp b/src/text_properties.cpp index 46b997828..cb3225b08 100644 --- a/src/text_properties.cpp +++ b/src/text_properties.cpp @@ -52,7 +52,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), text_ratio(0.0), diff --git a/src/text_symbolizer.cpp b/src/text_symbolizer.cpp index 02fc6ab8a..679164bb8 100644 --- a/src/text_symbolizer.cpp +++ b/src/text_symbolizer.cpp @@ -290,16 +290,6 @@ void text_symbolizer::set_label_position_tolerance(double tolerance) placement_options_->defaults.label_position_tolerance = tolerance; } -bool text_symbolizer::get_force_odd_labels() const -{ - return placement_options_->defaults.force_odd_labels; -} - -void text_symbolizer::set_force_odd_labels(bool force) -{ - placement_options_->defaults.force_odd_labels = force; -} - double text_symbolizer::get_max_char_angle_delta() const { return placement_options_->defaults.max_char_angle_delta;