[search] house number recognition

1 files changed, 36 insertions, 4 deletions

diff --git a/indexer/feature_impl.cpp b/indexer/feature_impl.cpp
index bcac11206c..16e2c73aec 100644
--- a/indexer/feature_impl.cpp
+++ b/indexer/feature_impl.cpp
@@ -1,6 +1,7 @@
 #include "feature_impl.hpp"
 
 #include "../base/string_utils.hpp"
+#include "../base/logging.hpp"
 
 
 namespace feature
@@ -22,12 +23,43 @@ bool IsNumber(strings::UniString const & s)
   return true;
 }
 
-/// Check that token can be house number.
-bool IsHouseNumber(strings::UniString const & s)
+bool IsStreetNumber(strings::UniString const & s)
+{
+  size_t count = s.size();
+  if (count >= 2)
+  {
+    /// add different localities in future, if it's a problem.
+    string streetEndings [] = {"st", "nd", "rd", "th"};
+    for (size_t i = 0; i < ARRAY_SIZE(streetEndings); ++i)
+    {
+      size_t start = count - streetEndings[i].size();
+      bool flag = false;
+      for (size_t j = 0; j < streetEndings[i].size(); ++j)
+      {
+        if (streetEndings[i][j] != s[start + j])
+        {
+          flag = true;
+          break;
+        }
+      }
+      if (flag)
+        return false;
+    }
+    return true;
+  }
+  return false;
+}
+
+bool IsHouseNumberDeepCheck(strings::UniString const & s)
 {
   size_t const count = s.size();
-  /// @todo Probably, call some check function from House::
-  return (count > 0 && count < 8 && IsDigit(s[0]));
+  if (count == 0)
+    return false;
+  if (!IsDigit(s[0]))
+    return false;
+  if (IsStreetNumber(s))
+    return false;
+  return (count < 8);
 }
 
 bool IsHouseNumber(string const & s)