organicmaps/geocore
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

[indexer] Fix object covering

Browse source
This commit is contained in:
Anatoly Serdtcev 2019-12-26 12:22:48 +03:00 • committed by LaGrunge
parent 7305cc18c8
commit 9f8d0539f7
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
geometry/covering_utils.hpp
View file

@ -78,12 +78,6 @@ template <class CellId, class CellIdContainerT, typename IntersectF>
void CoverObject(IntersectF const & intersect, uint64_t cellPenaltyArea, CellIdContainerT & out,
int cellDepth, CellId cell)
{
if (cell.Level() == cellDepth - 1)
{
out.push_back(cell);
return;
}
uint64_t const cellArea = std::pow(uint64_t(1 << (cellDepth - 1 - cell.Level())), 2);
CellObjectIntersection const intersection = intersect(cell);
@ -95,6 +89,12 @@ void CoverObject(IntersectF const & intersect, uint64_t cellPenaltyArea, CellIdC
return;
}
if (cell.Level() == cellDepth - 1)
{
out.push_back(cell);
return;
}
buffer_vector<CellId, 32> subdiv;
for (uint8_t i = 0; i < 4; ++i)
CoverObject(intersect, cellPenaltyArea, subdiv, cellDepth, cell.Child(i));

8
indexer/cell_id.hpp
View file

@ -11,11 +11,11 @@
using RectId = m2::CellId<19>;
// 24 is enough to have cell size < 2.5m * 2.5m for world.
constexpr int kGeoObjectsDepthLevels = 24;
// 23 is enough to have cell size < 10m * 10m for world.
constexpr int kGeoObjectsDepthLevels = 23;
// Cell size < 40m * 40m for world is good for regions.
constexpr int kRegionsDepthLevels = 20;
// Cell size < 150m * 150m for world is good for regions.
constexpr int kRegionsDepthLevels = 19;
template <typename Bounds, typename CellId>
class CellIdConverter