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

[transit] Removing equivalent edges.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2017-12-04 18:10:20 +03:00 • committed by Ilya Zverev
parent 8aee444f5f
commit fa0450c5b8
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
generator/transit_generator.cpp
View file

@ -33,6 +33,7 @@
#include "base/checked_cast.hpp"
#include "base/logging.hpp"
#include "base/macros.hpp"
#include "base/stl_helpers.hpp"
#include "base/string_utils.hpp"
#include <algorithm>
@ -259,6 +260,19 @@ void GraphData::DeserializeFromJson(my::Json const & root, OsmIdToFeatureIdsMap
{
DeserializerFromJson deserializer(root.get(), mapping);
Visit(deserializer);
// Removes equivalent edges from |m_edges|. If there are several equivalent edges only
// the most lightweight edge is left.
// Note. It's possible that two stops are connected with the same line several times
// in the same direction. It happens in Oslo metro (T-banen):
// https://en.wikipedia.org/wiki/Oslo_Metro#/media/File:Oslo_Metro_Map.svg branch 5.
my::SortUnique(m_edges,
[](Edge const & e1, Edge const & e2) {
if (e1 != e2)
return e1 < e2;
return e1.GetWeight() < e2.GetWeight();
},
[](Edge const & e1, Edge const & e2) { return e1 == e2; });
}
void GraphData::Serialize(Writer & writer) const

1
routing_common/transit_types.hpp
View file

@ -306,6 +306,7 @@ public:
bool operator<(Edge const & rhs) const;
bool operator==(Edge const & rhs) const;
bool operator!=(Edge const & rhs) const { return !(*this == rhs); }
bool IsEqualForTesting(Edge const & edge) const;
bool IsValid() const;
void SetWeight(Weight weight) { m_weight = weight; }