diff --git a/src/text/placement_finder.cpp b/src/text/placement_finder.cpp index 544c7049a..04a290757 100644 --- a/src/text/placement_finder.cpp +++ b/src/text/placement_finder.cpp @@ -65,10 +65,8 @@ placement_finder::placement_finder(feature_impl const& feature, bool placement_finder::next_position() { - std::cerr << "next_position()" << std::endl; if (info_.next()) { - std::cerr << "info_.next()" << std::endl; // parent layout, has top-level ownership of a new evaluated_format_properties_ptr (TODO is this good enough to stay in scope???) // but does not take ownership of the text_symbolizer_properties (info_.properties) text_layout_ptr layout = std::make_shared(font_manager_, diff --git a/src/text/placements/list.cpp b/src/text/placements/list.cpp index 90997165c..7d609f2c4 100644 --- a/src/text/placements/list.cpp +++ b/src/text/placements/list.cpp @@ -34,7 +34,6 @@ namespace mapnik bool text_placement_info_list::next() const { - std::cerr << " state=" << state << " next()" << std::endl; if (state == 0) { properties = parent_->defaults; @@ -96,7 +95,6 @@ text_placements_ptr text_placements_list::from_xml(xml_node const& node, fontset { auto list = std::make_shared(); list->defaults.from_xml(node, fontsets, is_shield); - int count = 0; for( auto const& child : node) { if (child.is_text() || !child.is("Placement")) continue; diff --git a/src/text/symbolizer_helpers.cpp b/src/text/symbolizer_helpers.cpp index 28696dda5..1d0fe48d2 100644 --- a/src/text/symbolizer_helpers.cpp +++ b/src/text/symbolizer_helpers.cpp @@ -351,7 +351,6 @@ bool text_symbolizer_helper::next_line_placement() const if (geo_itr_ == geometries_to_process_.end()) { //Just processed the last geometry. Try next placement. - std::cerr << "Just processed the last geometry. Try next placement." << std::endl; if (!finder_.next_position()) return false; //No more placements //Start again from begin of list geo_itr_ = geometries_to_process_.begin(); @@ -361,14 +360,10 @@ bool text_symbolizer_helper::next_line_placement() const if (mapnik::util::apply_visitor(apply_line_placement_visitor(converter_, adapter_), *geo_itr_)) { //Found a placement - std::cerr << "Found placement!" << std::endl; geo_itr_ = geometries_to_process_.erase(geo_itr_); return true; } - else - { - std::cerr << "ELSE?" << std::endl; - } + // No placement for this geometry. Keep it in geometries_to_process_ for next try. ++geo_itr_; }