pastk/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-12-08 16:16:47 +03:00 • committed by Daria Volvenkova
parent 9da64e57c1
commit cbe3d0dfd6
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
generator/transit_generator.cpp
View file

@ -231,19 +231,15 @@ void DeserializerFromJson::operator()(FeatureIdentifiers & id, char const * name
if (it != m_osmIdToFeatureIds.cend())
{
CHECK_GREATER_OR_EQUAL(it->second.size(), 1, ("Osm id:", osmId, "(encoded", osmId.EncodedId(),
") from transit graph corresponds to zero features."));
if (it->second.size() == 1)
") from transit graph does not correspond to any feature."));
if (it->second.size() != 1)
{
id.SetFeatureId(it->second[0]);
}
else
{
LOG(LWARNING, ("Osm id:", osmId, "(encoded", osmId.EncodedId(), "corresponds to",
it->second.size(), "feature ids. It may happen in rare case."));
// Note. |osmId| corresponds several feature ids. It may happen in case of stops;
// if a stop is present as relation.
id.SetFeatureId(it->second[0]);
// if a stop is present as relation. It's a rare case.
LOG(LWARNING, ("Osm id:", osmId, "(encoded", osmId.EncodedId(), "corresponds to",
it->second.size(), "feature ids."));
}
id.SetFeatureId(it->second[0]);
}
id.SetOsmId(osmId.EncodedId());
}