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

fix typo (map_ext.intersects(map_ext) -> map_ext.intersects(layer_ext)) and add small optimization so that if projections are equal we don't check intersection twice before returning no hit

Browse source
This commit is contained in:
Dane Springmeyer 2011-07-21 21:14:06 +00:00
parent 572da8766f
commit c5c729b17c
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/mapnik/feature_style_processor.hpp
View file

@ -228,14 +228,19 @@ private:
} }
box2d<double> layer_ext = lay.envelope(); box2d<double> layer_ext = lay.envelope();
// first, try to forward project map ext into layer srs // first, try to forward project map ext into layer srs
if (prj_trans.forward(map_ext) && map_ext.intersects(layer_ext)) if (prj_trans.forward(map_ext) && map_ext.intersects(layer_ext))
{ {
layer_ext.clip(map_ext); layer_ext.clip(map_ext);
} }
// if no intersection and projections are also equal, early return
else if (prj_trans.equal())
{
return;
}
// fallback to back projecting layer into map srs // fallback to back projecting layer into map srs
else if (prj_trans.backward(layer_ext) && map_ext.intersects(map_ext)) else if (prj_trans.backward(layer_ext) && map_ext.intersects(layer_ext))
{ {
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
@ -249,11 +254,11 @@ private:
// if no intersection then nothing to do for layer // if no intersection then nothing to do for layer
return; return;
} }
query::resolution_type res(m_.width()/m_.get_current_extent().width(), query::resolution_type res(m_.width()/m_.get_current_extent().width(),
m_.height()/m_.get_current_extent().height()); m_.height()/m_.get_current_extent().height());
query q(layer_ext,res,scale_denom); //BBOX query query q(layer_ext,res,scale_denom); //BBOX query
std::vector<feature_type_style*> active_styles; std::vector<feature_type_style*> active_styles;
attribute_collector collector(names); attribute_collector collector(names);
double filt_factor = 1; double filt_factor = 1;