diff options
author | Arsentiy Milchakov <milcars@mapswithme.com> | 2018-08-22 14:12:08 +0300 |
---|---|---|
committer | mpimenov <mpimenov@users.noreply.github.com> | 2018-08-22 16:48:46 +0300 |
commit | 88d400f2296a4b1a0ec8adb9d505167ca78940a8 (patch) | |
tree | ca968628c160195479d1ace61356bcec29c675e1 /search | |
parent | 92824ab302b88fa6dbff89d49252c2cfe484b6ee (diff) |
[editor] synchronization. review fixes.
Diffstat (limited to 'search')
-rw-r--r-- | search/editor_delegate.cpp | 2 | ||||
-rw-r--r-- | search/reverse_geocoder.cpp | 6 | ||||
-rw-r--r-- | search/reverse_geocoder.hpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/search/editor_delegate.cpp b/search/editor_delegate.cpp index b6fd7f433b..6b1012447e 100644 --- a/search/editor_delegate.cpp +++ b/search/editor_delegate.cpp @@ -29,7 +29,7 @@ unique_ptr<FeatureType> EditorDelegate::GetOriginalFeature(FeatureID const & fid string EditorDelegate::GetOriginalFeatureStreet(FeatureType & ft) const { search::ReverseGeocoder const coder(m_dataSource); - auto const streets = coder.GetOriginalNearbyFeatureStreets(ft); + auto const streets = coder.GetNearbyOriginalFeatureStreets(ft); if (streets.second < streets.first.size()) return streets.first[streets.second].m_name; return {}; diff --git a/search/reverse_geocoder.cpp b/search/reverse_geocoder.cpp index c5fa762555..b82b367b01 100644 --- a/search/reverse_geocoder.cpp +++ b/search/reverse_geocoder.cpp @@ -100,7 +100,7 @@ void ReverseGeocoder::GetNearbyStreets(FeatureType & ft, vector<Street> & street GetNearbyStreets(ft.GetID().m_mwmId, feature::GetCenter(ft), streets); } -void ReverseGeocoder::GetOriginalNearbyStreets(MwmSet::MwmId const & id, m2::PointD const & center, +void ReverseGeocoder::GetNearbyOriginalStreets(MwmSet::MwmId const & id, m2::PointD const & center, vector<Street> & streets) const { auto const fillStreets = [](MwmSet::MwmHandle && handle, m2::RectD const & rect, @@ -160,12 +160,12 @@ ReverseGeocoder::GetNearbyFeatureStreets(FeatureType & ft) const } pair<vector<ReverseGeocoder::Street>, uint32_t> -ReverseGeocoder::GetOriginalNearbyFeatureStreets(FeatureType & ft) const +ReverseGeocoder::GetNearbyOriginalFeatureStreets(FeatureType & ft) const { pair<vector<ReverseGeocoder::Street>, uint32_t> result; ASSERT(ft.GetID().IsValid(), ()); - GetOriginalNearbyStreets(ft.GetID().m_mwmId, feature::GetCenter(ft), result.first); + GetNearbyOriginalStreets(ft.GetID().m_mwmId, feature::GetCenter(ft), result.first); HouseTable table(m_dataSource); if (!table.Get(ft.GetID(), result.second)) diff --git a/search/reverse_geocoder.hpp b/search/reverse_geocoder.hpp index 5ae328b324..5631c1e943 100644 --- a/search/reverse_geocoder.hpp +++ b/search/reverse_geocoder.hpp @@ -82,7 +82,7 @@ public: void GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD const & center, vector<Street> & streets) const; void GetNearbyStreets(FeatureType & ft, vector<Street> & streets) const; - void GetOriginalNearbyStreets(MwmSet::MwmId const & id, m2::PointD const & center, + void GetNearbyOriginalStreets(MwmSet::MwmId const & id, m2::PointD const & center, vector<Street> & streets) const; /// @returns [a lot of] nearby feature's streets and an index of a feature's street. @@ -90,7 +90,7 @@ public: /// @note returned vector can contain duplicated street segments. pair<vector<Street>, uint32_t> GetNearbyFeatureStreets(FeatureType & ft) const; /// Same as GetNearbyFeatureStreets but returns streets from MWM only. - pair<vector<Street>, uint32_t> GetOriginalNearbyFeatureStreets(FeatureType & ft) const; + pair<vector<Street>, uint32_t> GetNearbyOriginalFeatureStreets(FeatureType & ft) const; /// @return The nearest exact address where building has house number and valid street match. void GetNearbyAddress(m2::PointD const & center, Address & addr) const; |