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

Renamed Framework::GetPOIAddressInfo to more correct GetFeatureAddressInfo.

Browse source
This commit is contained in:
Alex Zolotarev 2016-01-13 10:46:15 +03:00 • committed by Sergey Yershov
parent 2ed1ad2d3d
commit e7e703c792
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -722,7 +722,7 @@ extern "C"
auto const * feature = mark->GetFeature();
if (feature)
{
info = fm->GetPOIAddressInfo(*feature);
info = fm->GetFeatureAddressInfo(*feature);
metadata = feature->GetMetadata();
}
else
@ -1164,7 +1164,7 @@ extern "C"
if (feature)
{
metadata = feature->GetMetadata();
info = frm()->GetPOIAddressInfo(*feature);
info = frm()->GetFeatureAddressInfo(*feature);
}
// TODO(AlexZ): else case?

2
iphone/Maps/Classes/MWMPlacePageEntity.mm
View file

@ -179,7 +179,7 @@ void initFieldsMap()
{
if (feature)
{
search::AddressInfo const info = GetFramework().GetPOIAddressInfo(*feature);
search::AddressInfo const info = GetFramework().GetFeatureAddressInfo(*feature);
feature::Metadata const & metadata = feature->GetMetadata();
NSString * const name = @(info.GetPinName().c_str());
self.title = name.length > 0 ? name : L(@"dropped_pin");

2
map/address_finder.cpp
View file

@ -474,7 +474,7 @@ void Framework::GetAddressInfoForGlobalPoint(m2::PointD const & pt, search::Addr
//GetLocality(pt, info);
}
search::AddressInfo Framework::GetPOIAddressInfo(FeatureType const & ft) const
search::AddressInfo Framework::GetFeatureAddressInfo(FeatureType const & ft) const
{
search::AddressInfo info;

2
map/framework.hpp
View file

@ -484,7 +484,7 @@ private:
void GetLocality(m2::PointD const & pt, search::AddressInfo & info) const;
public:
search::AddressInfo GetPOIAddressInfo(FeatureType const & ft) const;
search::AddressInfo GetFeatureAddressInfo(FeatureType const & ft) const;
/// Get feature at given point even if it's invisible on the screen.
/// TODO(AlexZ): Refactor out other similar methods.
/// @returns nullptr if no feature was found at the given mercator point.