From 6669301c759d9d2b0593604a72798dbb52048411 Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Tue, 3 Oct 2017 17:23:08 +0300
Subject: [PATCH] Review fixes.

---
 generator/generator_tests/transit_test.cpp |  2 +-
 routing_common/transit_serdes.hpp          | 10 +++++-----
 routing_common/transit_types.hpp           | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/generator/generator_tests/transit_test.cpp b/generator/generator_tests/transit_test.cpp
index 05968af0c6..0be48689ca 100644
--- a/generator/generator_tests/transit_test.cpp
+++ b/generator/generator_tests/transit_test.cpp
@@ -57,7 +57,7 @@ UNIT_TEST(DeserializerFromJson_Stops)
   deserializer(stops, "stops");
 
   vector<Stop> const expected = {
-      Stop(343259523 /* id */, 1234 /* featureId */, kTransferIdInvalid /* transfer id */,
+      Stop(343259523 /* id */, 1234 /* featureId */, kInvalidTransferId /* transfer id */,
            {19207936, 19207937} /* lineIds */,  {27.4970954, 64.20146835878187} /* point */),
       Stop(266680843 /* id */, 2345 /* featureId */, 5 /* transfer id */,
            {19213568, 19213569} /* lineIds */, {27.5227942, 64.25206634443111} /* point */)};
diff --git a/routing_common/transit_serdes.hpp b/routing_common/transit_serdes.hpp
index 5b5a48ca4e..d972653053 100644
--- a/routing_common/transit_serdes.hpp
+++ b/routing_common/transit_serdes.hpp
@@ -51,14 +51,14 @@ public:
   void operator()(m2::PointD const & p, char const * /* name */ = nullptr)
   {
     m2::PointU const pointU = PointD2PointU(p, POINT_COORD_BITS);
-    (*this)(pointU.x);
-    (*this)(pointU.y);
+    WriteVarUint(m_sink, pointU.x);
+    WriteVarUint(m_sink, pointU.y);
   }
 
   template <typename T>
   void operator()(std::vector<T> const & vs, char const * /* name */ = nullptr)
   {
-    CHECK_LESS(vs.size(), std::numeric_limits<uint64_t>::max(), ());
+    CHECK_LESS_OR_EQUAL(vs.size(), std::numeric_limits<uint64_t>::max(), ());
     WriteVarUint(m_sink, static_cast<uint64_t>(vs.size()));
     for (auto const & v : vs)
       (*this)(v);
@@ -101,8 +101,8 @@ public:
   void operator()(m2::PointD & p, char const * /* name */ = nullptr)
   {
     m2::PointU pointU;
-    (*this)(pointU.x);
-    (*this)(pointU.y);
+    pointU.x = ReadVarUint<uint32_t, Source>(m_source);
+    pointU.y = ReadVarUint<uint32_t, Source>(m_source);
     p = PointU2PointD(pointU, POINT_COORD_BITS);
   }
 
diff --git a/routing_common/transit_types.hpp b/routing_common/transit_types.hpp
index b820f086e7..4dab968907 100644
--- a/routing_common/transit_types.hpp
+++ b/routing_common/transit_types.hpp
@@ -18,11 +18,11 @@ using TransferId = uint64_t;
 using NetworkId = uint32_t;
 using FeatureId = uint32_t;
 
-LineId constexpr kLineIdInvalid = std::numeric_limits<LineId>::max();
-StopId constexpr kStopIdInvalid = std::numeric_limits<StopId>::max();
-TransferId constexpr kTransferIdInvalid = std::numeric_limits<TransferId>::max();
-NetworkId constexpr kNetworkIdInvalid = std::numeric_limits<NetworkId>::max();
-FeatureId constexpr kFeatureIdInvalid = std::numeric_limits<FeatureId>::max();
+LineId constexpr kInvalidLineId = std::numeric_limits<LineId>::max();
+StopId constexpr kInvalidStopId = std::numeric_limits<StopId>::max();
+TransferId constexpr kInvalidTransferId = std::numeric_limits<TransferId>::max();
+NetworkId constexpr kInvalidNetworkId = std::numeric_limits<NetworkId>::max();
+FeatureId constexpr kInvalidFeatureId = std::numeric_limits<FeatureId>::max();
 
 struct TransitHeader
 {
@@ -69,9 +69,9 @@ public:
   DECLARE_DEBUG_PRINT(Stop)
 
 private:
-  StopId m_id = kStopIdInvalid;
-  FeatureId m_featureId = kFeatureIdInvalid;
-  TransferId m_transferId = kTransferIdInvalid;
+  StopId m_id = kInvalidStopId;
+  FeatureId m_featureId = kInvalidFeatureId;
+  TransferId m_transferId = kInvalidTransferId;
   std::vector<LineId> m_lineIds;
   m2::PointD m_point;
   // @TODO(bykoianko) It's necessary to add field m_titleAnchors here and implement serialization