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

Correctly format Mo-Su as 24/7.

Browse source
This commit is contained in:
Sergey Magidovich 2016-02-01 18:45:25 +03:00 • committed by Sergey Yershov
parent 5c6c580516
commit 295f7587dc
4 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/editor_tests/ui2oh_test.cpp
View file

@ -181,6 +181,10 @@ UNIT_TEST(OpeningHours2TimeTableSt)
UNIT_TEST(TimeTableSt2OpeningHours)
{
{
TimeTableSet tts;
TEST_EQUAL(ToString(MakeOpeningHours(tts)), "24/7", ());
}
{
TimeTableSet tts;
auto tt = tts.Front();

9
editor/opening_hours_ui.cpp
View file

@ -315,6 +315,15 @@ TimeTable TimeTableSet::GetComplementTimeTable() const
return tt;
}
bool TimeTableSet::IsTwentyFourPerSeven() const
{
return GetUnhandledDays().empty() &&
all_of(::begin(m_table), ::end(m_table), [](TimeTable const & tt)
{
return tt.IsTwentyFourHours();
});
}
bool TimeTableSet::Append(TimeTable const & tt)
{
auto copy = *this;

2
editor/opening_hours_ui.hpp
View file

@ -89,6 +89,8 @@ public:
size_t Size() const { return m_table.size(); }
bool Empty() const { return m_table.empty(); }
bool IsTwentyFourPerSeven() const;
bool Append(TimeTable const & tt);
bool Remove(size_t const index);

8
editor/ui2oh.cpp
View file

@ -161,6 +161,14 @@ namespace editor
osmoh::OpeningHours MakeOpeningHours(ui::TimeTableSet const & tts)
{
ASSERT_GREATER(tts.Size(), 0, ("At least one time table must present."));
if (tts.IsTwentyFourPerSeven())
{
osmoh::RuleSequence rulePart;
rulePart.SetTwentyFourHours(true);
return osmoh::OpeningHours({rulePart});
}
osmoh::TRuleSequences rule;
for (auto const & tt : tts)
{