drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[generator] Name method parameter more clearly

Browse Source 
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
This commit is contained in:
Yannik Bloscheck
2025-11-03 18:28:13 +01:00
committed by Yannik Bloscheck
parent 14c4d08e32
commit 8db1dd55b5
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/search/mwm_context.cpp
View File

@@ -29,9 +29,9 @@ MwmContext::MwmContext(MwmSet::MwmHandle handle, MwmType type) : MwmContext(std:
m_type = type; m_type = type;
} }
std::unique_ptr<FeatureType> MwmContext::GetFeature(uint32_t index, bool ignoredEditedStatus) const std::unique_ptr<FeatureType> MwmContext::GetFeature(uint32_t index, bool ignoreEditedStatus) const
{ {
if (ignoredEditedStatus) { if (ignoreEditedStatus) {
auto ft = m_vector.GetByIndex(index); auto ft = m_vector.GetByIndex(index);
CHECK(ft, ()); CHECK(ft, ());
ft->SetID(FeatureID(GetId(), index)); ft->SetID(FeatureID(GetId(), index));

6
libs/search/mwm_context.hpp
View File

@@ -85,7 +85,7 @@ public:
} }
template <typename Fn> template <typename Fn>
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(); uint32_t const scale = m_value.GetHeader().GetLastScale();
covering::Intervals intervals; covering::Intervals intervals;
@@ -93,12 +93,12 @@ public:
ForEachIndexImpl(intervals, scale, [&](uint32_t index) ForEachIndexImpl(intervals, scale, [&](uint32_t index)
{ {
fn(*GetFeature(index, ignoredEditedStatus)); fn(*GetFeature(index, ignoreEditedStatus));
}); });
} }
// Returns false if feature was deleted by user. // Returns false if feature was deleted by user.
std::unique_ptr<FeatureType> GetFeature(uint32_t index, bool ignoredEditedStatus = false) const; std::unique_ptr<FeatureType> GetFeature(uint32_t index, bool ignoreEditedStatus = false) const;
[[nodiscard]] inline bool GetCenter(uint32_t index, m2::PointD & center) { return m_centers.Get(index, center); } [[nodiscard]] inline bool GetCenter(uint32_t index, m2::PointD & center) { return m_centers.Get(index, center); }

12
libs/search/reverse_geocoder.cpp
View File

@@ -77,7 +77,7 @@ ReverseGeocoder::ReverseGeocoder(DataSource const & dataSource) : m_dataSource(d
template <class ObjT, class FilterT> template <class ObjT, class FilterT>
vector<ObjT> GetNearbyObjects(search::MwmContext & context, m2::PointD const & center, double radiusM, vector<ObjT> GetNearbyObjects(search::MwmContext & context, m2::PointD const & center, double radiusM,
FilterT && filter, bool ignoredEditedStatus = false) FilterT && filter, bool ignoreEditedStatus = false)
{ {
vector<ObjT> objs; vector<ObjT> objs;
@@ -90,17 +90,17 @@ vector<ObjT> GetNearbyObjects(search::MwmContext & context, m2::PointD const & c
if (!name.empty()) if (!name.empty())
objs.emplace_back(ft.GetID(), feature::GetMinDistanceMeters(ft, center), name, ft.GetNames()); objs.emplace_back(ft.GetID(), feature::GetMinDistanceMeters(ft, center), name, ft.GetNames());
} }
}, ignoredEditedStatus); }, ignoreEditedStatus);
sort(objs.begin(), objs.end(), base::LessBy(&ObjT::m_distanceMeters)); sort(objs.begin(), objs.end(), base::LessBy(&ObjT::m_distanceMeters));
return objs; return objs;
} }
vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(search::MwmContext & context, vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(search::MwmContext & context,
m2::PointD const & center, double radiusM, bool ignoredEditedStatus) m2::PointD const & center, double radiusM, bool ignoreEditedStatus)
{ {
return GetNearbyObjects<Street>(context, center, radiusM, return GetNearbyObjects<Street>(context, center, radiusM,
[](FeatureType & ft) { return StreetVicinityLoader::IsStreet(ft); }, ignoredEditedStatus); [](FeatureType & ft) { return StreetVicinityLoader::IsStreet(ft); }, ignoreEditedStatus);
} }
vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(MwmSet::MwmId const & id, vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(MwmSet::MwmId const & id,
@@ -122,13 +122,13 @@ vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(FeatureType &
} }
std::vector<ReverseGeocoder::Place> ReverseGeocoder::GetNearbyPlaces(search::MwmContext & context, std::vector<ReverseGeocoder::Place> ReverseGeocoder::GetNearbyPlaces(search::MwmContext & context,
m2::PointD const & center, double radiusM, bool ignoredEditedStatus) m2::PointD const & center, double radiusM, bool ignoreEditedStatus)
{ {
return GetNearbyObjects<Place>(context, center, radiusM, [](FeatureType & ft) return GetNearbyObjects<Place>(context, center, radiusM, [](FeatureType & ft)
{ {
return (ftypes::IsLocalityChecker::Instance().GetType(ft) >= ftypes::LocalityType::City || return (ftypes::IsLocalityChecker::Instance().GetType(ft) >= ftypes::LocalityType::City ||
ftypes::IsSuburbChecker::Instance()(ft)); ftypes::IsSuburbChecker::Instance()(ft));
}, ignoredEditedStatus); }, ignoreEditedStatus);
} }
string ReverseGeocoder::GetFeatureStreetName(FeatureType & ft) const string ReverseGeocoder::GetFeatureStreetName(FeatureType & ft) const

4
libs/search/reverse_geocoder.hpp
View File

@@ -114,11 +114,11 @@ public:
/// Parameter |includeSquaresAndSuburbs| needed for backward compatibility: /// Parameter |includeSquaresAndSuburbs| needed for backward compatibility:
/// existing mwms operate on streets without squares and suburbs. /// existing mwms operate on streets without squares and suburbs.
static std::vector<Street> GetNearbyStreets(search::MwmContext & context, m2::PointD const & center, static std::vector<Street> GetNearbyStreets(search::MwmContext & context, m2::PointD const & center,
double radiusM = kLookupRadiusM, bool ignoredEditedStatus = false); double radiusM = kLookupRadiusM, bool ignoreEditedStatus = false);
std::vector<Street> GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD const & center) const; std::vector<Street> GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD const & center) const;
std::vector<Street> GetNearbyStreets(FeatureType & ft) const; std::vector<Street> GetNearbyStreets(FeatureType & ft) const;
static std::vector<Place> GetNearbyPlaces(search::MwmContext & context, m2::PointD const & center, double radiusM, bool ignoredEditedStatus = false); static std::vector<Place> GetNearbyPlaces(search::MwmContext & context, m2::PointD const & center, double radiusM, bool ignoreEditedStatus = false);
/// @return feature street name. /// @return feature street name.
/// Returns empty string when there is no street the feature belongs to. /// Returns empty string when there is no street the feature belongs to.

8
libs/search/street_vicinity_loader.cpp
View File

@@ -35,13 +35,13 @@ void StreetVicinityLoader::OnQueryFinished()
m_cache.ClearIfNeeded(); 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); auto r = m_cache.Get(featureId);
if (!r.second) if (!r.second)
return r.first; return r.first;
LoadStreet(featureId, r.first, ignoredEditedStatus); LoadStreet(featureId, r.first, ignoreEditedStatus);
return r.first; return r.first;
} }
@@ -54,9 +54,9 @@ bool StreetVicinityLoader::IsStreet(FeatureType & ft)
return ((isLineOrArea && ftypes::IsWayChecker::Instance()(ft)) || ftypes::IsSquareChecker::Instance()(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)) if (!feature || !IsStreet(*feature))
return; return;

4
libs/search/street_vicinity_loader.hpp
View File

@@ -73,10 +73,10 @@ public:
void OnQueryFinished(); void OnQueryFinished();
Street const & GetStreet(uint32_t featureId, bool ignoredEditedStatus = false); Street const & GetStreet(uint32_t featureId, bool ignoreEditedStatus = false);
private: private:
void LoadStreet(uint32_t featureId, Street & street, bool ignoredEditedStatus = false); void LoadStreet(uint32_t featureId, Street & street, bool ignoreEditedStatus = false);
MwmContext * m_context; MwmContext * m_context;
int m_scale; int m_scale;