From b4aecc4eb9d77c77015dde68a4ec818d897e5fea Mon Sep 17 00:00:00 2001 From: Rita Pessoa Date: Mon, 22 Apr 2024 15:26:04 +0100 Subject: [PATCH 1/2] [iOS] fix #3036: Non-Business Hours button works after midnight Changed verifications to allow the non-business hours button to work after midnight. Signed-off-by: Rita Pessoa --- editor/opening_hours_ui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editor/opening_hours_ui.cpp b/editor/opening_hours_ui.cpp index 8c6c4bef55..6a19526080 100644 --- a/editor/opening_hours_ui.cpp +++ b/editor/opening_hours_ui.cpp @@ -27,7 +27,7 @@ bool DoesIncludeAll(osmoh::Timespan const & openingTime, osmoh::TTimespans const auto const excludeTimeStart = spans.front().GetStart().GetHourMinutes().GetDuration(); auto const excludeTimeEnd = spans.back().GetEnd().GetHourMinutes().GetDuration(); - if (excludeTimeStart < openingTimeStart || openingTimeEnd < excludeTimeEnd) + if (!openingTime.HasExtendedHours() && (excludeTimeStart < openingTimeStart || openingTimeEnd < excludeTimeEnd)) return false; return true; @@ -180,7 +180,7 @@ bool TimeTable::SetOpeningTime(osmoh::Timespan const & span) auto const excludeSpanStart = excludeSpan.GetStart().GetHourMinutes().GetDuration(); auto const excludeSpanEnd = excludeSpan.GetEnd().GetHourMinutes().GetDuration(); - if (excludeSpanStart < openingTimeStart || openingTimeEnd < excludeSpanEnd) + if (!GetOpeningTime().HasExtendedHours() && (excludeSpanStart < openingTimeStart || openingTimeEnd < excludeSpanEnd)) continue; excludeTime.push_back(excludeSpan); -- 2.45.3 From 1eda359573f17a0136bca652954c8d6842a3bc62 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Mon, 13 May 2024 01:29:45 +0200 Subject: [PATCH 2/2] Fixed missing address for fitness centers Signed-off-by: Alexander Borsuk --- indexer/ftypes_matcher.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index ec6c1916cb..7cb9f873e6 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -389,7 +389,7 @@ IsStreetOrSquareChecker::IsStreetOrSquareChecker() IsAddressObjectChecker::IsAddressObjectChecker() : BaseChecker(1 /* level */) { base::StringIL const paths = { - "building", "entrance", "amenity", "shop", "tourism", "historic", "office", "craft", "addr:interpolation" + "building", "entrance", "amenity", "shop", "tourism", "historic", "office", "craft", "leisure", "addr:interpolation" }; Classificator const & c = classif(); -- 2.45.3