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-01 16:55:04 +03:00 • committed by mpimenov
parent 4e40f1e918
commit dd439539ac
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
generator/transit_generator.cpp
View file

@ -114,7 +114,6 @@ private:
/// \returns ref to a stop at |stops| by |stopId|.
Stop const & FindStopById(vector<Stop> const & stops, StopId stopId)
{
ASSERT(is_sorted(stops.cbegin(), stops.cend()), ());
auto s1Id = equal_range(stops.cbegin(), stops.cend(),
Stop(stopId, kInvalidOsmId, kInvalidFeatureId, kInvalidTransferId,
{} /* line ids */, {} /* point */, {} /* title anchors */));
@ -184,7 +183,7 @@ void DeserializerFromJson::operator()(FeatureIdentifiers & id, char const * name
if (it != m_osmIdToFeatureIds.cend())
{
CHECK_EQUAL(it->second.size(), 1, ("Osm id:", osmId, "(encoded", osmId.EncodedId(),
") from transit graph is correspond to", it->second.size(), "features."
") from transit graph corresponds to", it->second.size(), "features."
"But osm id should be represented be one feature."));
id.SetFeatureId(it->second[0]);
}
@ -285,7 +284,6 @@ void GraphData::Sort()
void GraphData::CalculateEdgeWeights()
{
CHECK(is_sorted(m_stops.cbegin(), m_stops.cend()), ());
for (auto & e : m_edges)
{
if (e.GetWeight() != kInvalidWeight)
@ -354,7 +352,7 @@ void GraphData::CalculateBestPedestrianSegments(string const & mwmPath, string c
}
catch (RootException const & e)
{
LOG(LCRITICAL, ("Exception while looking for the best segment here gates. CountryId::",
LOG(LCRITICAL, ("Exception while looking for the best segment of a gate. CountryId:",
countryId, ". Gate:", gate, e.what()));
}
}

2
generator/transit_generator.hpp
View file

@ -151,7 +151,7 @@ private:
};
/// \brief Fills |data| according to a transit graph (|transitJsonPath|).
/// \note Some of fields of |data| contain feature ids of a certain mwm. These fields are filled
/// \note Some fields of |data| contain feature ids of a certain mwm. These fields are filled
/// iff the mapping (|osmIdToFeatureIdsPath|) contains them. Otherwise the fields have default value.
void DeserializeFromJson(OsmIdToFeatureIdsMap const & mapping, std::string const & transitJsonPath,
GraphData & data);

11
routing_common/routing_common_tests/transit_test.cpp
View file

@ -6,6 +6,7 @@
#include "routing_common/transit_serdes.hpp"
#include "routing_common/transit_types.hpp"
#include <algorithm>
#include <cstdint>
#include <vector>
@ -236,14 +237,8 @@ UNIT_TEST(Transit_ShapeSerialization)
UNIT_TEST(Transit_ShapeIdRelational)
{
ShapeId id1(0, 10);
ShapeId id2(0, 11);
ShapeId id3(1, 10);
ShapeId id4(1, 11);
TEST_LESS(id1, id2, ());
TEST_LESS(id2, id3, ());
TEST_LESS(id3, id4, ());
vector<ShapeId> const ids = {{0, 10}, {0, 11}, {1, 10}, {1, 11}};
TEST(is_sorted(ids.cbegin(), ids.cend()), ());
}
UNIT_TEST(Transit_NetworkSerialization)