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

Review fixes

Browse source
This commit is contained in:
VladiMihaylenko 2018-04-17 19:17:38 +03:00 • committed by Aleksandr Zatsepin
parent fb70ab13e2
commit 1af835bcc4
3 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
indexer/ftypes_matcher.hpp
View file

@ -7,7 +7,7 @@
#include <algorithm>
#include <array>
#include <cstddef>
#include <cstdint>
#include <functional>
#include <initializer_list>
#include <string>

22
iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm
View file

@ -20,17 +20,11 @@ static uint8_t kAdultsCount = 2;
static int8_t kAgeOfChild = 5;
static NSString * const kHotelTypePattern = @"search_hotel_filter_%@";
std::array<ftypes::IsHotelChecker::Type, my::Key(ftypes::IsHotelChecker::Type::Count)> const kTypes = {{
ftypes::IsHotelChecker::Type::Hotel,
ftypes::IsHotelChecker::Type::Apartment,
ftypes::IsHotelChecker::Type::CampSite,
ftypes::IsHotelChecker::Type::Chalet,
ftypes::IsHotelChecker::Type::GuestHouse,
ftypes::IsHotelChecker::Type::Hostel,
ftypes::IsHotelChecker::Type::Motel,
ftypes::IsHotelChecker::Type::Resort
}};
std::array<ftypes::IsHotelChecker::Type, my::Key(ftypes::IsHotelChecker::Type::Count)> const
kTypes = {{ftypes::IsHotelChecker::Type::Hotel, ftypes::IsHotelChecker::Type::Apartment,
ftypes::IsHotelChecker::Type::CampSite, ftypes::IsHotelChecker::Type::Chalet,
ftypes::IsHotelChecker::Type::GuestHouse, ftypes::IsHotelChecker::Type::Hostel,
ftypes::IsHotelChecker::Type::Motel, ftypes::IsHotelChecker::Type::Resort}};
unsigned makeMask(std::unordered_set<ftypes::IsHotelChecker::Type> const & items)
{
@ -482,7 +476,8 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar
cell.selected = selected;
if (selected)
{
[collectionView selectItemAtIndexPath:indexPath animated:NO
[collectionView selectItemAtIndexPath:indexPath
animated:NO
scrollPosition:UICollectionViewScrollPositionNone];
}
@ -519,8 +514,7 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar
- (void)collectionView:(UICollectionView *)collectionView didDeselectItemAtIndexPath:(NSIndexPath *)indexPath
{
auto const type = kTypes[indexPath.row];
if (m_selectedTypes.find(type) != m_selectedTypes.end())
m_selectedTypes.erase(type);
m_selectedTypes.erase(type);
}
#pragma mark - Properties

4
search/search_tests_support/test_results_matching.hpp
View file

@ -77,9 +77,9 @@ std::shared_ptr<MatchingRule> AlternativesMatch(TArgs &&... args)
bool MatchResults(Index const & index, std::vector<std::shared_ptr<MatchingRule>> rules,
std::vector<search::Result> const & actual);
bool MatchResults(Index const & index, std::vector<std::shared_ptr<MatchingRule>> rules,
search::Results const & actual);
search::Results const & actual);
bool ResultMatches(Index const & index, std::shared_ptr<MatchingRule> rule,
search::Result const & result);
search::Result const & result);
std::string DebugPrint(MatchingRule const & rule);
} // namespace tests_support