mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fix bug in feature serialization.

Browse source
This commit is contained in:
vng 2011-01-12 16:20:19 +02:00 • committed by Alex Zolotarev
parent 204fa37986
commit 8fe440570c
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
indexer/feature.cpp
View file

@ -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;