diff options
| author | vng <viktor.govako@gmail.com> | 2011-08-23 18:49:31 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:22:20 +0300 |
| commit | b9df96e89b57666178aada45c4c25eece8f8d756 (patch) | |
| tree | 3c92c630bbe427e6bda7f91b2567ff4534810c6b /indexer/geometry_serialization.cpp | |
| parent | 2046a47d565e7f3c9a1a18eaec7d969f9bf20789 (diff) | |
Factor out 'CodingParams' to separate module.
Diffstat (limited to 'indexer/geometry_serialization.cpp')
| -rw-r--r-- | indexer/geometry_serialization.cpp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/indexer/geometry_serialization.cpp b/indexer/geometry_serialization.cpp index 20bede24cd..4df3fd3dd9 100644 --- a/indexer/geometry_serialization.cpp +++ b/indexer/geometry_serialization.cpp @@ -2,12 +2,10 @@ #include "mercator.hpp" #include "point_to_int64.hpp" #include "geometry_coding.hpp" +#include "coding_params.hpp" #include "../geometry/pointu_to_uint64.hpp" -//#include "../coding/file_reader.hpp" -//#include "../coding/file_writer.hpp" - #include "../std/algorithm.hpp" #include "../std/bind.hpp" #include "../std/iterator.hpp" @@ -18,26 +16,6 @@ namespace serial { - -CodingParams::CodingParams() - : m_BasePointUint64(0), m_CoordBits(30) -{ - m_BasePoint = m2::Uint64ToPointU(m_BasePointUint64); -} - -CodingParams::CodingParams(uint8_t coordBits, m2::PointD const & pt) - : m_CoordBits(coordBits) -{ - m_BasePoint = PointD2PointU(pt.x, pt.y, coordBits); - m_BasePointUint64 = m2::PointUToUint64(m_BasePoint); -} - -CodingParams::CodingParams(uint8_t coordBits, uint64_t basePointUint64) - : m_BasePointUint64(basePointUint64), m_CoordBits(coordBits) -{ - m_BasePoint = m2::Uint64ToPointU(m_BasePointUint64); -} - namespace pts { inline m2::PointU D2U(m2::PointD const & p, uint32_t coordBits) |