diff --git a/indexer/feature_utils.hpp b/indexer/feature_utils.hpp index 06c5751815..0e2bc3a8ae 100644 --- a/indexer/feature_utils.hpp +++ b/indexer/feature_utils.hpp @@ -12,6 +12,8 @@ namespace feature { static constexpr uint8_t kMaxStarsCount = 7; static constexpr std::string_view kFieldsSeparator = " • "; + static constexpr std::string_view kToiletsSymbol = "🚻"; + static constexpr std::string_view kAtmSymbol = "💳"; static constexpr std::string_view kWheelchairSymbol = "♿️"; // Address house numbers interpolation. diff --git a/indexer/map_object.hpp b/indexer/map_object.hpp index 21089eb388..d9d73ce353 100644 --- a/indexer/map_object.hpp +++ b/indexer/map_object.hpp @@ -33,8 +33,6 @@ Internet InternetFromString(std::string_view inet); class MapObject { public: - static constexpr std::string_view kToiletsSymbol = "🚻"; - void SetFromFeatureType(FeatureType & ft); FeatureID const & GetID() const; diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp index b0ca81749d..9a28e4f1d2 100644 --- a/map/place_page_info.cpp +++ b/map/place_page_info.cpp @@ -19,7 +19,6 @@ namespace place_page { -static constexpr std::string_view kAtmSymbol = "💳"; bool Info::IsBookmark() const { @@ -176,7 +175,7 @@ std::string Info::FormatSubtitle(bool withType) const // ATM if (HasAtm()) - append(kAtmSymbol); + append(feature::kAtmSymbol); // Internet. if (HasWifi()) @@ -184,7 +183,7 @@ std::string Info::FormatSubtitle(bool withType) const // Toilets. if (HasToilets()) - append(kToiletsSymbol); + append(feature::kToiletsSymbol); // Wheelchair if (feature::GetWheelchairType(m_types) == ftraits::WheelchairAvailability::Yes)