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

[ugc] separate container for excluded types is added

Browse source
This commit is contained in:
Arsentiy Milchakov 2017-10-19 10:16:45 +03:00 • committed by r.kuznetsov
parent 86c9598fb6
commit ddb6fc5115
3 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
indexer/ftraits.hpp
View file

@ -19,13 +19,18 @@
namespace ftraits
{
template <typename Base, typename Value, bool allowDuplications = false>
template <typename Base, typename Value>
class TraitsBase
{
public:
static Value GetValue(feature::TypesHolder const & types)
{
static Base instance;
auto const excluded = instance.m_excluded.Find(types);
if (instance.m_excluded.IsValid(excluded))
return Base::GetEmptyValue();
auto const it = instance.m_matcher.Find(types);
if (!instance.m_matcher.IsValid(it))
return Base::GetEmptyValue();
@ -34,7 +39,8 @@ public:
}
protected:
ftypes::Matcher<std::unordered_map<uint32_t, Value>, allowDuplications> m_matcher;
ftypes::HashMapMatcher<uint32_t, Value> m_matcher;
ftypes::HashSetMatcher<uint32_t> m_excluded;
};
enum UGCType
@ -60,7 +66,7 @@ struct UGCItem
UGCRatingCategories m_categories;
};
class UGC : public TraitsBase<UGC, UGCItem, true>
class UGC : public TraitsBase<UGC, UGCItem>
{
friend class TraitsBase;
@ -77,7 +83,12 @@ class UGC : public TraitsBase<UGC, UGCItem, true>
ASSERT_EQUAL(row.size(), 5, ());
UGCItem item(ReadMasks(row), ParseByWhitespaces(row[kCategoriesPos]));
m_matcher.AppendType(ParseByWhitespaces(row[kTypePos]), std::move(item));
auto typePath = ParseByWhitespaces(row[kTypePos]);
if (IsUGCAvailable(item.m_mask))
m_matcher.AppendType(std::move(typePath), std::move(item));
else
m_excluded.AppendType(std::move(typePath));
});
}

13
indexer/ftypes_mapping.hpp
View file

@ -11,10 +11,7 @@
namespace ftypes
{
// When [allowDuplications] is true then we are support duplications in ierarchy,
// for ex. shop and shop-alcohol. shop-alcohol is duplicaton of shop, because shop contains
// shop-alcohol.
template <typename Container, bool allowDuplications = false>
template <typename Container>
class Matcher
{
public:
@ -50,14 +47,6 @@ public:
template <typename Type, typename... Args>
void AppendType(Type && type, Args &&... args)
{
#if defined(DEBUG)
if (!allowDuplications)
{
feature::TypesHolder holder;
holder.Assign(classif().GetTypeByPath(type));
ASSERT(Find(holder) == m_mapping.cend(), ("This type already exists", type));
}
#endif
m_mapping.emplace(classif().GetTypeByPath(std::forward<Type>(type)),
std::forward<Args>(args)...);
}

16
indexer/indexer_tests/ugc_types_test.cpp
View file

@ -51,5 +51,21 @@ UNIT_TEST(UgcTypes_Full)
TEST(!UGC::IsDetailsAvailable(holder), ());
ftraits::UGCRatingCategories expected = {};
TEST_EQUAL(UGC::GetCategories(holder), expected, ());
holder.Assign(c.GetTypeByPath({"sponsored", "booking"}));
holder.Add(c.GetTypeByPath({"amenity", "hospital"}));
TEST(!UGC::IsUGCAvailable(holder), ());
TEST(!UGC::IsRatingAvailable(holder), ());
TEST(!UGC::IsReviewsAvailable(holder), ());
TEST(!UGC::IsDetailsAvailable(holder), ());
TEST_EQUAL(UGC::GetCategories(holder), expected, ());
holder.Assign(c.GetTypeByPath({"amenity", "hospital"}));
holder.Add(c.GetTypeByPath({"sponsored", "booking"}));
TEST(!UGC::IsUGCAvailable(holder), ());
TEST(!UGC::IsRatingAvailable(holder), ());
TEST(!UGC::IsReviewsAvailable(holder), ());
TEST(!UGC::IsDetailsAvailable(holder), ());
TEST_EQUAL(UGC::GetCategories(holder), expected, ());
}
}