Fix coastline feature processing: skip other types and additional checks after types manipulating.

generator/feature_builder.cpp

@@ -75,6 +75,23 @@ void FeatureBuilder1::AddPolygon(vector<m2::PointD> & poly)
   m_Polygons.back().swap(poly);
 }
 
+void FeatureBuilder1::DoCorrectForType(EGeomType type)
+{
+  if (m_Params.GetGeomType() == type &&
+      !IsDrawableLike(m_Params.m_Types, static_cast<FeatureGeoType>(type)))
+  {
+    m_Params.RemoveGeomType(type);
+  }
+}
+
+bool FeatureBuilder1::DoCorrect()
+{
+  DoCorrectForType(GEOM_AREA);
+  DoCorrectForType(GEOM_LINE);
+
+  return (m_Params.GetGeomType() != GEOM_UNDEFINED);
+}
+
 FeatureBase FeatureBuilder1::GetFeatureBase() const
 {
   CHECK ( CheckValid(), (*this) );

generator/feature_builder.hpp

@@ -43,6 +43,13 @@ public:
   inline void AddType(uint32_t type) { m_Params.AddType(type); }
   inline bool HasType(uint32_t t) const { return m_Params.IsTypeExist(t); }
   inline bool PopExactType(uint32_t type) { return m_Params.PopExactType(type); }
+  inline void SetType(uint32_t type) { m_Params.SetType(type); }
+
+  /// Check for feature visibility according to it's types.
+  /// If feature is invisible, it's not correct.
+  /// This fuction is called after it's classificator types manipulating.
+  void DoCorrectForType(feature::EGeomType type);
+  bool DoCorrect();
 
   typedef vector<char> buffer_t;
 

generator/feature_generator.cpp

@@ -282,10 +282,15 @@ public:
     if (m_coasts)
     {
       if (fb.HasType(m_coastType))
+      {
+        // leave only coastline type
+        fb.SetType(m_coastType);
         (*m_coasts)(fb);
+      }
     }
 
-    if (!fb.PopExactType(m_coastType))
+    // remove coastline type
+    if (!fb.PopExactType(m_coastType) && fb.DoCorrect())
     {
       if (m_world)
         (*m_world)(fb);

generator/feature_merger.hpp

@@ -31,7 +31,6 @@ public:
   inline m2::PointD FirstPoint() const { return GetGeometry().front(); }
   inline m2::PointD LastPoint() const { return GetGeometry().back(); }
 
-  inline void SetType(uint32_t type) { m_Params.SetType(type); }
   inline bool PopAnyType(uint32_t & type) { return m_Params.PopAnyType(type); }
 
   template <class ToDo> void ForEachChangeTypes(ToDo toDo)

indexer/feature_data.hpp

@@ -14,6 +14,7 @@ namespace feature
   enum EGeomType
   {
     GEOM_UNDEFINED = -1,
+    // Note! do not change this values. Should be equal with FeatureGeoType.
     GEOM_POINT = 0,
     GEOM_LINE = 1,
     GEOM_AREA = 2

indexer/feature_visibility.hpp

@@ -13,7 +13,12 @@ class FeatureBase;
 
 namespace feature
 {
-  enum FeatureGeoType { FEATURE_TYPE_POINT = 0, FEATURE_TYPE_LINE, FEATURE_TYPE_AREA };
+  // Note! do not change this values. Should be equal with EGeomType.
+  enum FeatureGeoType {
+    FEATURE_TYPE_POINT = 0,
+    FEATURE_TYPE_LINE = 1,
+    FEATURE_TYPE_AREA = 2
+  };
 
   bool IsDrawableAny(uint32_t type);
   bool IsDrawableLike(vector<uint32_t> const & type, FeatureGeoType ft);