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

[generator:regions] Fix for review

Browse source
This commit is contained in:
Anatoly Serdtcev 2019-04-03 18:47:16 +03:00
parent 61672cbf8f
commit 88f936a926
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/generator_tests/regions_tests.cpp
View file

@ -199,7 +199,7 @@ UNIT_TEST(RegionsBuilderTest_GetCountryTrees)
RegionsBuilder builder(MakeTestDataSet1(collector));
builder.ForEachNormalizedCountry([&](std::string const & name, Node::Ptr const & tree) {
Visit(tree, [&](Node::Ptr const & node) {
auto path = MakeNodePath(node);
auto const path = MakeNodePath(node);
StringJoinPolicy stringifier;
bankOfNames.push_back(stringifier.ToString(path));
});

4
generator/place_node.hpp
View file

@ -47,8 +47,8 @@ private:
template <typename Data, typename Visitor>
void Visit(std::shared_ptr<PlaceNode<Data>> const & tree, Visitor && visitor)
{
std::forward<Visitor>(visitor)(tree);
visitor(tree);
for (auto const & subtree : tree->GetChildren())
Visit(subtree, std::forward<Visitor>(visitor));
Visit(subtree, visitor);
}
} // namespace generator

4
generator/regions/regions.cpp
View file

@ -80,8 +80,8 @@ private:
auto jsonPolicy = JsonPolicy{m_verbose};
Visit(tree, [&](auto && node) {
auto id = node->GetData().GetId();
auto path = MakeNodePath(node);
auto const id = node->GetData().GetId();
auto const path = MakeNodePath(node);
regionsKv << static_cast<int64_t>(id.GetEncodedId()) << " " << jsonPolicy.ToString(path) << "\n";
++countIds;
if (!setIds.insert(id).second)