diff --git a/android/jni/com/mapswithme/util/StringUtils.cpp b/android/jni/com/mapswithme/util/StringUtils.cpp index 589a18f3c2..4f48ffbcb2 100644 --- a/android/jni/com/mapswithme/util/StringUtils.cpp +++ b/android/jni/com/mapswithme/util/StringUtils.cpp @@ -39,12 +39,13 @@ Java_com_mapswithme_util_StringUtils_nativeFilterContainsNormalized(JNIEnv * env { std::string substr = jni::ToNativeString(env, jSubstr); int const length = env->GetArrayLength(src); + auto const & cuisines = osm::Cuisines::Instance(); std::vector filtered; filtered.reserve(length); for (int i = 0; i < length; i++) { std::string str = jni::ToNativeString(env, (jstring) env->GetObjectArrayElement(src, i)); - if (search::ContainsNormalized(str, substr)) + if (search::ContainsNormalized(str, substr) || search::ContainsNormalized(cuisines.Translate(str), substr)) filtered.push_back(str); } diff --git a/map/framework.cpp b/map/framework.cpp index 985db2540f..ac7411fcf1 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -755,12 +755,6 @@ void Framework::FillRouteMarkInfo(RouteMarkPoint const & rmp, place_page::Info & info.SetIntermediateIndex(rmp.GetIntermediateIndex()); } -void Framework::FillTransitMarkInfo(TransitMark const & transitMark, place_page::Info & info) const -{ - FillFeatureInfo(transitMark.GetFeatureID(), info); - /// @todo Add useful info in PP for TransitMark (public transport). -} - void Framework::FillRoadTypeMarkInfo(RoadWarningMark const & roadTypeMark, place_page::Info & info) const { if (roadTypeMark.GetFeatureID().IsValid()) @@ -2182,7 +2176,7 @@ std::optional Framework::BuildPlacePageInfo( } case UserMark::Type::TRANSIT: { - FillTransitMarkInfo(*static_cast(mark), outInfo); + /// @todo Add useful info in PP for TransitMark (public transport). break; } default: diff --git a/map/framework.hpp b/map/framework.hpp index b887a2d5d7..bad029ccc7 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -606,7 +606,6 @@ private: void FillSearchResultInfo(SearchMarkPoint const & smp, place_page::Info & info) const; void FillMyPositionInfo(place_page::Info & info, place_page::BuildInfo const & buildInfo) const; void FillRouteMarkInfo(RouteMarkPoint const & rmp, place_page::Info & info) const; - void FillTransitMarkInfo(TransitMark const & transitMark, place_page::Info & info) const; void FillRoadTypeMarkInfo(RoadWarningMark const & roadTypeMark, place_page::Info & info) const; void FillPointInfoForBookmark(Bookmark const & bmk, place_page::Info & info) const; void FillBookmarkInfo(Bookmark const & bmk, place_page::Info & info) const;