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

Renamed GetElevation() to GetElevationFormatted().

Browse source
This commit is contained in:
Alex Zolotarev 2016-03-17 17:38:09 +03:00 • committed by Sergey Yershov
parent 1506c9bac4
commit 88fddc38b7
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
indexer/map_object.cpp
View file

@ -159,7 +159,7 @@ int MapObject::GetStars() const
return 0;
}
string MapObject::GetElevation() const
string MapObject::GetElevationFormatted() const
{
if (m_metadata.Has(feature::Metadata::FMD_ELE))
{

2
indexer/map_object.hpp
View file

@ -82,7 +82,7 @@ public:
string GetOperator() const;
int GetStars() const;
/// @returns formatted elevation in feet or meters, or empty string.
string GetElevation() const;
string GetElevationFormatted() const;
/// @returns URL to Wikipedia or empty string.
string GetWikipediaLink() const;
string GetFlats() const;

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

@ -109,7 +109,7 @@ void initFieldsMap()
[self setMetaField:gMetaFieldsMap[type] value:L(@"WiFi_available").UTF8String];
break;
case Metadata::FMD_ELE:
[self setMetaField:gMetaFieldsMap[type] value:"▲" + m_info.GetElevation()];
[self setMetaField:gMetaFieldsMap[type] value:"▲" + m_info.GetElevationFormatted()];
break;
case Metadata::FMD_STARS:
[self setMetaField:gMetaFieldsMap[type] value:m_info.FormatStars()];

2
map/place_page_info.cpp
View file

@ -57,7 +57,7 @@ string Info::GetSubtitle() const
values.push_back(op);
// Elevation.
string const eleStr = GetElevation();
string const eleStr = GetElevationFormatted();
if (!eleStr.empty())
values.push_back(kMountainSymbol + eleStr);
if (HasWifi())

2
qt/editor_dialog.cpp
View file

@ -135,7 +135,7 @@ EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo)
case osm::Props::OpeningHours: v = emo.GetOpeningHours(); break;
case osm::Props::Stars: v = strings::to_string(emo.GetStars()); break;
case osm::Props::Operator: v = emo.GetOperator(); break;
case osm::Props::Elevation: v = emo.GetElevation(); break;
case osm::Props::Elevation: v = emo.GetElevationFormatted(); break;
case osm::Props::Wikipedia: v = emo.GetWikipedia(); break;
case osm::Props::Flats: v = emo.GetFlats(); break;
case osm::Props::BuildingLevels: v = emo.GetBuildingLevels(); break;

2
qt/place_page_dialog.cpp
View file

@ -125,7 +125,7 @@ PlacePageDialog::PlacePageDialog(QWidget * parent, place_page::Info const & info
break;
case osm::Props::Elevation:
k = "Elevation";
v = info.GetElevation();
v = info.GetElevationFormatted();
break;
case osm::Props::Wikipedia:
k = "Wikipedia";