mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-20 13:23:59 +00:00
Format all C++ and Java code via clang-format
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
@@ -56,20 +56,17 @@ std::vector<feature::FeatureBuilder> MakeTestSet1()
|
||||
return fbs;
|
||||
}
|
||||
|
||||
void TestDepthNodeById(generator::hierarchy::HierarchyLinker::Node::Ptr const & tree, uint64_t id,
|
||||
size_t depth)
|
||||
void TestDepthNodeById(generator::hierarchy::HierarchyLinker::Node::Ptr const & tree, uint64_t id, size_t depth)
|
||||
{
|
||||
auto osmId = base::MakeOsmWay(id);
|
||||
TEST_EQUAL(tree_node::GetDepth(tree_node::FindIf(
|
||||
tree, [&](auto const & data) { return data.GetCompositeId().m_mainId == osmId; })),
|
||||
TEST_EQUAL(tree_node::GetDepth(
|
||||
tree_node::FindIf(tree, [&](auto const & data) { return data.GetCompositeId().m_mainId == osmId; })),
|
||||
depth, ());
|
||||
}
|
||||
|
||||
UNIT_CLASS_TEST(TestWithClassificator, ComplexHierarchy_FlattenBuildingParts)
|
||||
{
|
||||
|
||||
auto trees = generator::hierarchy::BuildHierarchy(MakeTestSet1(),
|
||||
generator::hierarchy::GetMainType,
|
||||
auto trees = generator::hierarchy::BuildHierarchy(MakeTestSet1(), generator::hierarchy::GetMainType,
|
||||
std::make_shared<generator::FilterComplex>());
|
||||
TEST_EQUAL(trees.size(), 1, ());
|
||||
TEST_EQUAL(tree_node::Size(trees[0]), 4, ());
|
||||
@@ -90,14 +87,14 @@ UNIT_CLASS_TEST(TestWithClassificator, ComplexHierarchy_FlattenBuildingParts)
|
||||
|
||||
UNIT_CLASS_TEST(TestWithClassificator, ComplexHierarchy_AddChildrenTo)
|
||||
{
|
||||
auto trees = generator::hierarchy::BuildHierarchy(MakeTestSet1(),
|
||||
generator::hierarchy::GetMainType,
|
||||
auto trees = generator::hierarchy::BuildHierarchy(MakeTestSet1(), generator::hierarchy::GetMainType,
|
||||
std::make_shared<generator::FilterComplex>());
|
||||
TEST_EQUAL(trees.size(), 1, ());
|
||||
TEST_EQUAL(tree_node::Size(trees[0]), 4, ());
|
||||
|
||||
auto osmId = base::MakeOsmWay(3);
|
||||
generator::hierarchy::AddChildrenTo(trees, [&](auto const & compositeId) {
|
||||
generator::hierarchy::AddChildrenTo(trees, [&](auto const & compositeId)
|
||||
{
|
||||
std::vector<generator::hierarchy::HierarchyPlace> fbs;
|
||||
if (compositeId.m_mainId == osmId)
|
||||
{
|
||||
@@ -111,23 +108,20 @@ UNIT_CLASS_TEST(TestWithClassificator, ComplexHierarchy_AddChildrenTo)
|
||||
return fbs;
|
||||
});
|
||||
|
||||
auto node = tree_node::FindIf(
|
||||
trees[0], [&](auto const & data) { return data.GetCompositeId().m_mainId == osmId; });
|
||||
auto node = tree_node::FindIf(trees[0], [&](auto const & data) { return data.GetCompositeId().m_mainId == osmId; });
|
||||
|
||||
TEST(node, ());
|
||||
|
||||
auto const children = node->GetChildren();
|
||||
TEST_EQUAL(children.size(), 2, ());
|
||||
|
||||
auto it = base::FindIf(children, [](auto const & node) {
|
||||
return node->GetData().GetCompositeId().m_mainId == base::MakeOsmWay(4);
|
||||
});
|
||||
auto it = base::FindIf(
|
||||
children, [](auto const & node) { return node->GetData().GetCompositeId().m_mainId == base::MakeOsmWay(4); });
|
||||
CHECK(it != std::end(children), ());
|
||||
CHECK((*it)->HasParent() && (*it)->GetParent()->GetData().GetCompositeId().m_mainId == osmId, ());
|
||||
|
||||
it = base::FindIf(children, [](auto const & node) {
|
||||
return node->GetData().GetCompositeId().m_mainId == base::MakeOsmWay(5);
|
||||
});
|
||||
it = base::FindIf(children,
|
||||
[](auto const & node) { return node->GetData().GetCompositeId().m_mainId == base::MakeOsmWay(5); });
|
||||
CHECK(it != std::end(children), ());
|
||||
CHECK((*it)->HasParent() && (*it)->GetParent()->GetData().GetCompositeId().m_mainId == osmId, ());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user