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

[generator:regions] Fix duplicate of regions in mvm-repack

Browse source
This commit is contained in:
Anatoly Serdtcev 2019-07-19 18:26:13 +03:00 • committed by LaGrunge
parent b664abac47
commit 372fbcf78d
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
generator/generator_tests/regions_tests.cpp
View file

@ -567,20 +567,21 @@ UNIT_TEST(RegionsBuilderTest_GenerateRusMoscowSuburb)
TEST(HasName(regions, u8"Россия, region: Москва"), ());
TEST(HasName(regions,
u8"Россия, region: Москва, subregion: Западный административный округ, "
u8"locality: Москва"),
u8"Россия, region: Москва, locality: Москва, "
u8"subregion: Западный административный округ"),
());
TEST(HasName(regions,
u8"Россия, region: Москва, subregion: Западный административный округ, "
u8"locality: Москва, suburb: Раменки"),
u8"Россия, region: Москва, locality: Москва, "
u8"subregion: Западный административный округ, suburb: Раменки"),
());
TEST(HasName(regions,
u8"Россия, region: Москва, subregion: Западный административный округ, "
u8"locality: Москва, suburb: Раменки, sublocality: Воробъёвы горы"),
u8"Россия, region: Москва, locality: Москва, "
u8"subregion: Западный административный округ, "
u8"suburb: Раменки, sublocality: Воробъёвы горы"),
());
TEST(HasName(regions,
u8"Россия, region: Москва, subregion: Западный административный округ, "
u8"locality: Москва, sublocality: Центр"),
u8"Россия, region: Москва, locality: Москва, "
u8"subregion: Западный административный округ, sublocality: Центр"),
());
TEST(!ContainsSubname(regions, u8"Тропарёво"), ());
}

5
generator/regions/node.cpp
View file

@ -63,11 +63,6 @@ NodePath MakeLevelPath(Node::Ptr const & node)
}
std::reverse(path.begin(), path.end());
// Sort by level in case that megapolis (PlaceLevel::Locality) contains subregions
// (PlaceLevel::Subregions).
std::sort(path.begin(), path.end(), [](Node::Ptr const & l, Node::Ptr const & r) {
return l->GetData().GetLevel() < r->GetData().GetLevel();
});
return path;
}