AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2017-11-15 12:00:17 +03:00 • committed by mpimenov
parent 99369a0842
commit 759db339ed
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
routing_common/transit_serdes.hpp
View file

@ -211,16 +211,16 @@ public:
p = Int64ToPoint(ReadVarInt<int64_t, Source>(m_source), POINT_COORD_BITS);
}
void operator()(Edge::WrappedEdgeId & t, char const * /* name */ = nullptr)
void operator()(Edge::WrappedEdgeId & id, char const * /* name */ = nullptr)
{
t = m_lastWrappedEdgeId + Edge::WrappedEdgeId(ReadVarUint<uint64_t, Source>(m_source));
m_lastWrappedEdgeId = t;
id = m_lastWrappedEdgeId + Edge::WrappedEdgeId(ReadVarUint<uint64_t, Source>(m_source));
m_lastWrappedEdgeId = id;
}
void operator()(Stop::WrappedStopId & t, char const * /* name */ = nullptr)
void operator()(Stop::WrappedStopId & id, char const * /* name */ = nullptr)
{
t = m_lastWrappedStopId + Stop::WrappedStopId(ReadVarUint<uint64_t, Source>(m_source));
m_lastWrappedStopId = t;
id = m_lastWrappedStopId + Stop::WrappedStopId(ReadVarUint<uint64_t, Source>(m_source));
m_lastWrappedStopId = id;
}
void operator()(FeatureIdentifiers & id, char const * name = nullptr)

6
routing_common/transit_types.cpp
View file

@ -292,16 +292,16 @@ bool Edge::operator==(Edge const & rhs) const
bool Edge::IsEqualForTesting(Edge const & edge) const
{
return m_stop1Id == edge.m_stop1Id && m_stop2Id == edge.m_stop2Id && m_weight == edge.m_weight &&
m_lineId == edge.m_lineId && m_flags.IsTransfer() == edge.m_flags.IsTransfer() &&
m_lineId == edge.m_lineId && GetTransfer() == edge.GetTransfer() &&
m_shapeIds == edge.m_shapeIds;
}
bool Edge::IsValid() const
{
if (m_flags.IsTransfer() && (m_lineId != kInvalidLineId || !m_shapeIds.empty()))
if (GetTransfer() && (m_lineId != kInvalidLineId || !m_shapeIds.empty()))
return false;
if (!m_flags.IsTransfer() && m_lineId == kInvalidLineId)
if (!GetTransfer() && m_lineId == kInvalidLineId)
return false;
return m_stop1Id.Get() != kInvalidStopId && m_stop2Id != kInvalidStopId && m_weight != kInvalidWeight;