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

Serialize first point as difference of points, not as difference of int64s.

Browse source
This commit is contained in:
Yury Melnichek 2011-04-23 01:58:47 +02:00 • committed by Alex Zolotarev
parent 65e7099282
commit 8930c40023
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
indexer/feature.cpp
View file

@ -4,10 +4,12 @@
#include "feature_impl.hpp"
#include "feature_visibility.hpp"
#include "scales.hpp"
#include "geometry_coding.hpp"
#include "geometry_serialization.hpp"
#include "../defines.hpp" // just for file extensions
#include "../geometry/pointu_to_uint64.hpp"
#include "../geometry/rect2d.hpp"
#include "../geometry/region2d.hpp"
@ -222,7 +224,7 @@ uint8_t FeatureBuilder1::GetHeader() const
return header;
}
void FeatureBuilder1::SerializeBase(buffer_t & data, int64_t base) const
void FeatureBuilder1::SerializeBase(buffer_t & data, m2::PointU const & basePoint) const
{
PushBackByteSink<buffer_t> sink(data);
@ -241,7 +243,7 @@ void FeatureBuilder1::SerializeBase(buffer_t & data, int64_t base) const
}
if (m_bPoint)
WriteVarInt(sink, feature::pts::FromPoint(m_Center) - base);
WriteVarUint(sink, EncodeDelta(PointD2PointU(m_Center.x, m_Center.y), basePoint));
}
void FeatureBuilder1::Serialize(buffer_t & data) const
@ -250,7 +252,7 @@ void FeatureBuilder1::Serialize(buffer_t & data) const
data.clear();
SerializeBase(data, 0);
SerializeBase(data, m2::PointU(0, 0));
PushBackByteSink<buffer_t> sink(data);
@ -342,7 +344,7 @@ bool FeatureBuilder2::PreSerialize(buffers_holder_t const & data)
return base_type::PreSerialize();
}
namespace
namespace
{
template <class TSink> class BitSink
{
@ -382,7 +384,7 @@ void FeatureBuilder2::Serialize(buffers_holder_t & data, int64_t base)
data.m_buffer.clear();
// header data serialization
SerializeBase(data.m_buffer, base);
SerializeBase(data.m_buffer, m2::Uint64ToPointU(static_cast<uint64_t>(base)));
PushBackByteSink<buffer_t> sink(data.m_buffer);
@ -514,7 +516,9 @@ void FeatureBase::ParseCommon() const
if (h & HEADER_HAS_POINT)
{
m_Center = feature::pts::ToPoint(ReadVarInt<int64_t>(source) + m_base);
CoordPointT center = PointU2PointD(DecodeDelta(ReadVarUint<uint64_t>(source),
m2::Uint64ToPointU(m_base)));
m_Center = m2::PointD(center.first, center.second);
m_LimitRect.Add(m_Center);
}

4
indexer/feature.hpp
View file

@ -55,7 +55,7 @@ public:
m_Types.clear();
m_Types.push_back(type);
}
bool IsTypeExist(uint32_t t) const;
bool AssignType_SetDifference(vector<uint32_t> const & diffTypes);
@ -66,7 +66,7 @@ public:
/// @name Serialization.
//@{
void Serialize(buffer_t & data) const;
void SerializeBase(buffer_t & data, int64_t base) const;
void SerializeBase(buffer_t & data, m2::PointU const & basePoint) const;
void Deserialize(buffer_t & data);
//@}