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

Review fixes.

Browse source
This commit is contained in:
Maxim Pimenov 2018-04-11 14:53:00 +03:00 • committed by Roman Kuznetsov
parent 980a4db1a5
commit 3a850b6f8a
2 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
coding/geometry_coding.hpp
View file

@ -45,25 +45,6 @@ void EncodePointDelta(Sink & sink, m2::PointU const & curr, m2::PointU const & n
WriteVarInt(sink, dy);
}
// Writes the difference of two 2d vectors to sink. The vector |next|
// must have both its coordinates greater than or equal to those
// of |curr|. While this condition is unlikely when encoding polylines,
// the function may be useful when encoding rectangles, in particular
// bounding boxes of shapes.
template <typename Sink>
void EncodePositivePointDelta(Sink & sink, m2::PointU const & curr, m2::PointU const & next)
{
ASSERT_GREATER_OR_EQUAL(next.x, curr.x, ());
ASSERT_GREATER_OR_EQUAL(next.y, curr.y, ());
// Paranoid checks due to possible floating point artifacts
// here. In general, next.x >= curr.x and next.y >= curr.y.
auto const dx = next.x >= curr.x ? next.x - curr.x : 0;
auto const dy = next.y >= curr.y ? next.y - curr.y : 0;
WriteVarUint(sink, dx);
WriteVarUint(sink, dy);
}
// Reads the encoded difference from |source| and returns the
// point equal to |base| + difference.
template <typename Source>
@ -74,17 +55,6 @@ m2::PointU DecodePointDelta(Source & source, m2::PointU const & base)
return m2::PointU(base.x + dx, base.y + dy);
}
// Reads the encoded difference from |source| and returns the
// point equal to |base| + difference. It is guaranteed that
// both coordinates of difference are non-negative.
template <typename Source>
m2::PointU DecodePositivePointDelta(Source & source, m2::PointU const & base)
{
auto const dx = ReadVarUint<uint32_t>(source);
auto const dy = ReadVarUint<uint32_t>(source);
return m2::PointU(base.x + dx, base.y + dy);
}
/// Predict next point for polyline with given previous points (p1, p2).
m2::PointU PredictPointInPolyline(m2::PointU const & maxPoint, m2::PointU const & p1,
m2::PointU const & p2);

32
indexer/cities_boundaries_serdes.hpp
View file

@ -58,7 +58,7 @@ public:
auto const max = ToU(bbox.Max());
(*this)(min);
coding::EncodePositivePointDelta(m_sink, min, max);
EncodeNonNegativePointDelta(min, max);
}
void operator()(m2::CalipersBox const & cbox)
@ -131,6 +131,24 @@ public:
return us;
}
// Writes the difference of two 2d vectors to |m_sink|. The vector |next|
// must have both its coordinates greater than or equal to those
// of |curr|. While this condition is unlikely when encoding polylines,
// this method may be useful when encoding rectangles, in particular
// bounding boxes of shapes.
void EncodeNonNegativePointDelta(m2::PointU const & curr, m2::PointU const & next)
{
ASSERT_GREATER_OR_EQUAL(next.x, curr.x, ());
ASSERT_GREATER_OR_EQUAL(next.y, curr.y, ());
// Paranoid checks due to possible floating point artifacts
// here. In general, next.x >= curr.x and next.y >= curr.y.
auto const dx = next.x >= curr.x ? next.x - curr.x : 0;
auto const dy = next.y >= curr.y ? next.y - curr.y : 0;
WriteVarUint(m_sink, dx);
WriteVarUint(m_sink, dy);
}
Sink & m_sink;
serial::GeometryCodingParams m_params;
m2::PointU m_last;
@ -198,7 +216,7 @@ public:
{
m2::PointU min;
(*this)(min);
auto const max = coding::DecodePositivePointDelta(m_source, min);
auto const max = DecodeNonNegativePointDelta(min);
bbox = m2::BoundingBox();
bbox.Add(FromU(min));
@ -254,6 +272,16 @@ public:
return ps;
}
// Reads the encoded difference from |m_source| and returns the
// point equal to |base| + difference. It is guaranteed that
// both coordinates of difference are non-negative.
m2::PointU DecodeNonNegativePointDelta(m2::PointU const & base)
{
auto const dx = ReadVarUint<uint32_t>(m_source);
auto const dy = ReadVarUint<uint32_t>(m_source);
return m2::PointU(base.x + dx, base.y + dy);
}
Source & m_source;
serial::GeometryCodingParams const m_params;
m2::PointU m_last;