diff options
author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-10-17 17:09:29 -0700 |
---|---|---|
committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-10-17 17:09:29 -0700 |
commit | de1422518562d219600ddacfce9647e7c5db401b (patch) | |
tree | 207ff1a3baca1ca920ba277106295fd2373d5b92 /src/mbgl | |
parent | fa81ebc2bff3db41c1d12d0be16ea835a666c030 (diff) | |
download | qtlocation-mapboxgl-de1422518562d219600ddacfce9647e7c5db401b.tar.gz |
Fix formatting
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/style/custom_tile_loader.cpp | 15 | ||||
-rw-r--r-- | 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<SetTil if (tileCallbacks == tileCallbackMap.end()) { auto tuple = std::make_tuple(tileID.overscaledZ, tileID.wrap, callbackRef); tileCallbackMap.insert({ tileID.canonical, std::vector<OverscaledIDFunctionTuple>(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, ActorRef<SetTil } void CustomTileLoader::cancelTile(const OverscaledTileID& tileID) { - if(tileCallbackMap.find(tileID.canonical) != tileCallbackMap.end()) { + if (tileCallbackMap.find(tileID.canonical) != tileCallbackMap.end()) { invokeTileCancel(tileID.canonical); } } @@ -40,8 +39,8 @@ void CustomTileLoader::cancelTile(const OverscaledTileID& tileID) { void CustomTileLoader::removeTile(const OverscaledTileID& tileID) { auto tileCallbacks = tileCallbackMap.find(tileID.canonical); if (tileCallbacks == tileCallbackMap.end()) return; - for(auto iter = tileCallbacks->second.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<mapbox::geojson::geojson>(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); } } |