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

[search][ios][android] Display brand name in search results

Browse source
This commit is contained in:
tatiana-yan 2018-12-06 13:31:39 +03:00 • committed by mpimenov
parent fc493839a4
commit 9eba4a36ce
11 changed files with 91 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/jni/com/mapswithme/maps/SearchEngine.cpp
View file

@ -343,6 +343,7 @@ jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, b
jni::TScopedLocalRef address(env, jni::ToJavaString(env, result.GetAddress()));
jni::TScopedLocalRef dist(env, jni::ToJavaString(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 pricing(env, jni::ToJavaString(env, result.GetHotelApproximatePricing()));
@ -354,7 +355,7 @@ jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, b
jni::TScopedLocalRef desc(env, env->NewObject(g_descriptionClass, g_descriptionConstructor,
featureId.get(), featureType.get(), address.get(),
dist.get(), cuisine.get(), airportIata.get(),
dist.get(), cuisine.get(), brand.get(), airportIata.get(),
pricing.get(), rating,
result.GetStarsCount(),
static_cast<jint>(result.IsOpenNow()),
@ -648,7 +649,8 @@ extern "C"
g_descriptionConstructor = jni::GetConstructorID(env, g_descriptionClass,
"(Lcom/mapswithme/maps/bookmarks/data/FeatureId;"
"Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;FIIZ)V");
"Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;FIIZ)V");
g_popularityClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/Popularity");
g_popularityConstructor = jni::GetConstructorID(env, g_popularityClass, "(I)V");

29
android/jni/com/mapswithme/platform/Localization.cpp
View file

@ -7,18 +7,31 @@
#include <string>
namespace
{
std::string GetLocalizedStringByUtil(std::string const & methodName, std::string const & str)
{
JNIEnv * env = jni::GetEnv();
static auto const getLocalizedString = jni::GetStaticMethodID(
env, g_utilsClazz, methodName.c_str(), "(Ljava/lang/String;)Ljava/lang/String;");
jni::TScopedLocalRef strRef(env, jni::ToJavaString(env, str));
auto localizedString =
env->CallStaticObjectMethod(g_utilsClazz, getLocalizedString, strRef.get());
return jni::ToNativeString(env, static_cast<jstring>(localizedString));
}
} // namespace
namespace platform
{
std::string GetLocalizedTypeName(std::string const & type)
{
JNIEnv * env = jni::GetEnv();
static auto const getLocalizedFeatureType = jni::GetStaticMethodID(
env, g_utilsClazz, "getLocalizedFeatureType", "(Ljava/lang/String;)Ljava/lang/String;");
return GetLocalizedStringByUtil("getLocalizedFeatureType", type);
}
jni::TScopedLocalRef typeRef(env, jni::ToJavaString(env, type));
auto localizedFeatureType =
env->CallStaticObjectMethod(g_utilsClazz, getLocalizedFeatureType, typeRef.get());
return jni::ToNativeString(env, static_cast<jstring>(localizedFeatureType));
std::string GetLocalizedBrandName(std::string const & brand)
{
return GetLocalizedStringByUtil("getLocalizedBrand", brand);
}
} // namespace platform

15
android/src/com/mapswithme/maps/search/SearchAdapter.java
View file

@ -245,14 +245,21 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
tail.append(colorizeString(s, rs.getColor(R.color.base_green)));
}
}
else if (!TextUtils.isEmpty(result.description.cuisine))
{
tail.append(" • " + result.description.cuisine);
}
else if (!TextUtils.isEmpty(result.description.airportIata))
{
tail.append(" • " + result.description.airportIata);
}
else
{
if (!TextUtils.isEmpty(result.description.brand))
{
tail.append(" • " + Utils.getLocalizedBrand(mFrame.getContext(), result.description.brand));
}
if (!TextUtils.isEmpty(result.description.cuisine))
{
tail.append(" • " + result.description.cuisine);
}
}
res.append(tail);

6
android/src/com/mapswithme/maps/search/SearchResult.java
View file

@ -29,6 +29,7 @@ public class SearchResult implements SearchData, PopularityProvider
public final String region;
public final String distance;
public final String cuisine;
public final String brand;
public final String airportIata;
public final String pricing;
public final float rating;
@ -37,14 +38,15 @@ public class SearchResult implements SearchData, PopularityProvider
public final boolean hasPopularityHigherPriority;
public Description(FeatureId featureId, String featureType, String region, String distance,
String cuisine, String airportIata, String pricing, float rating, int stars,
int openNow, boolean hasPopularityHigherPriority)
String cuisine, String brand, String airportIata, String pricing,
float rating, int stars, int openNow, boolean hasPopularityHigherPriority)
{
this.featureId = featureId;
this.featureType = featureType;
this.region = region;
this.distance = distance;
this.cuisine = cuisine;
this.brand = brand;
this.airportIata = airportIata;
this.pricing = pricing;
this.rating = rating;

31
android/src/com/mapswithme/util/Utils.java
View file

@ -742,13 +742,8 @@ public class Utils
}
@NonNull
public static String getLocalizedFeatureType(@NonNull Context context, @Nullable String type)
private static String getLocalizedFeatureByKey(@NonNull Context context, @NonNull String key)
{
if (TextUtils.isEmpty(type))
return "";
String key = "type." + type.replace('-', '.');
@StringRes
int id = getStringIdByKey(context, key);
@ -758,10 +753,30 @@ public class Utils
}
catch (Resources.NotFoundException e)
{
LOGGER.e(TAG, "Failed to get localized string for type '" + type + "'", e);
LOGGER.e(TAG, "Failed to get localized string for key '" + key + "'", e);
}
return type;
return key;
}
@NonNull
public static String getLocalizedFeatureType(@NonNull Context context, @Nullable String type)
{
if (TextUtils.isEmpty(type))
return "";
String key = "type." + type.replace('-', '.');
return getLocalizedFeatureByKey(context, key);
}
@NonNull
public static String getLocalizedBrand(@NonNull Context context, @Nullable String brand)
{
if (TextUtils.isEmpty(brand))
return "";
String key = "brand." + brand;
return getLocalizedFeatureByKey(context, key);
}
// Called from JNI.

17
iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
View file

@ -6,8 +6,11 @@
#include "search/result.hpp"
#include "indexer/classificator.hpp"
#include "geometry/mercator.hpp"
#include "platform/localization.hpp"
#include "platform/measurement_utils.hpp"
#include "defines.hpp"
@ -77,14 +80,22 @@ bool PopularityHasHigherPriority(bool hasPosition, double distanceInMeters)
self.priceOffset.priority = isHotOffer ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh;
NSUInteger const starsCount = result.GetStarsCount();
NSString * cuisine = @(result.GetCuisine().c_str());
NSString * cuisine = @(result.GetCuisine().c_str()).capitalizedString;
NSString * airportIata = @(result.GetAirportIata().c_str());
NSString * brand = @"";
if (!result.GetBrand().empty())
brand = @(platform::GetLocalizedBrandName(result.GetBrand()).c_str());
if (starsCount > 0)
[self setInfoRating:starsCount];
else if (cuisine.length > 0)
[self setInfoText:cuisine.capitalizedString];
else if (airportIata.length > 0)
[self setInfoText:airportIata];
else if (brand.length > 0 && cuisine.length > 0)
[self setInfoText:[NSString stringWithFormat:@"%@ • %@", brand, cuisine]];
else if (brand.length > 0)
[self setInfoText:brand];
else if (cuisine.length > 0)
[self setInfoText:cuisine];
else
[self clearInfo];

1
platform/localization.hpp
View file

@ -5,4 +5,5 @@
namespace platform
{
extern std::string GetLocalizedTypeName(std::string const & type);
extern std::string GetLocalizedBrandName(std::string const & brand);
} // namespace platform

6
platform/localization.mm
View file

@ -13,4 +13,10 @@ std::string GetLocalizedTypeName(std::string const & type)
return [NSLocalizedString(@(key.c_str()), @"") UTF8String];
}
std::string GetLocalizedBrandName(std::string const & brand)
{
auto const key = "brand." + brand;
return [NSLocalizedString(@(key.c_str()), @"") UTF8String];
}
} // namespace platform

2
platform/localization_dummy.cpp
View file

@ -6,4 +6,6 @@ std::string GetLocalizedTypeName(std::string const & type)
{
return type;
}
std::string GetLocalizedBrandName(std::string const & brand) { return brand; }
} // namespace platform

1
search/intermediate_result.cpp
View file

@ -209,6 +209,7 @@ void ProcessMetadata(FeatureType & ft, Result::Metadata & meta)
}
meta.m_airportIata = src.Get(feature::Metadata::FMD_AIRPORT_IATA);
meta.m_brand = src.Get(feature::Metadata::FMD_BRAND);
string const openHours = src.Get(feature::Metadata::FMD_OPEN_HOURS);
if (!openHours.empty())

4
search/result.hpp
View file

@ -48,6 +48,9 @@ public:
// 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;
// Following fields are used for hotels only.
int m_hotelPricing = 0;
std::string m_hotelApproximatePricing;
@ -84,6 +87,7 @@ public:
std::string const & GetAddress() const { return m_address; }
std::string const & GetCuisine() const { return m_metadata.m_cuisine; }
std::string const & GetAirportIata() const { return m_metadata.m_airportIata; }
std::string const & GetBrand() const { return m_metadata.m_brand; }
float GetHotelRating() const { return m_metadata.m_hotelRating; }
std::string const & GetHotelApproximatePricing() const
{