sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix marker clamping and sync with agg renderer- refs #1309

Browse source
This commit is contained in:
Dane Springmeyer 2012-07-12 18:41:03 -07:00
parent b20481115f
commit 2fe306e34f
1 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/grid/process_markers_symbolizer.cpp
View file

@ -61,9 +61,6 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
mapnik::feature_impl & feature,
proj_transform const& prj_trans)
{
typedef agg::conv_clip_polyline<geometry_type> clipped_geometry_type;
typedef coord_transform<CoordTransform,clipped_geometry_type> path_type;
typedef agg::conv_transform<path_type, agg::trans_affine> transformed_path_type;
typedef agg::renderer_base<mapnik::pixfmt_gray32> renderer_base;
typedef agg::renderer_scanline_bin_solid<renderer_base> renderer_type;
@ -80,10 +77,10 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
return;
}
ras_ptr->reset();
agg::scanline_bin sl;
grid_rendering_buffer buf(pixmap_.raw_data(), width_, height_, width_);
mapnik::pixfmt_gray32 pixf(buf);
ras_ptr->reset();
renderer_base renb(pixf);
renderer_type ren(renb);
@ -96,9 +93,13 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
agg::trans_affine tr;
setup_label_transform(tr, bbox, feature, sym);
tr = agg::trans_affine_scaling(scale_factor_*(1.0/pixmap_.get_resolution())) * tr;
// - clamp sizes to >= 4 pixels of interativity
if (tr.scale() < .25)
tr.scale(.25);
// - clamp sizes to > 4 pixels of interativity
if (tr.scale() < 0.5)
{
agg::trans_affine tr2;
tr2 *= agg::trans_affine_scaling(0.5);
tr = tr2;
}
coord2d center = bbox.center();
agg::trans_affine_translation recenter(-center.x, -center.y);
@ -140,17 +141,16 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
{
placed = true;
svg_renderer.render_id(*ras_ptr, sl, renb, feature.id(), matrix, sym.get_opacity(), bbox);
if (/* DEBUG */ 0)
{
//debug_draw_box(buf, transformed_bbox, 0, 0, 0.0);
}
if (!sym.get_ignore_placement())
detector_.insert(transformed_bbox);
}
}
else
else if (sym.clip())
{
typedef agg::conv_clip_polyline<geometry_type> clipped_geometry_type;
typedef coord_transform<CoordTransform,clipped_geometry_type> path_type;
typedef agg::conv_transform<path_type, agg::trans_affine> transformed_path_type;
clipped_geometry_type clipped(geom);
clipped.clip_box(query_extent_.minx(),query_extent_.miny(),query_extent_.maxx(),query_extent_.maxy());
path_type path(t_,clipped,prj_trans);
@ -167,11 +167,26 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
matrix.rotate(angle);
matrix.translate(x, y);
svg_renderer.render_id(*ras_ptr, sl, renb, feature.id(), matrix, sym.get_opacity(), bbox);
if (/* DEBUG */ 0)
{
//debug_draw_box(buf, bbox*matrix, 0, 0, 0.0);
}
}
}
else
{
typedef coord_transform<CoordTransform,geometry_type> path_type;
typedef agg::conv_transform<path_type, agg::trans_affine> transformed_path_type;
path_type path(t_,geom,prj_trans);
transformed_path_type path_transformed(path,geom_tr);
markers_placement<transformed_path_type, label_collision_detector4> placement(path_transformed, bbox, marker_trans, detector_,
sym.get_spacing() * scale_factor_,
sym.get_max_error(),
sym.get_allow_overlap());
double x, y, angle;
while (placement.get_point(x, y, angle))
{
placed = true;
agg::trans_affine matrix = marker_trans;
matrix.rotate(angle);
matrix.translate(x, y);
svg_renderer.render_id(*ras_ptr, sl, renb, feature.id(), matrix, sym.get_opacity(), bbox);
}
}
}