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

[editor] Always display correct feature’s street.

Browse source
This commit is contained in:
Alex Zolotarev 2016-03-17 14:12:09 +03:00 • committed by Sergey Yershov
parent 7f3697cfaa
commit ac61f4e77b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
map/framework.cpp
View file

@ -2359,9 +2359,13 @@ bool Framework::ParseEditorDebugCommand(search::SearchParams const & params)
namespace
{
vector<string> FilterNearbyStreets(vector<search::ReverseGeocoder::Street> const & streets)
vector<string> FilterNearbyStreets(vector<search::ReverseGeocoder::Street> const & streets,
string const & exactFeatureStreet = "")
{
vector<string> results;
// Exact feature street always goes first in Editor UI street list.
if (!exactFeatureStreet.empty())
results.push_back(exactFeatureStreet);
// Reasonable number of different nearby street names to display in UI.
constexpr size_t kMaxNumberOfNearbyStreetsToDisplay = 8;
for (auto const & street : streets)
@ -2413,7 +2417,7 @@ bool Framework::GetEditableMapObject(FeatureID const & fid, osm::EditableMapObje
search::ReverseGeocoder const coder(m_model.GetIndex());
vector<search::ReverseGeocoder::Street> streets;
coder.GetNearbyStreets(fid.m_mwmId, feature::GetCenter(*feature), streets);
emo.SetNearbyStreets(FilterNearbyStreets(streets));
emo.SetNearbyStreets(FilterNearbyStreets(streets, street));
}
else
{
@ -2422,7 +2426,7 @@ bool Framework::GetEditableMapObject(FeatureID const & fid, osm::EditableMapObje
auto const streets = coder.GetNearbyFeatureStreets(ft);
if (streets.second < streets.first.size())
street = streets.first[streets.second].m_name;
emo.SetNearbyStreets(FilterNearbyStreets(streets.first));
emo.SetNearbyStreets(FilterNearbyStreets(streets.first, street));
}
emo.SetStreet(street);
return true;