[generator][classificator] Factor out additional tags for highways as the separate node in classificator:

- hwtag=oneway
- hwtag=private
- hwtag=lit

1 files changed, 2 insertions, 13 deletions

diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 42752de21b..5009ee23b6 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -56,20 +56,16 @@ public:
   {
     char const * arr1[][1] = {
       { "building" },
-      { "oneway" },
-      { "lit" },
+      { "hwtag" },
       { "internet_access" },
     };
-    char const * arr2[][2] = {
-      { "internet_access", "wlan"},
-    };
 
     AddTypes(arr1);
-    AddTypes(arr2);
   }
 
   bool operator() (uint32_t t) const
   {
+    ftype::TruncValue(t, 1);
     return (find(m_types.begin(), m_types.end(), t) != m_types.end());
   }
 };
@@ -308,13 +304,6 @@ bool FeatureParams::IsTypeExist(uint32_t t) const
   return (find(m_Types.begin(), m_Types.end(), t) != m_Types.end());
 }
 
-bool FeatureParams::operator == (FeatureParams const & rhs) const
-{
-  return (FeatureParamsBase::operator ==(rhs) &&
-          m_Types == rhs.m_Types &&
-          GetGeomType() == rhs.GetGeomType());
-}
-
 bool FeatureParams::CheckValid() const
 {
   CHECK(!m_Types.empty() && m_Types.size() <= max_types_count, ());