kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Review fixes

Browse source
This commit is contained in:
Maksim Andrianov 2021-02-26 14:08:56 +03:00 • committed by Tatiana Yan
parent 3feec340e5
commit 09e604b39e
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
generator/road_access_generator.cpp
View file

@ -285,34 +285,40 @@ void ParseRoadAccessConditional(
VehicleType vehicleType = VehicleType::Count;
while (getline(stream, line))
{
using It = strings::TokenizeIterator<strings::SimpleDelimiter, std::string::const_iterator, true>;
using It = strings::SimpleTokenizer;
It strIt(line, strings::SimpleDelimiter('\t'));
CHECK(strIt, ());
buffer = *strIt;
strings::Trim(buffer);
FromString(buffer, vehicleType);
CHECK_NOT_EQUAL(vehicleType, VehicleType::Count, (buffer));
auto const moveIterAndCheck = [&]() {
++strIt;
CHECK(strIt, ());
return *strIt;
};
uint64_t osmId = 0;
buffer = *(++strIt);
buffer = moveIterAndCheck();
strings::Trim(buffer);
CHECK(strings::to_uint64(buffer, osmId), (buffer));
size_t accessNumber = 0;
buffer = *(++strIt);
buffer = moveIterAndCheck();
strings::Trim(buffer);
CHECK(strings::to_size_t(buffer, accessNumber), (buffer));
CHECK_NOT_EQUAL(accessNumber, 0, ());
RoadAccess::Conditional conditional;
for (size_t i = 0; i < accessNumber; ++i)
{
buffer = *(++strIt);
buffer = moveIterAndCheck();
strings::Trim(buffer);
RoadAccess::Type roadAccessType = RoadAccess::Type::Count;
FromString(buffer, roadAccessType);
CHECK_NOT_EQUAL(roadAccessType, RoadAccess::Type::Count, ());
buffer = *(++strIt);
buffer = moveIterAndCheck();
strings::Trim(buffer);
osmoh::OpeningHours openingHours(buffer);
if (!openingHours.IsValid())