diff --git a/3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp b/3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp index ca659d5e6d..93a3ea3d72 100644 --- a/3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp +++ b/3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp @@ -35,15 +35,6 @@ inline bool HasPlus(std::vector const & v) return std::any_of(begin(v), end(v), hasPlus); } -inline bool HasExtendedHours(osmoh::TTimespans const & spans) -{ - auto const hasExtendedHours = [](osmoh::Timespan const & s) - { - return s.HasExtendedHours(); - }; - return std::any_of(begin(spans), end(spans), hasExtendedHours); -} - inline bool HasOffset(osmoh::TMonthdayRanges const & mr) { auto const hasOffset = [](osmoh::MonthdayRange const & md) { @@ -83,12 +74,6 @@ enum Serialised, Period, Plus, - // True if a rule has Timespan with more than 24 hours at the end - // or and greater than start. - // Example: - // 12:00-29:00 - // 13:12-06:15 - ExtendedHours, Offset, Count_ }; @@ -116,8 +101,6 @@ inline TRuleFeatures DescribeRule(osmoh::TRuleSequences const & rule) features[Offset] |= HasOffset(r.GetMonths()); features[Offset] |= HasOffset(r.GetWeekdays()); - - features[ExtendedHours] |= HasExtendedHours(r.GetTimes()); } return features; @@ -206,7 +189,7 @@ BOOST_AUTO_TEST_CASE(OpeningHours_CountFailed) } { std::stringstream message; - message << "Parsed\tSerialised\tPeriod\tPlus\tExtendedHours\tOffset\tCount" << std::endl; + message << "Parsed\tSerialised\tPeriod\tPlus\tOffset\tCount" << std::endl; for (auto const & e : featuresDistrib) message << e.first << '\t' << e.second << std::endl;