diff options
| author | Yury Melnichek <melnichek@gmail.com> | 2011-09-11 15:59:00 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:23:43 +0300 |
| commit | d8d6c2e5331026d950efec9bf1409ea27c789a81 (patch) | |
| tree | c5b7bbea13caddf3f25651d1be3005ea134a8fc0 /indexer/index.hpp | |
| parent | 4d56813e90f79ba0468cec3ceb448f214988a405 (diff) | |
CellId refactoring: explicitly specify DEPTH_LEVELS where needed.
Diffstat (limited to 'indexer/index.hpp')
| -rw-r--r-- | indexer/index.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indexer/index.hpp b/indexer/index.hpp index 32570960c4..f814f245fe 100644 --- a/indexer/index.hpp +++ b/indexer/index.hpp @@ -46,7 +46,8 @@ public: template <typename F> void ForEachInRect(F & f, m2::RectD const & rect, uint32_t scale) const { - CallForIntervals(f, covering::CoverViewportAndAppendLowerLevels(rect), rect, scale); + CallForIntervals(f, covering::CoverViewportAndAppendLowerLevels(rect, RectId::DEPTH_LEVELS), + rect, scale); } template <typename F> @@ -55,7 +56,7 @@ public: using namespace covering; IntervalsT intervals; - AppendLowerLevels(GetRectIdAsIs(rect), intervals); + AppendLowerLevels(GetRectIdAsIs(rect), RectId::DEPTH_LEVELS, intervals); CallForIntervals(f, intervals, rect, scale); } @@ -64,8 +65,7 @@ public: template <typename F> void ForEachInScale(F & f, uint32_t scale) const { - int64_t const rootId = RectId("").ToInt64(); - BaseT::ForEachInIntervalAndScale(f, rootId, rootId + RectId("").SubTreeSize(), scale, + BaseT::ForEachInIntervalAndScale(f, 0, static_cast<int64_t>((1ULL << 63) - 1), scale, m2::RectD::GetInfiniteRect()); } }; |