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

Changing type param to OsmId at constructors of Gate and Stop.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2017-10-19 17:16:01 +03:00 • committed by Tatiana Yan
parent 2f75639269
commit 117f333c9b
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
generator/generator_tests/transit_test.cpp
View file

@ -89,11 +89,11 @@ UNIT_TEST(DeserializerFromJson_Stops)
]})";
vector<Stop> const expected = {
Stop(343259523 /* id */, 1 /* featureId */, kInvalidTransferId /* transfer id */,
Stop(343259523 /* id */, OsmId(1 /* feature id */), kInvalidTransferId /* transfer id */,
{19207936, 19207937} /* lineIds */, {27.4970954, 64.20146835878187} /* point */,
{} /* anchors */),
Stop(266680843 /* id */, 2 /* featureId */, 5 /* transfer id */,
{19213568, 19213569} /* lineIds */, {27.5227942, 64.25206634443111} /* point */,
Stop(266680843 /* id */, OsmId(2 /* feature id */), 5 /* transfer id */,
{19213568, 19213569} /* line ids */, {27.5227942, 64.25206634443111} /* point */,
{TitleAnchor(12 /* min zoom */, 0 /* anchor */), TitleAnchor(15, 9)})};
OsmIdToFeatureIdsMap mapping;
@ -132,9 +132,9 @@ UNIT_TEST(DeserializerFromJson_Gates)
]})";
vector<Gate> const expected = {
Gate(0 /* feature id */, true /* entrance */, true /* exit */, 60.0 /* weight */,
Gate(OsmId(0 /* feature id */), true /* entrance */, true /* exit */, 60.0 /* weight */,
{442018474} /* stop ids */, {43.8594864, 68.33320554776377} /* point */),
Gate(2 /* feature id */, true /* entrance */, true /* exit */, 60.0 /* weight */,
Gate(OsmId(2 /* feature id */), true /* entrance */, true /* exit */, 60.0 /* weight */,
{442018465} /* stop ids */, {43.9290544, 68.41120791512581} /* point */)};
OsmIdToFeatureIdsMap mapping;

2
generator/transit_generator.cpp
View file

@ -59,7 +59,7 @@ Stop const & FindStopById(vector<Stop> const & stops, StopId stopId)
{
ASSERT(is_sorted(stops.cbegin(), stops.cend(), LessById), ());
auto s1Id = equal_range(stops.cbegin(), stops.cend(),
Stop(stopId, kInvalidFeatureId, kInvalidTransferId, {}, m2::PointD(), {}),
Stop(stopId, OsmId(), kInvalidTransferId, {}, m2::PointD(), {}),
LessById);
CHECK(s1Id.first != stops.cend(), ("No a stop with id:", stopId, "in stops:", stops));
CHECK_EQUAL(distance(s1Id.first, s1Id.second), 1, ("A stop with id:", stopId, "is not unique in stops:", stops));

4
routing_common/routing_common_tests/transit_test.cpp
View file

@ -76,7 +76,7 @@ UNIT_TEST(Transit_StopSerialization)
TestSerialization(stop);
}
{
Stop stop(1234 /* id */, 5678 /* feature id */, 7 /* transfer id */,
Stop stop(1234 /* id */, OsmId(5678 /* feature id */), 7 /* transfer id */,
{7, 8, 9, 10} /* line id */, {55.0, 37.0} /* point */, {} /* anchors */);
TestSerialization(stop);
}
@ -96,7 +96,7 @@ UNIT_TEST(Transit_SingleMwmSegmentSerialization)
UNIT_TEST(Transit_GateSerialization)
{
Gate gate(12345 /* feature id */, true /* entrance */, false /* exit */, 117.8 /* weight */,
Gate gate(OsmId(12345 /* feature id */), true /* entrance */, false /* exit */, 117.8 /* weight */,
{1, 2, 3} /* stop ids */, {30.0, 50.0} /* point */);
TestSerialization(gate);
}

8
routing_common/transit_types.cpp
View file

@ -80,11 +80,11 @@ bool TitleAnchor::IsValid() const
}
// Stop -------------------------------------------------------------------------------------------
Stop::Stop(StopId id, FeatureId featureId, TransferId transferId,
Stop::Stop(StopId id, OsmId const & osmId, TransferId transferId,
std::vector<LineId> const & lineIds, m2::PointD const & point,
std::vector<TitleAnchor> const & titleAnchors)
: m_id(id)
, m_osmId(featureId)
, m_osmId(osmId)
, m_transferId(transferId)
, m_lineIds(lineIds)
, m_point(point)
@ -123,9 +123,9 @@ bool SingleMwmSegment::IsValid() const
}
// Gate -------------------------------------------------------------------------------------------
Gate::Gate(FeatureId featureId, bool entrance, bool exit, double weight,
Gate::Gate(OsmId const & osmId, bool entrance, bool exit, double weight,
std::vector<StopId> const & stopIds, m2::PointD const & point)
: m_osmId(featureId)
: m_osmId(osmId)
, m_entrance(entrance)
, m_exit(exit)
, m_weight(weight)

4
routing_common/transit_types.hpp
View file

@ -124,7 +124,7 @@ class Stop
{
public:
Stop() = default;
Stop(StopId id, FeatureId featureId, TransferId transferId, std::vector<LineId> const & lineIds,
Stop(StopId id, OsmId const & osmId, TransferId transferId, std::vector<LineId> const & lineIds,
m2::PointD const & point, std::vector<TitleAnchor> const & titleAnchors);
bool IsEqualForTesting(Stop const & stop) const;
@ -179,7 +179,7 @@ class Gate
{
public:
Gate() = default;
Gate(FeatureId featureId, bool entrance, bool exit, double weight, std::vector<StopId> const & stopIds,
Gate(OsmId const & osmId, bool entrance, bool exit, double weight, std::vector<StopId> const & stopIds,
m2::PointD const & point);
bool IsEqualForTesting(Gate const & gate) const;
bool IsValid() const;