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

better c++11 usage

Browse source
This commit is contained in:
Dane Springmeyer 2015-10-12 10:10:12 -07:00
parent 393070ae6c
commit 7fa1e58ab7
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/map.cpp
View file

@ -521,21 +521,19 @@ void Map::zoom_all()
box2d<double> ext; box2d<double> ext;
bool success = false; bool success = false;
bool first = true; bool first = true;
std::vector<layer>::const_iterator itr = layers_.begin(); for (auto const& layer : layers_)
std::vector<layer>::const_iterator end = layers_.end();
while (itr != end)
{ {
if (itr->active()) if (layer.active())
{ {
std::string const& layer_srs = itr->srs(); std::string const& layer_srs = layer.srs();
projection proj1(layer_srs); projection proj1(layer_srs);
proj_transform prj_trans(proj0,proj1); proj_transform prj_trans(proj0,proj1);
box2d<double> layer_ext = itr->envelope(); box2d<double> layer_ext = layer.envelope();
if (prj_trans.backward(layer_ext, PROJ_ENVELOPE_POINTS)) if (prj_trans.backward(layer_ext, PROJ_ENVELOPE_POINTS))
{ {
success = true; success = true;
MAPNIK_LOG_DEBUG(map) << "map: Layer " << itr->name() << " original ext=" << itr->envelope(); MAPNIK_LOG_DEBUG(map) << "map: Layer " << layer.name() << " original ext=" << layer.envelope();
MAPNIK_LOG_DEBUG(map) << "map: Layer " << itr->name() << " transformed to map srs=" << layer_ext; MAPNIK_LOG_DEBUG(map) << "map: Layer " << layer.name() << " transformed to map srs=" << layer_ext;
if (first) if (first)
{ {
ext = layer_ext; ext = layer_ext;
@ -547,7 +545,6 @@ void Map::zoom_all()
} }
} }
} }
++itr;
} }
if (success) if (success)
{ {