[categories] “WiFi” category should be the last option when showing feature type.

1 files changed, 22 insertions, 5 deletions

diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 9aada94f03..42752de21b 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -41,16 +41,33 @@ namespace
 class UselessTypesChecker
 {
   vector<uint32_t> m_types;
-public:
-  UselessTypesChecker()
+
+  template <size_t N, size_t M>
+  void AddTypes(char const * (&arr)[N][M])
   {
     Classificator const & c = classif();
 
-    char const * arr1[][1] = { { "building" }, { "oneway" }, { "lit" } };
+    for (size_t i = 0; i < N; ++i)
+      m_types.push_back(c.GetTypeByPath(vector<string>(arr[i], arr[i] + M)));
+  }
 
-    for (size_t i = 0; i < ARRAY_SIZE(arr1); ++i)
-      m_types.push_back(c.GetTypeByPath(vector<string>(arr1[i], arr1[i] + 1)));
+public:
+  UselessTypesChecker()
+  {
+    char const * arr1[][1] = {
+      { "building" },
+      { "oneway" },
+      { "lit" },
+      { "internet_access" },
+    };
+    char const * arr2[][2] = {
+      { "internet_access", "wlan"},
+    };
+
+    AddTypes(arr1);
+    AddTypes(arr2);
   }
+
   bool operator() (uint32_t t) const
   {
     return (find(m_types.begin(), m_types.end(), t) != m_types.end());