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

[generator][search] Use ftypes::AttractionsChecker for FilterWorld::IsPopularAttraction to be consistent with popularity builder.

Browse source
This commit is contained in:
tatiana-yan 2019-09-27 13:49:15 +03:00 • committed by Maksim Andrianov
parent 19eff204b7
commit 2b7ea2a555
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
generator/filter_world.cpp
View file

@ -1,9 +1,8 @@
#include "generator/filter_world.hpp"
#include "search/utils.hpp"
#include "indexer/categories_holder.hpp"
#include "indexer/classificator.hpp"
#include "indexer/ftypes_matcher.hpp"
#include "indexer/scales.hpp"
#include <algorithm>
@ -49,15 +48,9 @@ bool FilterWorld::IsPopularAttraction(feature::FeatureBuilder const & fb, std::s
if (fb.GetName().empty())
return false;
auto static const attractionTypes = search::GetCategoryTypes("attractions", "en", GetDefaultCategories());
ASSERT(std::is_sorted(attractionTypes.begin(), attractionTypes.end()), ());
auto const & featureTypes = fb.GetTypes();
if (!std::any_of(featureTypes.begin(), featureTypes.end(), [](uint32_t t) {
return std::binary_search(attractionTypes.begin(), attractionTypes.end(), t);
}))
{
auto const & attractionsChecker = ftypes::AttractionsChecker::Instance();
if (!attractionsChecker(fb.GetTypes()))
return false;
}
if (popularityFilename.empty())
return false;