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

Fix parsing of opening hours with no days set.

Browse source
This commit is contained in:
Sergey Magidovich 2016-02-25 12:46:48 +03:00 • committed by Sergey Yershov
parent 395ea36459
commit 19e385f369
2 changed files with 56 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
editor/editor_tests/ui2oh_test.cpp
View file

@ -18,6 +18,21 @@ string ToString(OpeningHours const & oh)
UNIT_TEST(OpeningHours2TimeTableSt)
{
{
OpeningHours oh("08:00-22:00");
TEST(oh.IsValid(), ());
TimeTableSet tts;
TEST(MakeTimeTableSet(oh, tts), ());
TEST_EQUAL(tts.Size(), 1, ());
auto const tt = tts.Front();
TEST(!tt.IsTwentyFourHours(), ());
TEST_EQUAL(tt.GetOpeningDays().size(), 7, ());
TEST_EQUAL(tt.GetOpeningTime().GetStart().GetHourMinutes().GetHoursCount(), 8, ());
TEST_EQUAL(tt.GetOpeningTime().GetEnd().GetHourMinutes().GetHoursCount(), 22, ());
}
{
OpeningHours oh("Mo-Fr 08:00-22:00");
TEST(oh.IsValid(), ());
@ -157,7 +172,7 @@ UNIT_TEST(OpeningHours2TimeTableSt)
}
}
{
OpeningHours oh("Mo-Fr 08:00-13:00,14:00-20:00; Sa 09:00-13:00,14:00-18:00; Su off");
OpeningHours oh("Mo-Fr 08:00-13:00,14:00-20:00; Sa 09:00-13:00,14:00-18:00");
TEST(oh.IsValid(), ());
TimeTableSet tts;
@ -177,6 +192,15 @@ UNIT_TEST(OpeningHours2TimeTableSt)
TEST_EQUAL(tt.GetOpeningDays().size(), 1, ());
}
}
{
// We don't handle offs for for now.
OpeningHours oh("Mo-Fr 08:00-13:00,14:00-20:00; Sa 09:00-13:00,14:00-18:00; Su off");
TEST(oh.IsValid(), ());
TimeTableSet tts;
TEST(!MakeTimeTableSet(oh, tts), ());
}
}
UNIT_TEST(TimeTableSt2OpeningHours)
@ -185,6 +209,24 @@ UNIT_TEST(TimeTableSt2OpeningHours)
TimeTableSet tts;
TEST_EQUAL(ToString(MakeOpeningHours(tts)), "24/7", ());
}
{
TimeTableSet tts;
auto tt = tts.Front();
TEST(tt.SetOpeningDays({
osmoh::Weekday::Monday,
osmoh::Weekday::Tuesday,
osmoh::Weekday::Wednesday,
osmoh::Weekday::Thursday,
osmoh::Weekday::Friday,
osmoh::Weekday::Saturday,
osmoh::Weekday::Sunday}), ());
tt.SetTwentyFourHours(false);
TEST(tt.SetOpeningTime({8_h, 22_h}), ());
TEST(tt.Commit(), ());
TEST_EQUAL(ToString(MakeOpeningHours(tts)), "Mo-Su 08:00-22:00", ());
}
{
TimeTableSet tts;
auto tt = tts.Front();

14
editor/ui2oh.cpp
View file

@ -154,6 +154,16 @@ osmoh::TTimespans MakeTimespans(editor::ui::TimeTable const & tt)
return spans;
}
editor::ui::TOpeningDays const kWholeWeek = {
osmoh::Weekday::Monday,
osmoh::Weekday::Tuesday,
osmoh::Weekday::Wednesday,
osmoh::Weekday::Thursday,
osmoh::Weekday::Friday,
osmoh::Weekday::Saturday,
osmoh::Weekday::Sunday
};
} // namespace
namespace editor
@ -205,10 +215,12 @@ bool MakeTimeTableSet(osmoh::OpeningHours const & oh, ui::TimeTableSet & tts)
if (rulePart.GetModifier() == osmoh::RuleSequence::Modifier::Closed ||
rulePart.GetModifier() == osmoh::RuleSequence::Modifier::Unknown ||
rulePart.GetModifier() == osmoh::RuleSequence::Modifier::Comment)
continue;
return false;
if (rulePart.HasWeekdays())
SetUpWeekdays(rulePart.GetWeekdays(), tt);
else
tt.SetOpeningDays(kWholeWeek);
if (rulePart.HasTimes())
{