[generator] Tune threshold distance for the equal places filter algorithm.

1 files changed, 20 insertions, 12 deletions

diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 798a168fca..898327a180 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -290,26 +290,34 @@ bool IsTunnelChecker::IsMatched(uint32_t type) const
   return IsTypeConformed(type, {"highway", "*", "tunnel"});
 }
 
+Type IsLocalityChecker::GetType(uint32_t t) const
+{
+  ftype::TruncValue(t, 2);
+
+  size_t j = COUNTRY;
+  for (; j < LOCALITY_COUNT; ++j)
+    if (t == m_types[j])
+      return static_cast<Type>(j);
+
+  for (; j < m_types.size(); ++j)
+    if (t == m_types[j])
+      return VILLAGE;
+
+  return NONE;
+}
+
 Type IsLocalityChecker::GetType(feature::TypesHolder const & types) const
 {
   for (uint32_t t : types)
   {
-    ftype::TruncValue(t, 2);
-
-    size_t j = COUNTRY;
-    for (; j < LOCALITY_COUNT; ++j)
-      if (t == m_types[j])
-        return static_cast<Type>(j);
-
-    for (; j < m_types.size(); ++j)
-      if (t == m_types[j])
-        return VILLAGE;
+    Type const type = GetType(t);
+    if (type != NONE)
+      return type;
   }
-
   return NONE;
 }
 
-Type IsLocalityChecker::GetType(const FeatureType & f) const
+Type IsLocalityChecker::GetType(FeatureType const & f) const
 {
   feature::TypesHolder types(f);
   return GetType(types);