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

[core] Refactor move FormatStars to feature_utils

Browse source 
Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
This commit is contained in:
David Martinez 2024-01-20 10:09:04 +01:00 • committed by Viktor Govako
parent 621a39f42f
commit 0e8ceb3f7f
7 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
indexer/editable_map_object.cpp
View file

@ -442,7 +442,7 @@ bool EditableMapObject::IsValidMetadata(MetadataID type, std::string const & val
case MetadataID::FMD_STARS:
{
uint32_t stars;
return strings::to_uint(value, stars) && stars > 0 && stars <= kMaxStarsCount;
return strings::to_uint(value, stars) && stars > 0 && stars <= feature::kMaxStarsCount;
}
case MetadataID::FMD_ELE:
{

10
indexer/feature_utils.cpp
View file

@ -315,6 +315,8 @@ FeatureEstimator const & GetFeatureEstimator()
}
} // namespace
static constexpr std::string_view kStarSymbol = "★";
NameParamsIn::NameParamsIn(StringUtf8Multilang const & src_, RegionData const & regionData_,
std::string_view deviceLang_, bool allowTranslit_)
: NameParamsIn(src_, regionData_, StringUtf8Multilang::GetLangIndex(deviceLang_), allowTranslit_)
@ -472,4 +474,12 @@ bool HasToilets(TypesHolder const & types)
return isToiletsType(types);
}
string FormatStars(uint8_t starsCount)
{
std::string stars;
for (int i = 0; i < starsCount && i < kMaxStarsCount; ++i)
stars.append(kStarSymbol);
return stars;
}
} // namespace feature

4
indexer/feature_utils.hpp
View file

@ -8,6 +8,7 @@ class StringUtf8Multilang;
namespace feature
{
static constexpr uint8_t kMaxStarsCount = 7;
static constexpr std::string_view kFieldsSeparator = " • ";
// Address house numbers interpolation.
@ -140,4 +141,7 @@ namespace feature
/// Returns true if feature has Toilets type.
bool HasToilets(TypesHolder const & types);
/// @returns starsCount of ★ symbol.
std::string FormatStars(uint8_t starsCount);
} // namespace feature

2
indexer/map_object.hpp
View file

@ -33,9 +33,7 @@ Internet InternetFromString(std::string_view inet);
class MapObject
{
public:
static constexpr std::string_view kStarSymbol = "★";
static constexpr std::string_view kToiletsSymbol = "🚻";
static constexpr uint8_t kMaxStarsCount = 7;
void SetFromFeatureType(FeatureType & ft);

10
map/place_page_info.cpp
View file

@ -149,7 +149,7 @@ std::string Info::FormatSubtitle(bool withType) const
append(roadShields);
// Stars.
auto const stars = FormatStars();
auto const stars = feature::FormatStars(GetStars());
if (!stars.empty())
append(stars);
@ -313,14 +313,6 @@ kml::LocalizableString Info::FormatNewBookmarkName() const
return bookmarkName;
}
std::string Info::FormatStars() const
{
std::string stars;
for (int i = 0; i < GetStars(); ++i)
stars.append(MapObject::kStarSymbol);
return stars;
}
std::string Info::GetFormattedCoordinate(CoordinatesFormat coordsFormat) const
{
auto const & ll = GetLatLon();

2
map/place_page_info.hpp
View file

@ -219,8 +219,6 @@ public:
private:
std::string FormatSubtitle(bool withType) const;
std::string GetBookmarkName();
/// @returns empty string or GetStars() count of ★ symbol.
std::string FormatStars() const;
place_page::BuildInfo m_buildInfo;

6
search/intermediate_result.cpp
View file

@ -286,13 +286,11 @@ void FillDetails(FeatureType & ft, Result::Details & details)
feature::TypesHolder const typesHolder(ft);
std::string stars;
uint8_t starsCount = 0;
bool const isHotel = ftypes::IsHotelChecker::Instance()(typesHolder);
if (isHotel && strings::to_uint(ft.GetMetadata(feature::Metadata::FMD_STARS), starsCount))
starsCount = std::min(starsCount, osm::MapObject::kMaxStarsCount);
std::string stars;
for (int i = 0; i < starsCount; ++i)
stars.append(osm::MapObject::kStarSymbol);
stars = feature::FormatStars(starsCount);
auto const cuisines = feature::GetLocalizedCuisines(typesHolder);
auto const cuisine = strings::JoinStrings(cuisines, feature::kFieldsSeparator);