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

[android] Reverted the returning empty string when rating is absent

Browse source
This commit is contained in:
alexzatsepin 2016-10-21 20:11:19 +03:00 • committed by Arsentiy Milchakov
parent 795cbd14c4
commit 5b4a5843fd
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
map/place_page_info.cpp
View file

@ -10,6 +10,7 @@ namespace place_page
char const * const Info::kSubtitleSeparator = " • ";
char const * const Info::kStarSymbol = "★";
char const * const Info::kMountainSymbol = "▲";
char const * const Info::kEmptyRatingSymbol = "-";
char const * const Info::kPricingSymbol = "$";
bool Info::IsFeature() const { return m_featureID.IsValid(); }
@ -122,11 +123,9 @@ string Info::GetRatingFormatted() const
if (!IsSponsored())
return string();
auto const rating = GetMetadata().Get(feature::Metadata::FMD_RATING);
if (rating.empty())
return rating;
int const size = snprintf(nullptr, 0, m_localizedRatingString.c_str(), rating.c_str());
auto const r = GetMetadata().Get(feature::Metadata::FMD_RATING);
char const * rating = r.empty() ? kEmptyRatingSymbol : r.c_str();
int const size = snprintf(nullptr, 0, m_localizedRatingString.c_str(), rating);
if (size < 0)
{
LOG(LERROR, ("Incorrect size for string:", m_localizedRatingString, ", rating:", rating));
@ -134,7 +133,7 @@ string Info::GetRatingFormatted() const
}
vector<char> buf(size + 1);
snprintf(buf.data(), buf.size(), m_localizedRatingString.c_str(), rating.c_str());
snprintf(buf.data(), buf.size(), m_localizedRatingString.c_str(), rating);
return string(buf.begin(), buf.end());
}

1
map/place_page_info.hpp
View file

@ -30,6 +30,7 @@ public:
static char const * const kSubtitleSeparator;
static char const * const kStarSymbol;
static char const * const kMountainSymbol;
static char const * const kEmptyRatingSymbol;
static char const * const kPricingSymbol;
bool IsFeature() const;