diff --git a/android/app/src/main/cpp/app/organicmaps/SearchEngine.cpp b/android/app/src/main/cpp/app/organicmaps/SearchEngine.cpp index 5c273df65c..c64c80ca3e 100644 --- a/android/app/src/main/cpp/app/organicmaps/SearchEngine.cpp +++ b/android/app/src/main/cpp/app/organicmaps/SearchEngine.cpp @@ -106,22 +106,16 @@ jobject ToJavaResult(Result const & result, search::ProductInfo const & productI jni::TScopedLocalRef featureId(env, usermark_helper::CreateFeatureId(env, isFeature ? result.GetFeatureID() : kEmptyFeatureId)); - string readableType = isFeature ? classif().GetReadableObjectName(result.GetFeatureType()) : ""; + std::string const localizedType = isFeature ? result.GetLocalizedFeatureType() : ""; - jni::TScopedLocalRef featureType(env, jni::ToJavaString(env, readableType)); + jni::TScopedLocalRef featureType(env, jni::ToJavaString(env, localizedType)); jni::TScopedLocalRef address(env, jni::ToJavaString(env, result.GetAddress())); jni::TScopedLocalRef dist(env, ToJavaDistance(env, distance)); - jni::TScopedLocalRef cuisine(env, jni::ToJavaString(env, result.GetCuisine())); - jni::TScopedLocalRef brand(env, jni::ToJavaString(env, result.GetBrand())); - jni::TScopedLocalRef airportIata(env, jni::ToJavaString(env, result.GetAirportIata())); - jni::TScopedLocalRef roadShields(env, jni::ToJavaString(env, result.GetRoadShields())); - jni::TScopedLocalRef fee(env, jni::ToJavaString(env, result.GetFee())); - + jni::TScopedLocalRef description(env, jni::ToJavaString(env, result.GetFeatureDescription())); jni::TScopedLocalRef desc(env, env->NewObject(g_descriptionClass, g_descriptionConstructor, featureId.get(), featureType.get(), address.get(), - dist.get(), cuisine.get(), brand.get(), airportIata.get(), - roadShields.get(), fee.get(), + dist.get(), description.get(), static_cast(result.IsOpenNow()), result.GetMinutesUntilOpen(),result.GetMinutesUntilClosed(), static_cast(popularityHasHigherPriority))); @@ -133,7 +127,7 @@ jobject ToJavaResult(Result const & result, search::ProductInfo const & productI 0/*static_cast(result.GetRankingInfo().m_popularity)*/)); return env->NewObject(g_resultClass, g_resultConstructor, name.get(), desc.get(), ll.m_lat, ll.m_lon, - ranges.get(), result.IsHotel(), result.GetStarsCount(), popularity.get()); + ranges.get(), popularity.get()); } jobjectArray BuildSearchResults(vector const & productInfo, @@ -240,21 +234,19 @@ extern "C" g_resultClass = jni::GetGlobalClassRef(env, "app/organicmaps/search/SearchResult"); g_resultConstructor = jni::GetConstructorID( env, g_resultClass, - "(Ljava/lang/String;Lapp/organicmaps/search/SearchResult$Description;DD[IZI" + "(Ljava/lang/String;Lapp/organicmaps/search/SearchResult$Description;DD[I" "Lapp/organicmaps/search/Popularity;)V"); g_suggestConstructor = jni::GetConstructorID(env, g_resultClass, "(Ljava/lang/String;Ljava/lang/String;DD[I)V"); g_descriptionClass = jni::GetGlobalClassRef(env, "app/organicmaps/search/SearchResult$Description"); /* Description(FeatureId featureId, String featureType, String region, Distance distance, - String cuisine, String brand, String airportIata, String roadShields, - String fee, int openNow, int minutesUntilOpen, int minutesUntilClosed, + String description, int openNow, int minutesUntilOpen, int minutesUntilClosed, boolean hasPopularityHigherPriority) */ g_descriptionConstructor = jni::GetConstructorID(env, g_descriptionClass, "(Lapp/organicmaps/bookmarks/data/FeatureId;" "Ljava/lang/String;Ljava/lang/String;Lapp/organicmaps/util/Distance;" - "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" - "Ljava/lang/String;Ljava/lang/String;IIIZ)V"); + "Ljava/lang/String;IIIZ)V"); g_popularityClass = jni::GetGlobalClassRef(env, "app/organicmaps/search/Popularity"); g_popularityConstructor = jni::GetConstructorID(env, g_popularityClass, "(I)V"); diff --git a/android/app/src/main/java/app/organicmaps/search/SearchResult.java b/android/app/src/main/java/app/organicmaps/search/SearchResult.java index ac41b0fbe9..49e224a277 100644 --- a/android/app/src/main/java/app/organicmaps/search/SearchResult.java +++ b/android/app/src/main/java/app/organicmaps/search/SearchResult.java @@ -44,31 +44,23 @@ public class SearchResult public final String featureType; public final String region; public final Distance distance; - public final String cuisine; - public final String brand; - public final String airportIata; - public final String roadShields; - public final String fee; + public final String description; + public final int openNow; public final int minutesUntilOpen; public final int minutesUntilClosed; public final boolean hasPopularityHigherPriority; public Description(FeatureId featureId, String featureType, String region, Distance distance, - String cuisine, String brand, String airportIata, String roadShields, - String fee, int openNow, int minutesUntilOpen, int minutesUntilClosed, + String description, int openNow, int minutesUntilOpen, int minutesUntilClosed, boolean hasPopularityHigherPriority) { this.featureId = featureId; this.featureType = featureType; this.region = region; this.distance = distance; - this.cuisine = cuisine; - this.brand = brand; - this.airportIata = airportIata; - this.roadShields = roadShields; - this.fee = fee; + this.description = description; this.openNow = openNow; this.minutesUntilOpen = minutesUntilOpen; this.minutesUntilClosed = minutesUntilClosed; @@ -87,8 +79,6 @@ public class SearchResult // Consecutive pairs of indexes (each pair contains : start index, length), specifying highlighted matches of original query in result public final int[] highlightRanges; - public final int stars; - public final boolean isHotel; @NonNull private final Popularity mPopularity; @@ -98,8 +88,6 @@ public class SearchResult this.suggestion = suggestion; this.lat = lat; this.lon = lon; - this.stars = 0; - this.isHotel = false; this.description = null; // Looks like a hack, but it's fine. Otherwise, should make one more ctor and JNI code bloat. if (lat == 0 && lon == 0) @@ -111,12 +99,10 @@ public class SearchResult } public SearchResult(String name, Description description, double lat, double lon, int[] highlightRanges, - boolean isHotel, int stars, @NonNull Popularity popularity) + @NonNull Popularity popularity) { this.type = TYPE_RESULT; this.name = name; - this.stars = stars; - this.isHotel = isHotel; mPopularity = popularity; this.suggestion = null; this.lat = lat; @@ -131,9 +117,7 @@ public class SearchResult String title = name; if (TextUtils.isEmpty(title)) { - title = description != null - ? Utils.getLocalizedFeatureType(context, description.featureType) - : ""; + title = description != null ? description.featureType : ""; } return title; @@ -166,30 +150,6 @@ public class SearchResult @NonNull public CharSequence getFormattedDescription(@NonNull Context context) { - final String localizedType = Utils.getLocalizedFeatureType(context, description.featureType); - final SpannableStringBuilder res = new SpannableStringBuilder(localizedType); - final SpannableStringBuilder tail = new SpannableStringBuilder(); - - if (!TextUtils.isEmpty(description.airportIata)) - tail.append(" • ").append(description.airportIata); - else if (!TextUtils.isEmpty(description.roadShields)) - tail.append(" • ").append(description.roadShields); - else - { - if (!TextUtils.isEmpty(description.brand)) - tail.append(" • ").append(Utils.getLocalizedBrand(context, description.brand)); - if (!TextUtils.isEmpty(description.cuisine)) - tail.append(" • ").append(description.cuisine); - } - - if (!TextUtils.isEmpty(description.fee)) - tail.append(" • ").append(description.fee); - - if (isHotel && stars != 0) - tail.append(" • ").append("★★★★★★★".substring(0, Math.min(7, stars))); - - res.append(tail); - - return res; + return description.description; } } diff --git a/indexer/map_object.cpp b/indexer/map_object.cpp index 634ab0458f..b36655463b 100644 --- a/indexer/map_object.cpp +++ b/indexer/map_object.cpp @@ -28,8 +28,6 @@ constexpr char const * kYes = "yes"; constexpr char const * kNo = "no"; } // namespace -char const * MapObject::kFieldsSeparator = " • "; - string DebugPrint(osm::Internet internet) { switch (internet) diff --git a/indexer/map_object.hpp b/indexer/map_object.hpp index a5da6e0a93..3f60468db7 100644 --- a/indexer/map_object.hpp +++ b/indexer/map_object.hpp @@ -33,7 +33,8 @@ Internet InternetFromString(std::string_view inet); class MapObject { public: - static char const * kFieldsSeparator; + static constexpr std::string_view kFieldsSeparator = " • "; + static constexpr std::string_view kStarSymbol = "★"; static constexpr uint8_t kMaxStarsCount = 7; void SetFromFeatureType(FeatureType & ft); diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm index 07940fc594..086e9a5e2c 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm @@ -31,40 +31,8 @@ self.locationLabel.text = @(result.GetAddress().c_str()); [self.locationLabel sizeToFit]; - - int const starsCount = std::min(7, result.GetStarsCount()); - NSString * cuisine = @(result.GetCuisine().c_str()).capitalizedString; - NSString * airportIata = @(result.GetAirportIata().c_str()); - NSString * roadShields = @(result.GetRoadShields().c_str()); - NSString * fee = @(result.GetFee().c_str()); - NSString * brand = @""; - if (!result.GetBrand().empty()) - brand = @(platform::GetLocalizedBrandName(result.GetBrand()).c_str()); - NSString * description = @""; - - if (result.IsHotel() && starsCount > 0) - { - static NSString * sevenStars = [NSString stringWithUTF8String:"★★★★★★★"]; - description = [sevenStars substringToIndex:starsCount]; - } - else if (airportIata.length > 0) - description = airportIata; - else if (roadShields.length > 0) - description = roadShields; - else if (brand.length > 0 && cuisine.length > 0) - description = [NSString stringWithFormat:@"%@ • %@", brand, cuisine]; - else if (brand.length > 0) - description = brand; - else if (cuisine.length > 0) - description = cuisine; - else if (fee.length > 0) - description = fee; - - if ([description length] == 0) - self.infoLabel.text = localizedTypeName; - else - self.infoLabel.text = [NSString stringWithFormat:@"%@ • %@", localizedTypeName, description]; + self.infoLabel.text = @(result.GetFeatureDescription().c_str()); CLLocation * lastLocation = [MWMLocationManager lastLocation]; double distanceInMeters = 0.0; diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm index c3b25ab909..d493995915 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm @@ -11,9 +11,7 @@ NSString *GetLocalizedTypeName(search::Result const &result) { if (result.GetResultType() != search::Result::Type::Feature) return @""; - auto const readableType = classif().GetReadableObjectName(result.GetFeatureType()); - - return @(platform::GetLocalizedTypeName(readableType).c_str()); + return @(result.GetLocalizedFeatureType().c_str()); } } diff --git a/search/intermediate_result.cpp b/search/intermediate_result.cpp index b4acec2a11..c02bae9b80 100644 --- a/search/intermediate_result.cpp +++ b/search/intermediate_result.cpp @@ -14,6 +14,7 @@ #include "indexer/road_shields_parser.hpp" #include "platform/measurement_utils.hpp" +#include "platform/localization.hpp" #include "base/string_utils.hpp" @@ -255,9 +256,12 @@ void FillDetails(FeatureType & ft, Result::Details & details) if (details.m_isInitialized) return; - details.m_airportIata = ft.GetMetadata(feature::Metadata::FMD_AIRPORT_IATA); - details.m_brand = ft.GetMetadata(feature::Metadata::FMD_BRAND); - + std::string_view airportIata = ft.GetMetadata(feature::Metadata::FMD_AIRPORT_IATA); + + std::string brand {ft.GetMetadata(feature::Metadata::FMD_BRAND)}; + if (!brand.empty()) + brand = platform::GetLocalizedBrandName(brand); + /// @todo Avoid temporary string when OpeningHours (boost::spirit) will allow string_view. std::string const openHours(ft.GetMetadata(feature::Metadata::FMD_OPEN_HOURS)); if (!openHours.empty()) @@ -282,19 +286,38 @@ void FillDetails(FeatureType & ft, Result::Details & details) feature::TypesHolder const typesHolder(ft); - details.m_isHotel = ftypes::IsHotelChecker::Instance()(typesHolder); - if (details.m_isHotel && strings::to_uint(ft.GetMetadata(feature::Metadata::FMD_STARS), details.m_stars)) - details.m_stars = std::min(details.m_stars, osm::MapObject::kMaxStarsCount); - else - details.m_stars = 0; + 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); auto const cuisines = feature::GetLocalizedCuisines(typesHolder); - details.m_cuisine = strings::JoinStrings(cuisines, osm::MapObject::kFieldsSeparator); + auto const cuisine = strings::JoinStrings(cuisines, osm::MapObject::kFieldsSeparator); auto const roadShields = ftypes::GetRoadShieldsNames(ft); - details.m_roadShields = strings::JoinStrings(roadShields, osm::MapObject::kFieldsSeparator); + auto const roadShield = strings::JoinStrings(roadShields, osm::MapObject::kFieldsSeparator); - details.m_fee = feature::GetLocalizedFeeType(typesHolder); + auto const fee = feature::GetLocalizedFeeType(typesHolder); + + std::string description; + + if (!stars.empty()) + description.append(osm::MapObject::kFieldsSeparator).append(stars); + if (!airportIata.empty()) + description.append(osm::MapObject::kFieldsSeparator).append(airportIata); + if (!roadShield.empty()) + description.append(osm::MapObject::kFieldsSeparator).append(roadShield); + if (!brand.empty()) + description.append(osm::MapObject::kFieldsSeparator).append(brand); + if (!cuisine.empty()) + description.append(osm::MapObject::kFieldsSeparator).append(cuisine); + if (!fee.empty()) + description.append(osm::MapObject::kFieldsSeparator).append(fee); + + details.m_description = std::move(description); details.m_isInitialized = true; } diff --git a/search/result.cpp b/search/result.cpp index 5d05dd57ec..7261a32532 100644 --- a/search/result.cpp +++ b/search/result.cpp @@ -5,6 +5,8 @@ #include "indexer/classificator.hpp" +#include "platform/localization.hpp" + #include "geometry/mercator.hpp" #include "base/string_utils.hpp" @@ -64,6 +66,18 @@ uint32_t Result::GetFeatureType() const return m_featureType; } +std::string Result::GetLocalizedFeatureType() const +{ + ASSERT_EQUAL(m_resultType, Type::Feature, ()); + return platform::GetLocalizedTypeName(classif().GetReadableObjectName(m_featureType)); +} + +std::string Result::GetFeatureDescription() const +{ + ASSERT_EQUAL(m_resultType, Type::Feature, ()); + return GetLocalizedFeatureType() + GetDescription(); +} + m2::PointD Result::GetFeatureCenter() const { ASSERT(HasPoint(), ()); diff --git a/search/result.hpp b/search/result.hpp index bf6c71b3dd..0cae031be9 100644 --- a/search/result.hpp +++ b/search/result.hpp @@ -44,30 +44,13 @@ public: // Search results details. Considered valid if GetResultType() == Type::Feature. struct Details { - // Valid only if not empty, used for restaurants. - std::string m_cuisine; - - // Valid only if not empty, used for airport iata codes. - std::string m_airportIata; - - // Valid only if not empty, used for brand name. - std::string m_brand; - - // Valid only if not empty, used for roads. - std::string m_roadShields; - - // Following fields are used for hotels only. - uint8_t m_stars = 0; - bool m_isHotel = false; - - // Valid for any result. osm::YesNoUnknown m_isOpenNow = osm::Unknown; uint16_t m_minutesUntilOpen = 0; uint16_t m_minutesUntilClosed = 0; - std::string m_fee; + std::string m_description; bool m_isInitialized = false; }; @@ -91,17 +74,11 @@ public: std::string const & GetString() const { return m_str; } std::string const & GetAddress() const { return m_address; } - std::string const & GetCuisine() const { return m_details.m_cuisine; } - std::string const & GetAirportIata() const { return m_details.m_airportIata; } - std::string const & GetBrand() const { return m_details.m_brand; } - std::string const & GetRoadShields() const { return m_details.m_roadShields; } - std::string const & GetFee() const { return m_details.m_fee; } - bool IsHotel() const { return m_details.m_isHotel; } + std::string const & GetDescription() const { return m_details.m_description; } osm::YesNoUnknown IsOpenNow() const { return m_details.m_isOpenNow; } uint16_t GetMinutesUntilOpen() const { return m_details.m_minutesUntilOpen; } uint16_t GetMinutesUntilClosed() const { return m_details.m_minutesUntilClosed; } - int GetStarsCount() const { return m_details.m_stars; } bool IsSuggest() const; bool HasPoint() const; @@ -112,6 +89,12 @@ public: // Precondition: GetResultType() == Type::Feature. uint32_t GetFeatureType() const; + + // Precondition: GetResultType() == Type::Feature. + std::string GetLocalizedFeatureType() const; + + // Precondition: GetResultType() == Type::Feature. + std::string GetFeatureDescription() const; // Center point of a feature. // Precondition: HasPoint() == true.