[coding] [geometry] Refactored geometry serialization.

This commit moves all the code related to geometry
serialization from indexer/ and coding/ to a single place,
namely coding/geometry_coding.{c,h}pp.

1 files changed, 8 insertions, 8 deletions

diff --git a/indexer/centers_table.cpp b/indexer/centers_table.cpp
index 0b863e190d..3ffed0a8b2 100644
--- a/indexer/centers_table.cpp
+++ b/indexer/centers_table.cpp
@@ -1,10 +1,10 @@
 #include "indexer/centers_table.hpp"
 
 #include "indexer/feature_processor.hpp"
-#include "indexer/geometry_coding.hpp"
 
 #include "coding/endianness.hpp"
 #include "coding/file_container.hpp"
+#include "coding/geometry_coding.hpp"
 #include "coding/memory_region.hpp"
 #include "coding/pointd_to_pointu.hpp"
 #include "coding/reader.hpp"
@@ -133,7 +133,7 @@ public:
 
   static_assert(sizeof(Header) == 16, "Wrong header size.");
 
-  CentersTableV0(Reader & reader, serial::CodingParams const & codingParams)
+  CentersTableV0(Reader & reader, serial::GeometryCodingParams const & codingParams)
     : m_reader(reader), m_codingParams(codingParams)
   {
   }
@@ -165,12 +165,12 @@ public:
       NonOwningReaderSource msource(mreader);
 
       uint64_t delta = ReadVarUint<uint64_t>(msource);
-      entry[0] = DecodeDelta(delta, m_codingParams.GetBasePoint());
+      entry[0] = coding::DecodeDelta(delta, m_codingParams.GetBasePoint());
 
       for (size_t i = 1; i < kBlockSize && msource.Size() > 0; ++i)
       {
         delta = ReadVarUint<uint64_t>(msource);
-        entry[i] = DecodeDelta(delta, entry[i - 1]);
+        entry[i] = coding::DecodeDelta(delta, entry[i - 1]);
       }
     }
 
@@ -213,7 +213,7 @@ private:
 private:
   Header m_header;
   Reader & m_reader;
-  serial::CodingParams const m_codingParams;
+  serial::GeometryCodingParams const m_codingParams;
 
   unique_ptr<CopiedMemoryRegion> m_idsRegion;
   unique_ptr<CopiedMemoryRegion> m_offsetsRegion;
@@ -248,7 +248,7 @@ bool CentersTable::Header::IsValid() const
 
 // CentersTable ------------------------------------------------------------------------------------
 unique_ptr<CentersTable> CentersTable::Load(Reader & reader,
-                                            serial::CodingParams const & codingParams)
+                                            serial::GeometryCodingParams const & codingParams)
 {
   uint16_t const version = ReadPrimitiveFromPos<uint16_t>(reader, 0 /* pos */);
   if (version != 0)
@@ -300,11 +300,11 @@ void CentersTableBuilder::Freeze(Writer & writer) const
     {
       offsets.push_back(static_cast<uint32_t>(deltas.size()));
 
-      uint64_t delta = EncodeDelta(m_centers[i], m_codingParams.GetBasePoint());
+      uint64_t delta = coding::EncodeDelta(m_centers[i], m_codingParams.GetBasePoint());
       WriteVarUint(writer, delta);
       for (size_t j = i + 1; j < i + CentersTableV0::kBlockSize && j < m_centers.size(); ++j)
       {
-        delta = EncodeDelta(m_centers[j], m_centers[j - 1]);
+        delta = coding::EncodeDelta(m_centers[j], m_centers[j - 1]);
         WriteVarUint(writer, delta);
       }
     }