diff --git a/src/grid/process_shield_symbolizer.cpp b/src/grid/process_shield_symbolizer.cpp index c286f7409..b1aac00e6 100644 --- a/src/grid/process_shield_symbolizer.cpp +++ b/src/grid/process_shield_symbolizer.cpp @@ -28,8 +28,8 @@ #include #include -#include -#include +#include + #include #include #include @@ -44,201 +44,36 @@ void grid_renderer::process(shield_symbolizer const& sym, Feature const& feature, proj_transform const& prj_trans) { -#if 0 - typedef coord_transform2 path_type; + shield_symbolizer_helper, + label_collision_detector4> helper( + sym, feature, prj_trans, + width_, height_, + scale_factor_, + t_, font_manager_, detector_); bool placement_found = false; - text_placement_info_ptr placement_options = sym.get_placement_options()->get_placement_info(); - placement_options->next(); - placement_options->next_position_only(); + text_renderer ren(pixmap_, font_manager_, *(font_manager_.get_stroker())); - UnicodeString text; - if( sym.get_no_text() ) - text = UnicodeString( " " ); // TODO: fix->use 'space' as the text to render - else - { - expression_ptr name_expr = sym.get_name(); - if (!name_expr) return; - value_type result = boost::apply_visitor(evaluate(feature),*name_expr); - text = result.to_unicode(); - } - - if ( sym.get_text_transform() == UPPERCASE) - { - text = text.toUpper(); - } - else if ( sym.get_text_transform() == LOWERCASE) - { - text = text.toLower(); - } - else if ( sym.get_text_transform() == CAPITALIZE) - { - text = text.toTitle(NULL); - } - - agg::trans_affine tr; - boost::array const& m = sym.get_transform(); - tr.load_from(&m[0]); - tr = agg::trans_affine_scaling(scale_factor_) * tr; - - std::string filename = path_processor_type::evaluate( *sym.get_filename(), feature); - boost::optional marker; - if ( !filename.empty() ) - { - marker = marker_cache::instance()->find(filename, true); - } - else - { - marker.reset(boost::make_shared()); - } - - if (text.length() > 0 && marker) - { - face_set_ptr faces; - - if (sym.get_fontset().size() > 0) + text_placement_info_ptr placement; + while ((placement = helper.get_placement())) { + placement_found = true; + for (unsigned int ii = 0; ii < placement->placements.size(); ++ii) { - faces = font_manager_.get_face_set(sym.get_fontset()); - } - else - { - faces = font_manager_.get_face_set(sym.get_face_name()); - } + std::pair marker_pos = helper.get_marker_position(placement->placements[ii]); + render_marker(feature, pixmap_.get_resolution(), + marker_pos.first, marker_pos.second, + helper.get_marker(), helper.get_transform(), + sym.get_opacity()); - stroker_ptr strk = font_manager_.get_stroker(); - if (strk && faces->size() > 0) - { - text_renderer ren(pixmap_, faces, *strk); - - ren.set_character_size(sym.get_text_size() * scale_factor_ * (1.0/pixmap_.get_resolution())); - ren.set_fill(sym.get_fill()); - ren.set_halo_fill(sym.get_halo_fill()); - ren.set_halo_radius(sym.get_halo_radius() * scale_factor_); - ren.set_opacity(sym.get_text_opacity()); - - placement_finder finder(detector_); - - string_info info(text); - - faces->get_string_info(info, text, 0); - - // TODO- clamp to at least 4 px otherwise interactivity is too small - int w = (*marker)->width()/pixmap_.get_resolution(); - int h = (*marker)->height()/pixmap_.get_resolution(); - - for (unsigned i = 0; i < feature.num_geometries(); ++i) - { - geometry_type const& geom = feature.get_geometry(i); - if (geom.num_points() > 0 ) - { - path_type path(t_,geom,prj_trans); - - label_placement_enum how_placed = sym.get_label_placement(); - if (how_placed == POINT_PLACEMENT || how_placed == VERTEX_PLACEMENT || how_placed == INTERIOR_PLACEMENT) - { - // for every vertex, try and place a shield/text - geom.rewind(0); - placement text_placement(info, sym, scale_factor_, w, h, false); - text_placement.avoid_edges = sym.get_avoid_edges(); - text_placement.allow_overlap = sym.get_allow_overlap(); - position const& pos = sym.get_displacement(); - position const& shield_pos = sym.get_shield_displacement(); - for( unsigned jj = 0; jj < geom.num_points(); jj++ ) - { - double label_x; - double label_y; - double z=0.0; - - if( how_placed == VERTEX_PLACEMENT ) - geom.vertex(&label_x,&label_y); // by vertex - else if( how_placed == INTERIOR_PLACEMENT ) - geom.label_interior_position(&label_x,&label_y); - else - geom.label_position(&label_x, &label_y); // by middle of line or by point - prj_trans.backward(label_x,label_y, z); - t_.forward(&label_x,&label_y); - - label_x += boost::get<0>(shield_pos); - label_y += boost::get<1>(shield_pos); - - finder.find_point_placement( text_placement, placement_options, label_x, label_y, 0.0, - sym.get_line_spacing(), - sym.get_character_spacing()); - - // check to see if image overlaps anything too, there is only ever 1 placement found for points and verticies - if( text_placement.placements.size() > 0) - { - placement_found = true; - double x = floor(text_placement.placements[0].starting_x); - double y = floor(text_placement.placements[0].starting_y); - int px; - int py; - box2d label_ext; - - if( !sym.get_unlock_image() ) - { - // center image at text center position - // remove displacement from image label - double lx = x - boost::get<0>(pos); - double ly = y - boost::get<1>(pos); - px=int(floor(lx - (0.5 * w))); - py=int(floor(ly - (0.5 * h))); - label_ext.init( floor(lx - 0.5 * w), floor(ly - 0.5 * h), ceil (lx + 0.5 * w), ceil (ly + 0.5 * h) ); - } - else - { // center image at reference location - px=int(floor(label_x - 0.5 * w)); - py=int(floor(label_y - 0.5 * h)); - label_ext.init( floor(label_x - 0.5 * w), floor(label_y - 0.5 * h), ceil (label_x + 0.5 * w), ceil (label_y + 0.5 * h)); - } - - if ( sym.get_allow_overlap() || detector_.has_placement(label_ext) ) - { - render_marker(feature,pixmap_.get_resolution(),px,py,**marker,tr,sym.get_opacity()); - - box2d dim = ren.prepare_glyphs(&text_placement.placements[0]); - ren.render_id(feature.id(),x,y,2); - detector_.insert(label_ext); - finder.update_detector(text_placement); - } - } - } - } - - else if (geom.num_points() > 1 && how_placed == LINE_PLACEMENT) - { - placement text_placement(info, sym, scale_factor_, w, h, true); - - text_placement.avoid_edges = sym.get_avoid_edges(); - finder.find_point_placements(text_placement, placement_options, path); - - position const& pos = sym.get_displacement(); - for (unsigned int ii = 0; ii < text_placement.placements.size(); ++ ii) - { - placement_found= true; - double x = floor(text_placement.placements[ii].starting_x); - double y = floor(text_placement.placements[ii].starting_y); - - double lx = x - boost::get<0>(pos); - double ly = y - boost::get<1>(pos); - int px=int(floor(lx - (0.5*w))); - int py=int(floor(ly - (0.5*h))); - - render_marker(feature,pixmap_.get_resolution(),px,py,**marker,tr,sym.get_opacity()); - - box2d dim = ren.prepare_glyphs(&text_placement.placements[ii]); - ren.render_id(feature.id(),x,y,2); - } - finder.update_detector(text_placement); - } - } - } + double x = floor(placement->placements[ii].starting_x); + double y = floor(placement->placements[ii].starting_y); + ren.prepare_glyphs(&(placement->placements[ii])); + ren.render_id(feature.id(), x, y, 2); } } if (placement_found) pixmap_.add_feature(feature); -#endif } template void grid_renderer::process(shield_symbolizer const&, diff --git a/src/grid/process_text_symbolizer.cpp b/src/grid/process_text_symbolizer.cpp index 041106975..ae61d13d4 100644 --- a/src/grid/process_text_symbolizer.cpp +++ b/src/grid/process_text_symbolizer.cpp @@ -44,6 +44,7 @@ void grid_renderer::process(text_symbolizer const& sym, text_placement_info_ptr placement; while ((placement = helper.get_placement())) { + placement_found = true; for (unsigned int ii = 0; ii < placement->placements.size(); ++ii) { double x = placement->placements[ii].starting_x;