From 88fddc38b762e4493eab69014a7045e3660ca048 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Thu, 17 Mar 2016 17:38:09 +0300 Subject: [PATCH] Renamed GetElevation() to GetElevationFormatted(). --- indexer/map_object.cpp | 2 +- indexer/map_object.hpp | 2 +- iphone/Maps/Classes/MWMPlacePageEntity.mm | 2 +- map/place_page_info.cpp | 2 +- qt/editor_dialog.cpp | 2 +- qt/place_page_dialog.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/indexer/map_object.cpp b/indexer/map_object.cpp index 2a35265110..5909d40c49 100644 --- a/indexer/map_object.cpp +++ b/indexer/map_object.cpp @@ -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)) { diff --git a/indexer/map_object.hpp b/indexer/map_object.hpp index 954ec5ad22..d245bb52b1 100644 --- a/indexer/map_object.hpp +++ b/indexer/map_object.hpp @@ -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; diff --git a/iphone/Maps/Classes/MWMPlacePageEntity.mm b/iphone/Maps/Classes/MWMPlacePageEntity.mm index 9f7297f32e..3a78c6d6ba 100644 --- a/iphone/Maps/Classes/MWMPlacePageEntity.mm +++ b/iphone/Maps/Classes/MWMPlacePageEntity.mm @@ -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()]; diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp index e18dfbbb54..949255926a 100644 --- a/map/place_page_info.cpp +++ b/map/place_page_info.cpp @@ -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()) diff --git a/qt/editor_dialog.cpp b/qt/editor_dialog.cpp index 07edc22fed..0db4ffb15e 100644 --- a/qt/editor_dialog.cpp +++ b/qt/editor_dialog.cpp @@ -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; diff --git a/qt/place_page_dialog.cpp b/qt/place_page_dialog.cpp index 11bac3994f..fdd886f5ea 100644 --- a/qt/place_page_dialog.cpp +++ b/qt/place_page_dialog.cpp @@ -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";