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

Add check if HourMinutes is extended and if Timespan has extended hours.

Browse source
This commit is contained in:
Sergey Magidovich 2015-11-12 21:06:18 +03:00
parent 395efc358b
commit 18ba3f2b42
4 changed files with 71 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
3party/opening_hours/opening_hours.cpp
View file

@ -128,6 +128,11 @@ bool HourMinutes::IsEmpty() const
return m_empty;
}
bool HourMinutes::IsExtended() const
{
return GetDuration() > 24_h;
}
HourMinutes::THours HourMinutes::GetHours() const
{
return m_hours;
@ -479,6 +484,22 @@ bool Timespan::HasPeriod() const
return !m_period.IsEmpty();
}
bool Timespan::HasExtendedHours() const
{
if (HasStart() && HasEnd() &&
GetStart().IsHoursMinutes() &&
GetEnd().IsHoursMinutes())
{
auto const & startHM = GetStart().GetHourMinutes();
auto const & endHM = GetEnd().GetHourMinutes();
if (endHM.IsExtended())
return true;
return endHM.GetDurationCount() != 0 && (endHM.GetDuration() < startHM.GetDuration());
}
return false;
}
Time const & Timespan::GetStart() const
{
return m_start;

2
3party/opening_hours/opening_hours.hpp
View file

@ -44,6 +44,7 @@ public:
explicit HourMinutes(TMinutes const duration);
bool IsEmpty() const;
bool IsExtended() const;
THours GetHours() const;
TMinutes GetMinutes() const;
@ -199,6 +200,7 @@ public:
bool HasEnd() const;
bool HasPlus() const;
bool HasPeriod() const;
bool HasExtendedHours() const;
Time const & GetStart() const;
Time const & GetEnd() const;

10
3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp
View file

@ -37,15 +37,9 @@ bool HasPlus(std::vector<T> const & v)
bool HasExtendedHours(osmoh::TTimespans const & spans)
{
auto const hasExtendedHours = [](osmoh::Timespan const & s) -> bool
auto const hasExtendedHours = [](osmoh::Timespan const & s)
{
if (!s.HasEnd())
return false;
auto const startDuration = s.GetStart().GetMinutes() + s.GetStart().GetHours();
auto const endDuration = s.GetEnd().GetMinutes() + s.GetEnd().GetHours();
return endDuration > 24 * std::chrono::minutes(60) || startDuration > endDuration;
return s.HasExtendedHours();
};
return std::any_of(begin(spans), end(spans), hasExtendedHours);
}

48
3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp
View file

@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE(OpeningHours_TestHourMinutes)
BOOST_CHECK_EQUAL(ToString(hm), "00:10");
}
{
HourMinutes hm{100_min};
HourMinutes hm(100_min);
BOOST_CHECK(!hm.IsEmpty());
BOOST_CHECK_EQUAL(hm.GetHoursCount(), 1);
BOOST_CHECK_EQUAL(hm.GetMinutesCount(), 40);
@ -148,16 +148,29 @@ BOOST_AUTO_TEST_CASE(OpeningHours_TestHourMinutes)
BOOST_CHECK_EQUAL(ToString(hm), "01:40");
}
{
HourMinutes hm{};
HourMinutes hm;
hm.SetHours(22_h);
hm.SetMinutes(15_min);
BOOST_CHECK(!hm.IsEmpty());
BOOST_CHECK(!hm.IsExtended());
BOOST_CHECK_EQUAL(hm.GetHoursCount(), 22);
BOOST_CHECK_EQUAL(hm.GetMinutesCount(), 15);
BOOST_CHECK_EQUAL(ToString(hm), "22:15");
}
{
HourMinutes hm;
hm.SetHours(39_h);
hm.SetMinutes(15_min);
BOOST_CHECK(!hm.IsEmpty());
BOOST_CHECK(hm.IsExtended());
BOOST_CHECK_EQUAL(hm.GetHoursCount(), 39);
BOOST_CHECK_EQUAL(hm.GetMinutesCount(), 15);
BOOST_CHECK_EQUAL(ToString(hm), "39:15");
}
}
BOOST_AUTO_TEST_CASE(OpeningHours_TestTimeEvent)
@ -253,16 +266,19 @@ BOOST_AUTO_TEST_CASE(OpeningHours_TestTimespan)
BOOST_CHECK(span.IsEmpty());
BOOST_CHECK(!span.HasStart());
BOOST_CHECK(!span.HasEnd());
BOOST_CHECK(!span.HasExtendedHours());
BOOST_CHECK_EQUAL(ToString(span), "hh:mm-hh:mm");
span.SetStart(HourMinutes(10_h));
BOOST_CHECK(span.HasStart());
BOOST_CHECK(span.IsOpen());
BOOST_CHECK(!span.HasExtendedHours());
BOOST_CHECK_EQUAL(ToString(span), "10:00");
span.SetEnd(HourMinutes(12_h));
BOOST_CHECK(span.HasEnd());
BOOST_CHECK(!span.IsOpen());
BOOST_CHECK(!span.HasExtendedHours());
BOOST_CHECK_EQUAL(ToString(span), "10:00-12:00");
BOOST_CHECK(!span.HasPeriod());
@ -270,6 +286,34 @@ BOOST_AUTO_TEST_CASE(OpeningHours_TestTimespan)
BOOST_CHECK(span.HasPeriod());
BOOST_CHECK_EQUAL(ToString(span), "10:00-12:00/10");
}
{
Timespan span;
span.SetStart(HourMinutes(10_h));
span.SetEnd(HourMinutes(47_h));
BOOST_CHECK(span.HasExtendedHours());
BOOST_CHECK_EQUAL(ToString(span), "10:00-47:00");
}
{
Timespan span;
span.SetStart(HourMinutes(10_h));
span.SetEnd(HourMinutes(06_h));
BOOST_CHECK(span.HasExtendedHours());
BOOST_CHECK_EQUAL(ToString(span), "10:00-06:00");
}
{
Timespan span;
span.SetStart(HourMinutes(10_h));
span.SetEnd(HourMinutes(00_h));
BOOST_CHECK(!span.HasExtendedHours());
BOOST_CHECK_EQUAL(ToString(span), "10:00-00:00");
}
}
BOOST_AUTO_TEST_CASE(OpeningHours_TestNthWeekdayOfTheMonthEntry)