diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-07 10:17:37 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-11 19:36:21 +0300 |
commit | 36b3ba56b6394f8d5d0f4f43176e65c24ffba6ea (patch) | |
tree | 1dccf71c8bd210dcc26e55b79c01fc36df46297b /src/mbgl | |
parent | 7b907b6d1ceddd9e10263316964aea101bd743b8 (diff) | |
download | qtlocation-mapboxgl-36b3ba56b6394f8d5d0f4f43176e65c24ffba6ea.tar.gz |
[core] Improve Source::Impl readability
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/style/source_impl.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/src/mbgl/style/source_impl.cpp b/src/mbgl/style/source_impl.cpp index c53174bea3..1fb6d59f0e 100644 --- a/src/mbgl/style/source_impl.cpp +++ b/src/mbgl/style/source_impl.cpp @@ -176,14 +176,13 @@ void Source::Impl::reloadTiles() { cache.clear(); for (auto& pair : tiles) { - auto tile = pair.second.get(); - tile->redoLayout(); + pair.second->redoLayout(); } } std::unordered_map<std::string, std::vector<Feature>> Source::Impl::queryRenderedFeatures(const QueryParameters& parameters) const { std::unordered_map<std::string, std::vector<Feature>> result; - if (renderTiles.empty()) { + if (renderTiles.empty() || parameters.geometry.empty()) { return result; } @@ -194,21 +193,16 @@ std::unordered_map<std::string, std::vector<Feature>> Source::Impl::queryRendere parameters.transformState, 0, { p.x, parameters.transformState.getHeight() - p.y }).p); } - if (queryGeometry.empty()) { - return result; - } - mapbox::geometry::box<double> box = mapbox::geometry::envelope(queryGeometry); for (const auto& tilePtr : renderTiles) { - const RenderTile& tile = tilePtr.second; - - GeometryCoordinate tileSpaceBoundsMin = TileCoordinate::toGeometryCoordinate(tile.id, box.min); + const RenderTile& renderTile = tilePtr.second; + GeometryCoordinate tileSpaceBoundsMin = TileCoordinate::toGeometryCoordinate(renderTile.id, box.min); if (tileSpaceBoundsMin.x >= util::EXTENT || tileSpaceBoundsMin.y >= util::EXTENT) { continue; } - GeometryCoordinate tileSpaceBoundsMax = TileCoordinate::toGeometryCoordinate(tile.id, box.max); + GeometryCoordinate tileSpaceBoundsMax = TileCoordinate::toGeometryCoordinate(renderTile.id, box.max); if (tileSpaceBoundsMax.x < 0 || tileSpaceBoundsMax.y < 0) { continue; } @@ -216,13 +210,13 @@ std::unordered_map<std::string, std::vector<Feature>> Source::Impl::queryRendere GeometryCoordinates tileSpaceQueryGeometry; tileSpaceQueryGeometry.reserve(queryGeometry.size()); for (const auto& c : queryGeometry) { - tileSpaceQueryGeometry.push_back(TileCoordinate::toGeometryCoordinate(tile.id, c)); + tileSpaceQueryGeometry.push_back(TileCoordinate::toGeometryCoordinate(renderTile.id, c)); } - tile.tile.queryRenderedFeatures(result, - tileSpaceQueryGeometry, - parameters.transformState, - parameters.layerIDs); + renderTile.tile.queryRenderedFeatures(result, + tileSpaceQueryGeometry, + parameters.transformState, + parameters.layerIDs); } return result; @@ -253,8 +247,7 @@ void Source::Impl::dumpDebugLogs() const { Log::Info(Event::General, "Source::loaded: %d", loaded); for (const auto& pair : tiles) { - auto& tile = pair.second; - tile->dumpDebugLogs(); + pair.second->dumpDebugLogs(); } } |