RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Add 'maxDepth' parameter to 'CoverRect'. Use different depth for different mwm's.

Browse source
This commit is contained in:
vng 2011-09-24 15:05:07 +03:00 • committed by Alex Zolotarev
parent 6a5c67addc
commit 6368e0e6dc
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
indexer/cell_coverer.hpp
View file

@ -26,7 +26,7 @@ inline void SplitRectCell(CellIdT id,
template <typename BoundsT, typename CellIdT>
inline void CoverRect(CoordT minX, CoordT minY,
CoordT maxX, CoordT maxY,
size_t cells_count,
size_t cells_count, int maxDepth,
vector<CellIdT> & cells)
{
ASSERT_LESS(minX, maxX, ());
@ -53,7 +53,7 @@ inline void CoverRect(CoordT minX, CoordT minY,
CellIdT id = cellQueue.front();
cellQueue.pop();
if (id.Level() == CellIdT::DEPTH_LEVELS - 1)
if (id.Level() == maxDepth - 1)
{
result.push_back(id);
break;
@ -85,7 +85,7 @@ inline void CoverRect(CoordT minX, CoordT minY,
for (size_t i = 0; i < result.size(); ++i)
{
CellIdT id = result[i];
while (id.Level() < CellIdT::DEPTH_LEVELS - 1)
while (id.Level() < maxDepth - 1)
{
vector<CellIdT> children;
SplitRectCell<BoundsT>(id, minX, minY, maxX, maxY, children);

2
indexer/feature_covering.cpp
View file

@ -165,7 +165,7 @@ void AppendLowerLevels(RectId id, int cellDepth, IntervalsT & intervals)
void CoverViewportAndAppendLowerLevels(m2::RectD const & r, int cellDepth, IntervalsT & res)
{
vector<RectId> ids;
CoverRect<MercatorBounds, RectId>(r.minX(), r.minY(), r.maxX(), r.maxY(), 8, ids);
CoverRect<MercatorBounds, RectId>(r.minX(), r.minY(), r.maxX(), r.maxY(), 8, cellDepth, ids);
IntervalsT intervals;
intervals.reserve(ids.size() * 4);

4
indexer/indexer_tests/cell_coverer_test.cpp
View file

@ -18,7 +18,7 @@ UNIT_TEST(CellIdToStringRecode)
UNIT_TEST(GoldenCoverRect)
{
vector<CellIdT> cells;
CoverRect<OrthoBounds>(27.43, 53.83, 27.70, 53.96, 4, cells);
CoverRect<OrthoBounds>(27.43, 53.83, 27.70, 53.96, 4, RectId::DEPTH_LEVELS, cells);
TEST_EQUAL(cells.size(), 4, ());
@ -33,7 +33,7 @@ UNIT_TEST(ArtificialCoverRect)
typedef Bounds<0, 0, 16, 16> TestBounds;
vector<CellIdT> cells;
CoverRect<TestBounds>(5, 5, 11, 11, 4, cells);
CoverRect<TestBounds>(5, 5, 11, 11, 4, RectId::DEPTH_LEVELS, cells);
TEST_EQUAL(cells.size(), 4, ());