tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] coveredByChildren is false if at least one child is uncovered

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2018-07-11 22:32:51 +03:00
parent bcc93baeb1
commit 1683da3225
2 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mbgl/algorithm/covered_by_children.hpp
View File

@@ -8,15 +8,23 @@ namespace algorithm {
template <typename Iterator>
bool coveredByChildren(const UnwrappedTileID& id, Iterator it, const Iterator& end) {
for (const auto& child : id.children()) {
it = std::lower_bound(it, end, child, [](auto& a, auto& b) { return std::get<0>(a) < b; });
it = std::lower_bound(it, end, child, [](const auto& a, const auto& b) { return std::get<0>(a) < b; });
// Child is not present, neither its grandchildren.
if (it == end) {
return false;
} else if (std::get<0>(*it) != child) {
return coveredByChildren(child, it, end);
}
// Child is not present, but its grandchildren are.
if (std::get<0>(*it) != child) {
// This child is not covered by its grandchildren.
if (!coveredByChildren(child, it, end)) {
return false;
}
}
}
// We looked at all four immediate children and verified that they're covered.
// We looked at all four children (recursively) and verified that they're covered.
return true;
}

44
test/algorithm/covered_by_children.test.cpp
View File

@@ -8,6 +8,48 @@ using namespace mbgl;
using List = std::map<UnwrappedTileID, bool>;
TEST(CoveredByChildren, GrandChildren) {
const List list {
{ UnwrappedTileID{ 0, 0, 0 }, true },
// These grandchildren covers 1/0/0, but 1/0/0 only covers a quarter of
// 0/0/0.
{ UnwrappedTileID{ 2, 0, 0 }, true },
{ UnwrappedTileID{ 2, 0, 1 }, true },
{ UnwrappedTileID{ 2, 1, 0 }, true },
{ UnwrappedTileID{ 2, 1, 1 }, true },
};
EXPECT_FALSE(algorithm::coveredByChildren(UnwrappedTileID{ 0, 0, 0 }, list));
const List list2 {
{ UnwrappedTileID{ 0, 0, 0 }, true },
// Children of 1/0/0
{ UnwrappedTileID{ 2, 0, 0 }, true },
{ UnwrappedTileID{ 2, 0, 1 }, true },
{ UnwrappedTileID{ 2, 1, 0 }, true },
{ UnwrappedTileID{ 2, 1, 1 }, true },
// Children of 1/0/1
{ UnwrappedTileID{ 2, 0, 2 }, true },
{ UnwrappedTileID{ 2, 0, 3 }, true },
{ UnwrappedTileID{ 2, 1, 2 }, true },
{ UnwrappedTileID{ 2, 1, 3 }, true },
// Children of 1/1/0
{ UnwrappedTileID{ 2, 2, 0 }, true },
{ UnwrappedTileID{ 2, 2, 1 }, true },
{ UnwrappedTileID{ 2, 3, 0 }, true },
{ UnwrappedTileID{ 2, 3, 1 }, true },
// Children of 1/0/1
{ UnwrappedTileID{ 2, 2, 2 }, true },
{ UnwrappedTileID{ 2, 2, 3 }, true },
{ UnwrappedTileID{ 2, 3, 2 }, true },
{ UnwrappedTileID{ 2, 3, 3 }, true },
};
EXPECT_TRUE(algorithm::coveredByChildren(UnwrappedTileID{ 0, 0, 0 }, list2));
}
TEST(CoveredByChildren, NotCovered) {
const List list1;
EXPECT_FALSE(algorithm::coveredByChildren(UnwrappedTileID{ 0, 0, 0 }, list1));
@@ -24,7 +66,7 @@ TEST(CoveredByChildren, NotCovered) {
const List list3{
{ UnwrappedTileID{ 0, 0, 0 }, true },
// all four child tiles, with with a different wrap index
// all four child tiles, with a different wrap index
{ UnwrappedTileID{ 1, { 1, 0, 0 } }, true },
{ UnwrappedTileID{ 1, { 1, 0, 1 } }, true },
{ UnwrappedTileID{ 1, { 1, 1, 0 } }, true },