From d9e9c60b0378681b7bbf5fcd75786f3c468dce95 Mon Sep 17 00:00:00 2001 From: Olga Khlopkova Date: Thu, 11 Jun 2020 14:29:18 +0300 Subject: [PATCH] m_timetable can be empty in stop --- transit/experimental/transit_types_experimental.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/transit/experimental/transit_types_experimental.cpp b/transit/experimental/transit_types_experimental.cpp index 726c948976..18e00c4d35 100644 --- a/transit/experimental/transit_types_experimental.cpp +++ b/transit/experimental/transit_types_experimental.cpp @@ -46,10 +46,7 @@ bool IdBundle::operator<(IdBundle const & rhs) const if (m_serializeFeatureIdOnly) return m_featureId < rhs.m_featureId; - if (m_featureId != rhs.m_featureId) - return m_featureId < rhs.m_featureId; - - return m_osmId < rhs.m_osmId; + return std::tie(m_featureId, m_osmId) < std::tie(rhs.m_featureId, rhs.m_osmId); } bool IdBundle::operator==(IdBundle const & rhs) const @@ -192,8 +189,7 @@ bool Stop::operator==(Stop const & rhs) const bool Stop::IsValid() const { - return ((m_id != kInvalidTransitId) || (m_ids.GetOsmId() != kInvalidOsmId)) && - !m_timetable.empty() && !m_title.empty(); + return ((m_id != kInvalidTransitId) || (m_ids.GetOsmId() != kInvalidOsmId)) && !m_title.empty(); } FeatureId Stop::GetId() const { return m_id; }