Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2011-02-08 01:06:04 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:11:54 +0300
commit2680e4a2a79b7a8fc2490212d6de11c3afad47a8 (patch)
tree1ff6e6154583b1ed502966c751ee90da7846e8aa /indexer/feature_impl.hpp
parent5c736831eb56d740c84fc1d99bbdd4c1f74e2bca (diff)
Remove obsolete feature-points serialization functions.
Diffstat (limited to 'indexer/feature_impl.hpp')
-rw-r--r--indexer/feature_impl.hpp84
1 files changed, 1 insertions, 83 deletions
diff --git a/indexer/feature_impl.hpp b/indexer/feature_impl.hpp
index 99e0bcc05a..4559a22e98 100644
--- a/indexer/feature_impl.hpp
+++ b/indexer/feature_impl.hpp
@@ -1,15 +1,9 @@
#pragma once
-#include "cell_id.hpp"
-
-#include "../coding/write_to_sink.hpp"
-#include "../coding/varint.hpp"
+#include "point_to_int64.hpp"
#include "../geometry/point2d.hpp"
-#include "../std/algorithm.hpp"
-#include "../std/iterator.hpp"
-
namespace feature
{
@@ -27,82 +21,6 @@ namespace feature
}
}
- namespace detail
- {
- inline void TransformPoints(vector<m2::PointD> const & points, vector<int64_t> & cells)
- {
- cells.reserve(points.size());
- transform(points.begin(), points.end(), back_inserter(cells), &pts::FromPoint);
- }
-
- template <class TSink>
- void WriteCellsSimple(vector<int64_t> const & cells, int64_t base, TSink & sink)
- {
- for (size_t i = 0; i < cells.size(); ++i)
- WriteVarInt(sink, i == 0 ? cells[0] - base : cells[i] - cells[i-1]);
- }
-
- template <class TSink>
- void WriteCells(vector<int64_t> const & cells, int64_t base, TSink & sink)
- {
- vector<char> buffer;
- MemWriter<vector<char> > writer(buffer);
-
- WriteCellsSimple(cells, base, writer);
-
- uint32_t const count = static_cast<uint32_t>(buffer.size());
- WriteVarUint(sink, count);
- sink.Write(&buffer[0], count);
- }
-
- template <class TCont> class points_emitter
- {
- TCont & m_points;
- int64_t m_id;
-
- public:
- points_emitter(TCont & points, uint32_t count, int64_t base)
- : m_points(points), m_id(base)
- {
- m_points.reserve(count);
- }
- void operator() (int64_t id)
- {
- m_points.push_back(pts::ToPoint(m_id += id));
- }
- };
-
- template <class TCont, class TSource>
- void ReadPoints(TCont & points, int64_t base, TSource & src)
- {
- uint32_t const count = ReadVarUint<uint32_t>(src);
- vector<char> buffer(count);
- char * p = &buffer[0];
- src.Read(p, count);
-
- ReadVarInt64Array(p, p + count, points_emitter<TCont>(points, count / 2, base));
- }
- }
-
- template <class TSink>
- void SavePoints(vector<m2::PointD> const & points, int64_t base, TSink & sink)
- {
- ASSERT_GREATER ( points.size(), 1, () );
-
- vector<int64_t> cells;
- detail::TransformPoints(points, cells);
-
- detail::WriteCells(cells, base, sink);
- }
-
- template <class TCont, class TSource>
- void LoadPoints(TCont & points, int64_t base, TSource & src)
- {
- detail::ReadPoints(points, base, src);
-
- ASSERT_GREATER ( points.size(), 1, () );
- }
-
static int g_arrScales[] = { 7, 10, 14, 17 }; // 17 = scales::GetUpperScale()