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

Street multilang name.

Browse source
This commit is contained in:
Sergey Magidovich 2016-04-14 11:19:32 +03:00
parent 585e58f728
commit 8923adacfd
1 changed files with 66 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
map/framework.cpp
View file

@ -2448,26 +2448,39 @@ bool Framework::ParseEditorDebugCommand(search::SearchParams const & params)
namespace
{
vector<osm::LocalizedStreet> FilterNearbyStreets(vector<search::ReverseGeocoder::Street> const & streets,
string const & exactFeatureStreet = "")
osm::LocalizedStreet LocalizeStreet(model::FeaturesFetcher const & model, FeatureID const & fid)
{
osm::LocalizedStreet result;
Index::FeaturesLoaderGuard g(model.GetIndex(), fid.m_mwmId);
FeatureType ft;
g.GetFeatureByIndex(fid.m_index, ft);
ft.GetPreferredNames(result.m_defaultName, result.m_localizedName);
return result;
}
vector<osm::LocalizedStreet> TakeSomeStreetsAndLocalize(
vector<search::ReverseGeocoder::Street> const & streets,
model::FeaturesFetcher const & model)
{
vector<osm::LocalizedStreet> results;
// Exact feature street always goes first in Editor UI street list.
// TODO: Push into result LocalizedStreet object with default and localized street name.
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)
{
osm::LocalizedStreet const st{street.m_name, ""};
if (find(results.begin(), results.end(), st) == results.end())
{
results.push_back(st);
if (results.size() >= kMaxNumberOfNearbyStreetsToDisplay)
break;
}
auto const isDuplicate = find_if(begin(results), end(results),
[&street](osm::LocalizedStreet const & s)
{
return s.m_defaultName == street.m_name;
}) != results.end();
if (isDuplicate)
continue;
results.push_back(LocalizeStreet(model, street.m_id));
if (results.size() >= kMaxNumberOfNearbyStreetsToDisplay)
break;
}
return results;
}
@ -2484,8 +2497,9 @@ bool Framework::CreateMapObject(m2::PointD const & mercator, uint32_t const feat
search::ReverseGeocoder const coder(m_model.GetIndex());
vector<search::ReverseGeocoder::Street> streets;
coder.GetNearbyStreets(mwmId, mercator, streets);
emo.SetNearbyStreets(FilterNearbyStreets(streets));
emo.SetNearbyStreets(TakeSomeStreetsAndLocalize(streets, m_model));
return osm::Editor::Instance().CreatePoint(featureType, mercator, mwmId, emo);
}
@ -2501,31 +2515,54 @@ bool Framework::GetEditableMapObject(FeatureID const & fid, osm::EditableMapObje
osm::Editor & editor = osm::Editor::Instance();
emo.SetEditableProperties(editor.GetEditableProperties(ft));
// Get exact feature's street address (if any) from mwm,
// together with all nearby streets.
search::ReverseGeocoder const coder(m_model.GetIndex());
auto const streets = coder.GetNearbyFeatureStreets(ft);
string street;
if (editor.GetEditedFeatureStreet(fid, street))
bool const featureIsInEditor = editor.GetEditedFeatureStreet(fid, street);
bool const featureHasStreetInMwm = streets.second < streets.first.size();
if (!featureIsInEditor && featureHasStreetInMwm)
street = streets.first[streets.second].m_name;
auto localizedStreets = TakeSomeStreetsAndLocalize(streets.first, m_model);
if (!street.empty())
{
// Exact feature's street is taken directy from the Editor.
// Fill only nearby streets.
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, street));
auto it = find_if(begin(streets.first), end(streets.first),
[&street](search::ReverseGeocoder::Street const & s)
{
return s.m_name == street;
});
if (it != end(streets.first))
{
auto const localizedStreet = LocalizeStreet(m_model, it->m_id);
emo.SetStreet(localizedStreet);
// A street that a feature belongs to should alwas be in the first place in the list.
auto localizedIt = find(begin(localizedStreets), end(localizedStreets), localizedStreet);
if (localizedIt != end(localizedStreets))
iter_swap(localizedIt, begin(localizedStreets));
else
localizedStreets.insert(begin(localizedStreets), localizedStreet);
}
else
{
emo.SetStreet({street, ""});
}
}
else
{
// Get exact feature's street address (if any) from mwm, together with all nearby streets.
search::ReverseGeocoder const coder(m_model.GetIndex());
auto const streets = coder.GetNearbyFeatureStreets(ft);
if (streets.second < streets.first.size())
street = streets.first[streets.second].m_name;
emo.SetNearbyStreets(FilterNearbyStreets(streets.first, street));
emo.SetStreet({});
}
//TODO: We have to set default and localized name if last one exists.
emo.SetStreet({street, ""});
emo.SetNearbyStreets(move(localizedStreets));
return true;
}
osm::Editor::SaveResult Framework::SaveEditedMapObject(osm::EditableMapObject const & emo)
{
if (!m_lastTapEvent)