From 3a3124df69142ab95bfc2f3cac88b2aa3432267a Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Wed, 15 Nov 2017 17:19:36 +0300 Subject: [PATCH] Review fixes. --- routing_common/transit_serdes.hpp | 2 +- routing_common/transit_types.cpp | 12 ++++++------ routing_common/transit_types.hpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/routing_common/transit_serdes.hpp b/routing_common/transit_serdes.hpp index 1ce17eeaba..890993a7ad 100644 --- a/routing_common/transit_serdes.hpp +++ b/routing_common/transit_serdes.hpp @@ -127,7 +127,7 @@ public: (*this)(e.m_weight); (*this)(e.m_lineId); // Note. |Edge::m_flags| is not filled fully after deserialization from json. - // So it's necessary to it here. + // So it's necessary to fill it here. EdgeFlags const flags = GetEdgeFlags(e.GetTransfer(), e.GetStop1Id(), e.GetStop2Id(), e.GetShapeIds()); (*this)(flags); diff --git a/routing_common/transit_types.cpp b/routing_common/transit_types.cpp index 282db722e3..7172fa1f6f 100644 --- a/routing_common/transit_types.cpp +++ b/routing_common/transit_types.cpp @@ -248,11 +248,11 @@ void EdgeFlags::SetFlags(uint8_t flags) string DebugPrint(EdgeFlags const & f) { std::ostringstream ss; - ss << "EdgeFlags [m_transfer:" << f.m_transfer; - ss << ", m_isShapeIdsEmpty:" << f.m_isShapeIdsEmpty; - ss << ", m_isShapeIdsSingle:" << f.m_isShapeIdsSingle; - ss << ", m_isShapeIdsSame:" << f.m_isShapeIdsSame; - ss << ", m_isShapeIdsReversed:" << f.m_isShapeIdsReversed << "]"; + ss << "EdgeFlags [transfer:" << f.m_transfer; + ss << ", isShapeIdsEmpty:" << f.m_isShapeIdsEmpty; + ss << ", isShapeIdsSingle:" << f.m_isShapeIdsSingle; + ss << ", isShapeIdsSame:" << f.m_isShapeIdsSame; + ss << ", isShapeIdsReversed:" << f.m_isShapeIdsReversed << "]"; return ss.str(); } @@ -388,7 +388,7 @@ EdgeFlags GetEdgeFlags(bool transfer, StopId stopId1, StopId stopId2, if (singleShapeId) { flags.m_isShapeIdsSame = - (stopId1 == shapeIds[0].GetStop1Id() && stopId2 == shapeIds[0].GetStop2Id()); + stopId1 == shapeIds[0].GetStop1Id() && stopId2 == shapeIds[0].GetStop2Id(); flags.m_isShapeIdsReversed = stopId1 == shapeIds[0].GetStop2Id() && stopId2 == shapeIds[0].GetStop1Id(); } diff --git a/routing_common/transit_types.hpp b/routing_common/transit_types.hpp index 04381e58a0..55389cd520 100644 --- a/routing_common/transit_types.hpp +++ b/routing_common/transit_types.hpp @@ -281,7 +281,7 @@ public: private: uint8_t BoolToUint(bool b) const { return static_cast(b ? 1 : 0); } - uint8_t GetBit(uint8_t flags, uint8_t mask) const { return BoolToUint(flags & mask); } + uint8_t GetBit(uint8_t flags, uint8_t mask) const { return BoolToUint((flags & mask) != 0); } static uint8_t constexpr kTransferMask = 1; static uint8_t constexpr kEmptyShapeIdsMask = (1 << 1);