diff options
| author | Sergey Magidovich <mgsergio@mapswithme.com> | 2016-06-09 16:14:40 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-06-23 19:23:42 +0300 |
| commit | 70828a529bfbcd4c73885cb0ac1f2d869ecf0abf (patch) | |
| tree | cf923125ba573fa7fb16d1cee6d8532f258e9e64 /map | |
| parent | ccd5ee0bd8544e8cea4f52ea31174e9c2d492397 (diff) | |
Disable old data editing.
Diffstat (limited to 'map')
| -rw-r--r-- | map/framework.cpp | 2 | ||||
| -rw-r--r-- | map/place_page_info.cpp | 12 | ||||
| -rw-r--r-- | map/place_page_info.hpp | 3 |
3 files changed, 15 insertions, 2 deletions
diff --git a/map/framework.cpp b/map/framework.cpp index 9ed8735b1f..cd48c6274a 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -753,6 +753,8 @@ void Framework::FillInfoFromFeatureType(FeatureType const & ft, place_page::Info info.m_isEditable = featureStatus != osm::Editor::FeatureStatus::Obsolete && !info.IsSponsoredHotel(); + info.m_isDataEditable = version::IsSingleMwm(ft.GetID().m_mwmId.GetInfo()->m_version.GetVersion()); + info.m_localizedWifiString = m_stringsBundle.GetString("wifi"); info.m_localizedRatingString = m_stringsBundle.GetString("place_page_booking_rating"); } diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp index 2b94a56923..79ae971a90 100644 --- a/map/place_page_info.cpp +++ b/map/place_page_info.cpp @@ -16,9 +16,17 @@ bool Info::IsFeature() const { return m_featureID.IsValid(); } bool Info::IsBookmark() const { return m_bac != MakeEmptyBookmarkAndCategory(); } bool Info::IsMyPosition() const { return m_isMyPosition; } bool Info::HasApiUrl() const { return !m_apiUrl.empty(); } -bool Info::IsEditable() const { return m_isEditable; } +bool Info::IsEditable() const { return m_isEditable && m_isDataEditable; } +bool Info::IsDataEditable() const { return m_isDataEditable; } bool Info::HasWifi() const { return GetInternet() == osm::Internet::Wlan; } -bool Info::ShouldShowAddPlace() const { return !IsSponsoredHotel() && (!IsFeature() || (!IsPointType() && !IsBuilding())); } + +bool Info::ShouldShowAddPlace() const +{ + return !IsSponsoredHotel() && + (!IsFeature() || (!IsPointType() && !IsBuilding())) && + m_isDataEditable; +} + bool Info::IsSponsoredHotel() const { return m_isSponsoredHotel; } string Info::FormatNewBookmarkName() const diff --git a/map/place_page_info.hpp b/map/place_page_info.hpp index dda6988242..c1cedfb34a 100644 --- a/map/place_page_info.hpp +++ b/map/place_page_info.hpp @@ -34,6 +34,8 @@ public: bool HasApiUrl() const; /// @returns true if Edit Place button should be displayed. bool IsEditable() const; + /// @returns true if PlacePage was opened on a single mwm (see version::IsSingleMwm). + bool IsDataEditable() const; /// TODO: Support all possible Internet types in UI. @See MapObject::GetInternet(). bool HasWifi() const; @@ -90,6 +92,7 @@ public: bool m_isMyPosition = false; bool m_isEditable = false; + bool m_isDataEditable = false; // TODO(AlexZ): Temporary solution. It's better to use a wifi icon in UI instead of text. string m_localizedWifiString; |