[generator] Fix bug with skipping types for inner boundary relations

(Should skip only boundaries, not all types).

1 files changed, 15 insertions, 2 deletions

diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 98b5a2c110..b1f32a9a9b 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -96,9 +96,22 @@ uint8_t FeatureParams::GetTypeMask() const
   return h;
 }
 
-void FeatureParams::AddTypes(FeatureParams const & rhs)
+void FeatureParams::AddTypes(FeatureParams const & rhs, uint32_t skipType2)
 {
-  m_Types.insert(m_Types.end(), rhs.m_Types.begin(), rhs.m_Types.end());
+  if (skipType2 == 0)
+  {
+    m_Types.insert(m_Types.end(), rhs.m_Types.begin(), rhs.m_Types.end());
+  }
+  else
+  {
+    for (size_t i = 0; i < rhs.m_Types.size(); ++i)
+    {
+      uint32_t t = rhs.m_Types[i];
+      ftype::TruncValue(t, 2);
+      if (t != skipType2)
+        m_Types.push_back(t);
+    }
+  }
 }
 
 void FeatureParams::FinishAddingTypes()