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

avoid copying unbuffered bbox

Browse source
This commit is contained in:
Dane Springmeyer 2012-03-22 16:35:33 -07:00
parent 2e2bce3126
commit 61c38d0ec7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/feature_style_processor.cpp
View file

@ -248,9 +248,11 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
layer_ext.clip(map_ext); layer_ext.clip(map_ext);
// forward project layer extent back into native projection // forward project layer extent back into native projection
if (!prj_trans.forward(layer_ext, PROJ_ENVELOPE_POINTS)) if (!prj_trans.forward(layer_ext, PROJ_ENVELOPE_POINTS))
{
std::clog << "WARNING: layer " << lay.name() std::clog << "WARNING: layer " << lay.name()
<< " extent " << layer_ext << " in map projection " << " extent " << layer_ext << " in map projection "
<< " did not reproject properly back to layer projection\n"; << " did not reproject properly back to layer projection\n";
}
} }
else else
{ {
@ -262,14 +264,13 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
} }
box2d<double> query_ext = m_.get_current_extent(); box2d<double> query_ext = m_.get_current_extent();
box2d<double> unbuffered_extent = m_.get_current_extent();
prj_trans.forward(query_ext, PROJ_ENVELOPE_POINTS); prj_trans.forward(query_ext, PROJ_ENVELOPE_POINTS);
double qw = query_ext.width()>0 ? query_ext.width() : 1; double qw = query_ext.width()>0 ? query_ext.width() : 1;
double qh = query_ext.height()>0 ? query_ext.height() : 1; double qh = query_ext.height()>0 ? query_ext.height() : 1;
query::resolution_type res(m_.width()/qw, query::resolution_type res(m_.width()/qw,
m_.height()/qh); m_.height()/qh);
query q(layer_ext,res,scale_denom,unbuffered_extent); query q(layer_ext,res,scale_denom,m_.get_current_extent());
p.start_layer_processing(lay, query_ext); p.start_layer_processing(lay, query_ext);
std::vector<feature_type_style*> active_styles; std::vector<feature_type_style*> active_styles;
attribute_collector collector(names); attribute_collector collector(names);