From 23b92892e7104b7cb678c7c7f9635ed92aecc6d3 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Mon, 7 Mar 2016 07:33:06 +0300 Subject: [editor] Correctly set nearby streets for created features, minor refactoring. --- search/reverse_geocoder.cpp | 7 +++---- search/reverse_geocoder.hpp | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'search') diff --git a/search/reverse_geocoder.cpp b/search/reverse_geocoder.cpp index 5f2666f596..450c2a14de 100644 --- a/search/reverse_geocoder.cpp +++ b/search/reverse_geocoder.cpp @@ -39,8 +39,7 @@ void ReverseGeocoder::GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD cons } string name; - static int8_t const lang = StringUtf8Multilang::GetLangIndex("default"); - if (!ft.GetName(lang, name)) + if (!ft.GetName(StringUtf8Multilang::kDefaultCode, name)) return; ASSERT(!name.empty(), ()); @@ -100,11 +99,11 @@ size_t ReverseGeocoder::GetMatchedStreetIndex(string const & keyName, } pair, uint32_t> -ReverseGeocoder::GetNearbyFeatureStreets(FeatureType const & ft) const +ReverseGeocoder::GetNearbyFeatureStreets(FeatureType & ft) const { pair, uint32_t> result; - GetNearbyStreets(const_cast(ft), result.first); + GetNearbyStreets(ft, result.first); HouseTable table(m_index); if (!table.Get(ft.GetID(), result.second)) diff --git a/search/reverse_geocoder.hpp b/search/reverse_geocoder.hpp index cfa8465c2b..2eb4c21f38 100644 --- a/search/reverse_geocoder.hpp +++ b/search/reverse_geocoder.hpp @@ -75,9 +75,9 @@ public: void GetNearbyStreets(FeatureType & ft, vector & streets) const; //@} - /// @todo Leave const reference for now to support client's legacy code. - /// It's better to use honest non-const reference when feature can be modified in any way. - pair, uint32_t> GetNearbyFeatureStreets(FeatureType const & ft) const; + /// @returns [a lot of] nearby feature's streets and feature's street index, if valid ( < vector.size()). + /// @note returned vector can contain duplicated street segments. + pair, uint32_t> GetNearbyFeatureStreets(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; -- cgit v1.2.3