From 9143a76fcf5b554fd45448aad3f8495bff9ef697 Mon Sep 17 00:00:00 2001 From: vng Date: Thu, 11 Feb 2016 16:10:45 +0300 Subject: [PATCH] Better IsBuildingChecker routine. --- indexer/ftypes_matcher.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index c80dfc08eb..9dad8933bb 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -225,12 +225,9 @@ IsLinkChecker const & IsLinkChecker::Instance() return inst; } -IsBuildingChecker::IsBuildingChecker() +IsBuildingChecker::IsBuildingChecker() : BaseChecker(1 /* level */) { - Classificator const & c = classif(); - - m_types.push_back(c.GetTypeByPath({ "building" })); - m_types.push_back(c.GetTypeByPath({ "building", "address" })); + m_types.push_back(classif().GetTypeByPath({ "building" })); } IsBuildingChecker const & IsBuildingChecker::Instance() @@ -257,7 +254,7 @@ IsLocalityChecker::IsLocalityChecker() m_types.push_back(c.GetTypeByPath(vector(arr[i], arr[i] + 2))); } -IsBuildingPartChecker::IsBuildingPartChecker() : BaseChecker(1) +IsBuildingPartChecker::IsBuildingPartChecker() : BaseChecker(1 /* level */) { m_types.push_back(classif().GetTypeByPath({"building:part"})); } @@ -268,7 +265,7 @@ IsBuildingPartChecker const & IsBuildingPartChecker::Instance() return inst; } -IsBridgeChecker::IsBridgeChecker() : BaseChecker(3) +IsBridgeChecker::IsBridgeChecker() : BaseChecker(3 /* level */) { } @@ -283,7 +280,7 @@ bool IsBridgeChecker::IsMatched(uint32_t type) const return IsTypeConformed(type, {"highway", "*", "bridge"}); } -IsTunnelChecker::IsTunnelChecker() : BaseChecker(3) +IsTunnelChecker::IsTunnelChecker() : BaseChecker(3 /* level */) { }