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

+ cleanup

Browse source
This commit is contained in:
Artem Pavlenko 2012-06-11 12:59:09 +01:00
parent b37212d9a0
commit 6f14cc4b63
1 changed files with 25 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/feature_style_processor.cpp
View file

@ -149,9 +149,6 @@ void feature_style_processor<Processor>::apply()
try try
{ {
projection proj(m_.srs()); projection proj(m_.srs());
//start_metawriters(m_,proj);
double scale_denom = mapnik::scale_denominator(m_,proj.is_geographic()); double scale_denom = mapnik::scale_denominator(m_,proj.is_geographic());
scale_denom *= scale_factor_; scale_denom *= scale_factor_;
@ -163,8 +160,6 @@ void feature_style_processor<Processor>::apply()
apply_to_layer(lyr, p, proj, scale_denom, names); apply_to_layer(lyr, p, proj, scale_denom, names);
} }
} }
//stop_metawriters(m_);
} }
catch (proj_init_error& ex) catch (proj_init_error& ex)
{ {
@ -528,18 +523,13 @@ void feature_style_processor<Processor>::render_style(
do_else=false; do_else=false;
do_also=true; do_also=true;
rule::symbolizers const& symbols = r->get_symbolizers(); rule::symbolizers const& symbols = r->get_symbolizers();
BOOST_FOREACH (symbolizer const& sym, symbols)
// if the underlying renderer is not able to process the complete set of symbolizers,
// process one by one.
// if(!p.process(symbols,feature,prj_trans))
{ {
boost::apply_visitor(symbol_dispatch(p,feature,prj_trans),sym);
BOOST_FOREACH (symbolizer const& sym, symbols)
{
boost::apply_visitor(symbol_dispatch(p,feature,prj_trans),sym);
}
} }
if (style->get_filter_mode() == FILTER_FIRST) if (style->get_filter_mode() == FILTER_FIRST)
{ {
// Stop iterating over rules and proceed with next feature. // Stop iterating over rules and proceed with next feature.
@ -558,14 +548,9 @@ void feature_style_processor<Processor>::render_style(
p.painted(true); p.painted(true);
rule::symbolizers const& symbols = r->get_symbolizers(); rule::symbolizers const& symbols = r->get_symbolizers();
// if the underlying renderer is not able to process the complete set of symbolizers, BOOST_FOREACH (symbolizer const& sym, symbols)
// process one by one.
//if(!p.process(symbols,feature,prj_trans))
{ {
BOOST_FOREACH (symbolizer const& sym, symbols) boost::apply_visitor(symbol_dispatch(p,feature,prj_trans),sym);
{
boost::apply_visitor(symbol_dispatch(p,feature,prj_trans),sym);
}
} }
} }
} }
@ -580,14 +565,10 @@ void feature_style_processor<Processor>::render_style(
p.painted(true); p.painted(true);
rule::symbolizers const& symbols = r->get_symbolizers(); rule::symbolizers const& symbols = r->get_symbolizers();
// if the underlying renderer is not able to process the complete set of symbolizers,
// process one by one. BOOST_FOREACH (symbolizer const& sym, symbols)
//if(!p.process(symbols,feature,prj_trans))
{ {
BOOST_FOREACH (symbolizer const& sym, symbols) boost::apply_visitor(symbol_dispatch(p,feature,prj_trans),sym);
{
boost::apply_visitor(symbol_dispatch(p,feature,prj_trans),sym);
}
} }
} }
} }
@ -635,4 +616,3 @@ template class feature_style_processor<agg_renderer<image_32> >;
template class feature_style_processor<metawriter_renderer>; template class feature_style_processor<metawriter_renderer>;
} }