From 8fe440570cb0dc68ce530f4b3b978d5b10fa1039 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Wed, 12 Jan 2011 16:20:19 +0200
Subject: [PATCH] Fix bug in feature serialization.

---
 indexer/feature.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index 26017c6834..e4948b19ed 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -228,7 +228,7 @@ void FeatureBuilder1::Serialize(buffer_t & data) const
 
   PushBackByteSink<buffer_t> sink(data);
 
-  if (!m_Geometry.empty())
+  if (m_bLinear || m_bArea)
     feature::SavePoints(m_Geometry, sink);
 
   if (m_bArea)
@@ -265,22 +265,14 @@ void FeatureBuilder1::Deserialize(buffer_t & data)
 
   ArrayByteSource src(f.DataPtr() + f.m_GeometryOffset);
 
-  FeatureBase::FeatureType const ft = f.GetFeatureType();
-
-  if (ft != FeatureBase::FEATURE_TYPE_POINT)
+  if (m_bLinear || m_bArea)
   {
     feature::LoadPoints(m_Geometry, src);
-
     CalcRect(m_Geometry, m_LimitRect);
   }
 
-  if (ft == FeatureBase::FEATURE_TYPE_LINE)
-    m_bLinear = true;
-
-  if (ft == FeatureBase::FEATURE_TYPE_AREA)
+  if (m_bArea)
   {
-    m_bArea = true;
-
     uint32_t const count = ReadVarUint<uint32_t>(src);
     for (uint32_t i = 0; i < count; ++i)
     {
@@ -480,6 +472,9 @@ void FeatureBase::InitFeatureBuilder(FeatureBuilder1 & fb) const
   if (h & HEADER_HAS_POINT)
     fb.SetCenter(m_Center);
 
+  if (h & HEADER_IS_LINE)
+    fb.SetLinear();
+
   if (h & HEADER_IS_AREA)
   {
     list<vector<m2::PointD> > l;