From de1422518562d219600ddacfce9647e7c5db401b Mon Sep 17 00:00:00 2001 From: Asheem Mamoowala Date: Tue, 17 Oct 2017 17:09:29 -0700 Subject: Fix formatting --- src/mbgl/style/custom_tile_loader.cpp | 15 +++++++-------- src/mbgl/tile/custom_tile.cpp | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/mbgl/style/custom_tile_loader.cpp b/src/mbgl/style/custom_tile_loader.cpp index 942216d26e..b7120a2a5c 100644 --- a/src/mbgl/style/custom_tile_loader.cpp +++ b/src/mbgl/style/custom_tile_loader.cpp @@ -19,10 +19,9 @@ void CustomTileLoader::fetchTile(const OverscaledTileID& tileID, ActorRef(1, tuple) }); - } - else { - for(auto iter = tileCallbacks->second.begin(); iter != tileCallbacks->second.end(); iter++) { - if(std::get<0>(*iter) == tileID.overscaledZ && std::get<1>(*iter) == tileID.wrap ) { + } else { + for (auto iter = tileCallbacks->second.begin(); iter != tileCallbacks->second.end(); iter++) { + if (std::get<0>(*iter) == tileID.overscaledZ && std::get<1>(*iter) == tileID.wrap ) { std::get<2>(*iter) = callbackRef; return; } @@ -32,7 +31,7 @@ void CustomTileLoader::fetchTile(const OverscaledTileID& tileID, ActorRefsecond.begin(); iter != tileCallbacks->second.end(); iter++) { - if(std::get<0>(*iter) == tileID.overscaledZ && std::get<1>(*iter) == tileID.wrap ) { + for (auto iter = tileCallbacks->second.begin(); iter != tileCallbacks->second.end(); iter++) { + if (std::get<0>(*iter) == tileID.overscaledZ && std::get<1>(*iter) == tileID.wrap ) { tileCallbacks->second.erase(iter); break; } @@ -56,7 +55,7 @@ void CustomTileLoader::setTileData(const CanonicalTileID& tileID, const GeoJSON& auto iter = tileCallbackMap.find(tileID); if (iter == tileCallbackMap.end()) return; dataCache[tileID] = std::make_unique(std::move(data)); - for(auto tuple : iter->second) { + for (auto tuple : iter->second) { auto actor = std::get<2>(tuple); actor.invoke(&SetTileDataFunction::operator(), data); } diff --git a/src/mbgl/tile/custom_tile.cpp b/src/mbgl/tile/custom_tile.cpp index 7662085499..1e8e02da79 100644 --- a/src/mbgl/tile/custom_tile.cpp +++ b/src/mbgl/tile/custom_tile.cpp @@ -45,7 +45,7 @@ void CustomTile::setNecessity(Necessity newNecessity) { necessity = newNecessity; if (necessity == Necessity::Required) { loader.invoke(&style::CustomTileLoader::fetchTile, id, actor.self()); - } else if(!isRenderable()) { + } else if (!isRenderable()) { loader.invoke(&style::CustomTileLoader::cancelTile, id); } } -- cgit v1.2.1