diff --git a/libs/search/mwm_context.cpp b/libs/search/mwm_context.cpp index 5729e946a..1bd85a8e8 100644 --- a/libs/search/mwm_context.cpp +++ b/libs/search/mwm_context.cpp @@ -29,9 +29,9 @@ MwmContext::MwmContext(MwmSet::MwmHandle handle, MwmType type) : MwmContext(std: m_type = type; } -std::unique_ptr MwmContext::GetFeature(uint32_t index, bool ignoredEditedStatus) const +std::unique_ptr MwmContext::GetFeature(uint32_t index, bool ignoreEditedStatus) const { - if (ignoredEditedStatus) { + if (ignoreEditedStatus) { auto ft = m_vector.GetByIndex(index); CHECK(ft, ()); ft->SetID(FeatureID(GetId(), index)); diff --git a/libs/search/mwm_context.hpp b/libs/search/mwm_context.hpp index b695553f6..67b3918e6 100644 --- a/libs/search/mwm_context.hpp +++ b/libs/search/mwm_context.hpp @@ -85,7 +85,7 @@ public: } template - void ForEachFeature(m2::RectD const & rect, Fn && fn, bool ignoredEditedStatus = false) const + void ForEachFeature(m2::RectD const & rect, Fn && fn, bool ignoreEditedStatus = false) const { uint32_t const scale = m_value.GetHeader().GetLastScale(); covering::Intervals intervals; @@ -93,12 +93,12 @@ public: ForEachIndexImpl(intervals, scale, [&](uint32_t index) { - fn(*GetFeature(index, ignoredEditedStatus)); + fn(*GetFeature(index, ignoreEditedStatus)); }); } // Returns false if feature was deleted by user. - std::unique_ptr GetFeature(uint32_t index, bool ignoredEditedStatus = false) const; + std::unique_ptr GetFeature(uint32_t index, bool ignoreEditedStatus = false) const; [[nodiscard]] inline bool GetCenter(uint32_t index, m2::PointD & center) { return m_centers.Get(index, center); } diff --git a/libs/search/reverse_geocoder.cpp b/libs/search/reverse_geocoder.cpp index ca5eca22a..978fca963 100644 --- a/libs/search/reverse_geocoder.cpp +++ b/libs/search/reverse_geocoder.cpp @@ -77,7 +77,7 @@ ReverseGeocoder::ReverseGeocoder(DataSource const & dataSource) : m_dataSource(d template vector GetNearbyObjects(search::MwmContext & context, m2::PointD const & center, double radiusM, - FilterT && filter, bool ignoredEditedStatus = false) + FilterT && filter, bool ignoreEditedStatus = false) { vector objs; @@ -90,17 +90,17 @@ vector GetNearbyObjects(search::MwmContext & context, m2::PointD const & c if (!name.empty()) objs.emplace_back(ft.GetID(), feature::GetMinDistanceMeters(ft, center), name, ft.GetNames()); } - }, ignoredEditedStatus); + }, ignoreEditedStatus); sort(objs.begin(), objs.end(), base::LessBy(&ObjT::m_distanceMeters)); return objs; } vector ReverseGeocoder::GetNearbyStreets(search::MwmContext & context, - m2::PointD const & center, double radiusM, bool ignoredEditedStatus) + m2::PointD const & center, double radiusM, bool ignoreEditedStatus) { return GetNearbyObjects(context, center, radiusM, - [](FeatureType & ft) { return StreetVicinityLoader::IsStreet(ft); }, ignoredEditedStatus); + [](FeatureType & ft) { return StreetVicinityLoader::IsStreet(ft); }, ignoreEditedStatus); } vector ReverseGeocoder::GetNearbyStreets(MwmSet::MwmId const & id, @@ -122,13 +122,13 @@ vector ReverseGeocoder::GetNearbyStreets(FeatureType & } std::vector ReverseGeocoder::GetNearbyPlaces(search::MwmContext & context, - m2::PointD const & center, double radiusM, bool ignoredEditedStatus) + m2::PointD const & center, double radiusM, bool ignoreEditedStatus) { return GetNearbyObjects(context, center, radiusM, [](FeatureType & ft) { return (ftypes::IsLocalityChecker::Instance().GetType(ft) >= ftypes::LocalityType::City || ftypes::IsSuburbChecker::Instance()(ft)); - }, ignoredEditedStatus); + }, ignoreEditedStatus); } string ReverseGeocoder::GetFeatureStreetName(FeatureType & ft) const diff --git a/libs/search/reverse_geocoder.hpp b/libs/search/reverse_geocoder.hpp index 0a5ff08ad..dcc767b94 100644 --- a/libs/search/reverse_geocoder.hpp +++ b/libs/search/reverse_geocoder.hpp @@ -114,11 +114,11 @@ public: /// Parameter |includeSquaresAndSuburbs| needed for backward compatibility: /// existing mwms operate on streets without squares and suburbs. static std::vector GetNearbyStreets(search::MwmContext & context, m2::PointD const & center, - double radiusM = kLookupRadiusM, bool ignoredEditedStatus = false); + double radiusM = kLookupRadiusM, bool ignoreEditedStatus = false); std::vector GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD const & center) const; std::vector GetNearbyStreets(FeatureType & ft) const; - static std::vector GetNearbyPlaces(search::MwmContext & context, m2::PointD const & center, double radiusM, bool ignoredEditedStatus = false); + static std::vector GetNearbyPlaces(search::MwmContext & context, m2::PointD const & center, double radiusM, bool ignoreEditedStatus = false); /// @return feature street name. /// Returns empty string when there is no street the feature belongs to. diff --git a/libs/search/street_vicinity_loader.cpp b/libs/search/street_vicinity_loader.cpp index 26aeb097b..2479e49da 100644 --- a/libs/search/street_vicinity_loader.cpp +++ b/libs/search/street_vicinity_loader.cpp @@ -35,13 +35,13 @@ void StreetVicinityLoader::OnQueryFinished() m_cache.ClearIfNeeded(); } -StreetVicinityLoader::Street const & StreetVicinityLoader::GetStreet(uint32_t featureId, bool ignoredEditedStatus) +StreetVicinityLoader::Street const & StreetVicinityLoader::GetStreet(uint32_t featureId, bool ignoreEditedStatus) { auto r = m_cache.Get(featureId); if (!r.second) return r.first; - LoadStreet(featureId, r.first, ignoredEditedStatus); + LoadStreet(featureId, r.first, ignoreEditedStatus); return r.first; } @@ -54,9 +54,9 @@ bool StreetVicinityLoader::IsStreet(FeatureType & ft) return ((isLineOrArea && ftypes::IsWayChecker::Instance()(ft)) || ftypes::IsSquareChecker::Instance()(ft)); } -void StreetVicinityLoader::LoadStreet(uint32_t featureId, Street & street, bool ignoredEditedStatus) +void StreetVicinityLoader::LoadStreet(uint32_t featureId, Street & street, bool ignoreEditedStatus) { - auto feature = m_context->GetFeature(featureId, ignoredEditedStatus); + auto feature = m_context->GetFeature(featureId, ignoreEditedStatus); if (!feature || !IsStreet(*feature)) return; diff --git a/libs/search/street_vicinity_loader.hpp b/libs/search/street_vicinity_loader.hpp index dc8483633..db72fabcf 100644 --- a/libs/search/street_vicinity_loader.hpp +++ b/libs/search/street_vicinity_loader.hpp @@ -73,10 +73,10 @@ public: void OnQueryFinished(); - Street const & GetStreet(uint32_t featureId, bool ignoredEditedStatus = false); + Street const & GetStreet(uint32_t featureId, bool ignoreEditedStatus = false); private: - void LoadStreet(uint32_t featureId, Street & street, bool ignoredEditedStatus = false); + void LoadStreet(uint32_t featureId, Street & street, bool ignoreEditedStatus = false); MwmContext * m_context; int m_scale;