Correct calculation of area's center point.

It's independent from visible triangles now.

map/draw_info.hpp

@@ -67,15 +67,11 @@ namespace di
 
   class AreaInfo
   {
-    mutable m2::PointD m_center;
-
-    inline static double ic() { return -1.0E10; }
+    m2::PointD m_center;
 
   public:
     vector<m2::PointD> m_path;
 
-    AreaInfo() : m_center(ic(), ic()) {}
-
     void reserve(size_t ptsCount)
     {
       m_path.reserve(ptsCount);
@@ -94,21 +90,8 @@ namespace di
 
     size_t size() const { return m_path.size(); }
 
-    // lazy evaluation of area's center point
-    m2::PointD GetCenter() const
-    {
-      if (m_center.EqualDxDy(m2::PointD(ic(), ic()), 1.0E-8))
-      {
-        m_center = m2::PointD(0.0, 0.0);
-        size_t count = m_path.size();
-        for (size_t i = 0; i < count; ++i)
-          m_center += m_path[i];
-
-        m_center *= (1.0/static_cast<double>(count));
-      }
-
-      return m_center;
-    }
+    void SetCenter(m2::PointD const & p) { m_center = p; }
+    m2::PointD GetCenter() const { return m_center; }
   };
 }
 

map/draw_processor.cpp

@@ -153,20 +153,4 @@ bool area_tess_points::IsExist() const
   return !m_points.empty();
 }
 
-area_path_points::area_path_points(ScreenBase const & convertor, m2::RectD const & rect)
-: area_base(convertor, rect)
-{
-  m_points.push_back(AreaInfo());
-}
-
-void area_path_points::operator() (m2::PointD const & p)
-{
-  push_point(p);
-}
-
-bool area_path_points::IsExist() const
-{
-  return (m_points.back().size() >= 3);
-}
-
 }

map/draw_processor.hpp

@@ -165,23 +165,13 @@ namespace get_pts
 
     bool IsExist() const;
   };
-
-  /// Used in for poly-region draw policy.
-  class area_path_points : public area_base
-  {
-  public:
-    area_path_points(ScreenBase const & convertor, m2::RectD const & rect);
-
-    void operator() (m2::PointD const & p);
-
-    bool IsExist() const;
-  };
   //@}
 
   /// Adapter for points filtering, before they will go for processing
   template <class TBase> class filter_screenpts_adapter : public TBase
   {
-    m2::PointD m_prev;
+    m2::PointD m_prev, m_center;
+    size_t m_count;
 
     static bool equal_scr_pts(m2::PointD const & p1, m2::PointD const & p2)
     {
@@ -195,8 +185,8 @@ namespace get_pts
 
   public:
     filter_screenpts_adapter(ScreenBase const & convertor, m2::RectD const & rect)
-      : TBase(convertor, rect),
-      m_prev(numeric_limits<CoordT>::min(), numeric_limits<CoordT>::min())
+      : TBase(convertor, rect), m_count(0),
+      m_prev(numeric_limits<CoordT>::min(), numeric_limits<CoordT>::min()), m_center(0, 0)
     {
     }
 
@@ -214,11 +204,18 @@ namespace get_pts
     {
       m2::PointD arr[] = { this->g2p(p1), this->g2p(p2), this->g2p(p3) };
 
-      m2::RectD r(arr[0], arr[1]);
-      r.Add(arr[2]);
+      m2::RectD r;
+      for (int i = 0; i < 3; ++i)
+      {
+        r.Add(arr[i]);
+        m_center += arr[i];
+      }
+      ++m_count;
 
       if (!empty_scr_rect(r) && r.IsIntersect(this->m_rect))
         TBase::operator()(arr[0], arr[1], arr[2]);
     }
+
+    m2::PointD GetCenter() const { return m_center / (3*m_count); }
   };
 }

map/drawer_yg.cpp

@@ -141,7 +141,7 @@ void DrawerYG::drawPath(vector<m2::PointD> const & pts, di::DrawRule const * rul
 {
   // if any rule needs caching - cache as a whole vector
   bool flag = false;
-  for (int i = 0; i < count; ++i)
+  for (size_t i = 0; i < count; ++i)
   {
     if (rules[i].m_rule->GetID() == drule::BaseRule::empty_id)
     {
@@ -156,7 +156,7 @@ void DrawerYG::drawPath(vector<m2::PointD> const & pts, di::DrawRule const * rul
   if (flag)
   {
     // collect yg::PenInfo into array and pack them as a whole
-    for (int i = 0; i < count; ++i)
+    for (size_t i = 0; i < count; ++i)
     {
       rule_ptr_t pRule = rules[i].m_rule;
       vector<double> pattern;
@@ -175,7 +175,7 @@ void DrawerYG::drawPath(vector<m2::PointD> const & pts, di::DrawRule const * rul
     // map array of pens
     if (m_pSkin->mapPenInfo(&penInfos[0], &styleIDs[0], count))
     {
-      for (int i = 0; i < count; ++i)
+      for (size_t i = 0; i < count; ++i)
         rules[i].m_rule->SetID(styleIDs[i]);
     }
     else
@@ -186,7 +186,7 @@ void DrawerYG::drawPath(vector<m2::PointD> const & pts, di::DrawRule const * rul
   }
 
   // draw path with array of rules
-  for (int i = 0; i < count; ++i)
+  for (size_t i = 0; i < count; ++i)
     m_pScreen->drawPath(&pts[0], pts.size(), rules[i].m_rule->GetID(), rules[i].m_depth);
 }
 

map/framework.cpp

@@ -31,6 +31,9 @@ namespace fwork
     template <class TSrc> void assign_area(di::DrawInfo * p, TSrc & src)
     {
       p->m_areas.swap(src.m_points);
+
+      ASSERT ( !p->m_areas.empty(), () );
+      p->m_areas.back().SetCenter(src.GetCenter());
     }
   }